external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity
3014 commits 13 branches 107 tags 375 MiB
Commit graph

2256 commits

Author SHA1 Message Date
winlin
b3bd007f0d update git commit 2015-04-29 15:09:03 +08:00
tufang14
b6d650cdb4 m3u8 mount bug 2015-04-25 14:59:12 +08:00
winlin
dbcd7d883b add script check_hls_backup.sh to research hls. 2015-04-23 16:58:00 +08:00
winlin
e50996270e fix the config parse error. 2015-04-23 16:25:49 +08:00
winlin
0acb942c3a update on_hls, add ts_url, m3u8 and m3u8_url. 2015-04-23 12:05:24 +08:00
winlin
7b157b0678 refine hls ingester, quit when error. 2015-04-22 09:04:18 +08:00
winlin
aabe84046c refine hls ingester, quit when error. 2015-04-22 09:01:38 +08:00
winlin
4e5ddb51e7 refine the overflow algorithm, prevent smaller piece. 2015-04-21 16:21:22 +08:00
winlin
1d973e2178 refine the overflow algorithm, prevent smaller piece. 2015-04-21 16:18:37 +08:00
winlin
d19dfa528e abs overflow also plus the deviation, for pure audio hls. 2015-04-21 14:35:28 +08:00
winlin
c514a4ceeb use atc for ingest hls aac time. 2015-04-21 12:58:54 +08:00
winlin
a28eec89b0 support ingest hls with m3u8 in m3u8. 2015-04-21 12:53:45 +08:00
winlin
ba6736839b support hls ingest, fix the bugs. 2015-04-20 18:31:45 +08:00
winlin
2239e9f1fd support ingest hls live stream to RTMP. 2015-04-20 16:25:48 +08:00
winlin
23b978c0bb merge from github 2015-04-20 11:28:46 +08:00
winlin
623e37e22a Merge branch '2.0release' of github.com:winlinvip/simple-rtmp-server into 2.0release 2015-04-20 11:28:20 +08:00
winlin
6e5c587e0a support aac_adtstoasc filter to copy mode. 2015-04-20 11:24:12 +08:00
J
aca02b6d6b for #384,refine code for empty body request. 2015-04-18 14:51:33 +08:00
J
8adbdc39e3 for #384,refine code for empty body request. 2015-04-18 14:42:16 +08:00
J
a71db53661 for #384,refine code for empty body request. 2015-04-18 14:33:57 +08:00
J
56f75cbbe9 fix #384 2015-04-17 10:12:52 +08:00
winlin
22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 2015-04-15 17:12:22 +08:00
winlin
8fbc6526bb for #383, refine code to support mix correct algorithm. 2015-04-15 16:17:52 +08:00
winlin
542aab4557 fix the hls notify bug, pass the query to get path. 2015-04-14 17:53:53 +08:00
winlin
02a2cb7e1a for #381, refine the hls notify, report one by one. 2015-04-14 11:36:58 +08:00
winlin
a4216cc582 add todo for ts parse. 2015-04-13 16:40:31 +08:00
winlin
40eab7fc88 for #381, refine the deviation for hls. 2015-04-13 11:45:08 +08:00
winlin
dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 2015-04-13 10:32:32 +08:00
winlin
0000c945ea refine the proxy api server. 2015-04-10 16:07:45 +08:00
winlin
fe1886aa08 add proxy for hls 2015-04-10 15:50:12 +08:00
winlin
e5b8e0da01 fix async call and hls_nb_notify bug. 2015-04-10 15:00:07 +08:00
winlin
5d37e47783 support config the hls_nb_notify. 2015-04-10 14:44:18 +08:00
winlin
0a7cea063c refine http read, support c style api 2015-04-10 14:25:14 +08:00
winlin
5c00ce8a96 refine hls on_hls_notify, read a little of ts. 2015-04-10 14:17:49 +08:00
winlin
1f93fb3399 refine hls notify, support timeout. 2015-04-10 13:45:21 +08:00
winlin
d8988da0ea refine the hls_on_notify, calc the spent time in ms. 2015-04-10 12:32:34 +08:00
winlin
310157ab77 refine the hls_on_notify, calc the spent time in ms. 2015-04-10 12:30:22 +08:00
winlin
e6d6bdfe57 refine the hls_on_notify, only read a chunk. 2015-04-10 12:27:30 +08:00
winlin
e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 2015-04-10 12:01:45 +08:00
winlin
7dbc95e085 refine the hls deviation for floor algorithm. 2015-04-10 10:21:30 +08:00
winlin
23b310971e guess again when annexb change to ibmf. 2015-04-09 18:03:45 +08:00
winlin
bd77f995bf ignore the unknown flv tag. 2015-04-09 12:35:17 +08:00
winlin
546be09219 fix #375, fix hls bug, keep cc continous between ts files. 2.0.159. 2015-04-08 16:52:43 +08:00
winlin
29ac4c724b change default log tank to file. 2015-04-07 17:55:45 +08:00
winlin
e56d7add44 fix bug of config to parse the default value. 2.0.158 2015-04-07 17:42:41 +08:00
winlin
aef97db77a refine the config code. 2015-04-07 17:04:04 +08:00
winlin
e7fd309cb0 refine hls info, show the deviation in seconds and pieces. 2015-04-07 10:30:45 +08:00
winlin
6e2d756e1b fix the bug of h.264 bit stream demux. 2015-04-04 18:24:07 +08:00
winlin
bd7db5aed6 only ignore the aud message. 2015-04-04 16:05:11 +08:00
winlin
61d5b78ae5 refine the h264 parser, one ts message should parsed to one rtmp/flv message. 2015-04-04 15:53:36 +08:00
winlin
4329366c08 for #304, do not add deviation for absolute overflow. 2015-04-04 15:00:24 +08:00
winlin
77c29da26b for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157. 2015-04-04 13:30:13 +08:00
winlin
70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156. 2015-04-03 23:17:50 +08:00
winlin
7e1749e029 refine the comments. 2015-04-03 17:20:41 +08:00
winlin
e458305f81 add utc time format. 2015-04-03 16:42:32 +08:00
winlin
56cd373015 support hls callback with duration. 2015-04-03 14:24:47 +08:00
winlin
64b065e450 for hls callback, add duration of ts. 2015-04-03 13:46:44 +08:00
winlin
c4466a8c0c fix crash bug for hls cleanup. 2015-04-03 12:43:40 +08:00
winlin
eb54ec25c9 fix compile errors. 2015-04-03 11:30:59 +08:00
winlin
17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 2015-04-03 10:56:56 +08:00
winlin
4d98cbb965 add hls config in api. 2015-04-02 15:05:09 +08:00
winlin
8401d9ac06 fix #366, config hls to disable cleanup of ts. 2.0.154. 2015-04-02 11:52:03 +08:00
winlin
717d088376 support server cycle handler. 2.0.153. 2015-03-31 18:06:55 +08:00
winlin
3b4bd194b6 refine http hooks, donot pass the known variable. 2015-03-31 17:52:49 +08:00
winlin
c49bc0628e support on_hls for http hooks. 2.0.152. 2015-03-31 17:42:12 +08:00
winlin
97442c56b6 enhance hls in floor mode. 2015-03-31 17:03:14 +08:00
winlin
76c1957260 enhance hls, increase piece one by one. 2015-03-31 16:58:20 +08:00
winlin
b9c21b1e8f enhanced hls, warning when ts dup or jmp. 2015-03-31 15:54:05 +08:00
winlin
9be7fbba7d user smaller deviation to avoid dup ts. 2015-03-31 15:42:21 +08:00
winlin
f6e135943f enhanced hls, support deviation for duration. 2.0.151. 2015-03-31 15:39:47 +08:00
winlin
cd682ae4be update donations. fix hls path bug. 2015-03-30 14:08:17 +08:00
winlin
692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 2015-03-30 12:44:04 +08:00
winlin
85afb6ea6f add donation. fix bug of adts. 2015-03-29 22:34:53 +08:00
winlin
01ee456649 fix the ts parse bug, should never complete message when PES packet length is 0. 2015-03-27 15:27:10 +08:00
tufang14
0faaa61be7 seg fault 
seg fault
 2015-03-26 19:57:51 +08:00
winlin
a5c5befad1 for parse video ts. 2015-03-26 19:52:21 +08:00
winlin
896983c1dc refine the aac codec enum name 2015-03-26 11:31:40 +08:00
winlin
1401f2e0ab ignore when sps/pps consumed all frame. 2015-03-26 11:07:45 +08:00
winlin
b319e9ff9c ignore when sps/pps consumed all frame. 2015-03-26 10:31:13 +08:00
winlin
e818f36316 fix #360, fix build bug for centos7. 2015-03-25 20:38:51 +08:00
winlin
b6feb0742f fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 2015-03-23 23:13:57 +08:00
winlin
fcab17741c fix #222, the dvr path rule changed. 2015-03-23 22:06:18 +08:00
winlin
02addf61f7 fix #302, remove the thread unsafe code, no static. 2015-03-23 21:21:36 +08:00
winlin
f69fa7273b fix #302, remove the thread unsafe code, no static. 2015-03-23 21:19:04 +08:00
winlin
1cb2992808 refine build for modules, add defines. 2015-03-23 17:49:45 +08:00
winlin
2f2aaf5ee4 for #155, refine code, donot check network devices for osx. 2015-03-21 15:38:22 +08:00
winlin
33cca3e027 for #155, add todo for osx. 2.0.146 2015-03-21 15:22:45 +08:00
winlin
bbac2348db for #354, remove the double underscore functions and variables. 2015-03-21 11:55:28 +08:00
winlin
7065db192c for #354, remove the double underscore of macro. 2015-03-21 10:42:55 +08:00
winlin
c6817cc422 for #354, remove the double underscore of macro. 2015-03-21 10:25:03 +08:00
winlin
014993ad1e remove the sudo of log. 2015-03-20 15:10:17 +08:00
winlin
a4709a6439 for #151, add comments for the audio overflow ratio. 2015-03-19 21:08:42 +08:00
winlin
0319e85f99 support config the audio overflow ratio. 2015-03-19 17:24:27 +08:00
tufang14
e319da3329 小瑕疵 
小瑕疵
 2015-03-19 10:16:58 +08:00
winlin
f564c903ac support got uptime and loadavg for osx. 2.0.145 2015-03-18 22:30:17 +08:00
winlin
fbd722bf76 refine the fast buffer to more readable. 2015-03-18 16:50:47 +08:00
winlin
f36e4a443d refine the fast buffer. 2.0.144 2015-03-18 16:34:27 +08:00
winlin
6a98758435 revert the changes for SRS2. 2015-03-17 23:51:10 +08:00
winlin
6855ab4c52 Merge branch 'develop' of https://github.com/tufang14/simple-rtmp-server into tufang14-develop 2015-03-17 23:46:09 +08:00
winlin
9bf6c9e9c6 Merge branch '2.0release' into develop 2015-03-17 22:36:04 +08:00
winlin
cf3becbc17 for #155, osx(darwin) enable http api and stat, rusage is ok. 2015-03-17 22:35:47 +08:00
winlin
9f81a8b73e for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 2015-03-17 22:07:38 +08:00
winlin
ab673e1300 for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 2015-03-17 22:06:59 +08:00
winlin
a28c051c2c osx support build nginx and ffmpeg 2015-03-17 21:51:19 +08:00
winlin
f3e5431d0f check what a fuck os for some fresh. 2015-03-17 21:12:30 +08:00
tufang14
1cc3384a19 seg fault 
seg fault
 2015-03-17 17:45:20 +08:00
winlin
79fbeeb8c6 Merge branch '2.0release' into develop 2015-03-17 15:37:03 +08:00
winlin
8a4312f4ec fix bug, use size_t for string::npos 2015-03-17 15:36:12 +08:00
winlin
9e407d32fe change verstion to 3.0.0 2015-03-17 07:58:38 +08:00
winlin
2241ba0e34 for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142 2015-03-17 07:57:58 +08:00
winlin
9c43c73d86 Merge branch 'develop' of https://github.com/wenjiegit/simple-rtmp-server into wenjiegit-develop 2015-03-17 07:45:27 +08:00
winlin
33e579599c refine build for osx 2015-03-16 22:25:59 +08:00
wenjie.zhao
65f404fb42 for #340, refine ts prefix code. 2015-03-13 02:01:24 +08:00
wenjie.zhao
5969f72354 for #340, refine ts prefix code. 2015-03-13 01:32:51 +08:00
wenjie.zhao
10da182853 add hls prefix of uri supported 2015-03-13 00:22:55 +08:00
wenjie.zhao
efe3050d7a fix hls muxer Segmentation fault. 2015-03-12 23:50:21 +08:00
wenjie.zhao
73f13dfc42 fix hls muxer Segmentation fault. 2015-03-12 23:39:44 +08:00
winlin
9a0a8affc5 Merge pull request #337 from tufang14/develop 
可能数组越界
 2015-03-16 16:02:06 +08:00
winlin
685a29af83 Merge branch '2.0release' into develop 2015-03-16 15:45:01 +08:00
winlin
c92d40e00b for #334, refine code, use kbps instead skt of rtmp connection. 2015-03-16 15:40:43 +08:00
Nimrod A. Abing (on kohima)
a95bd7d30e Modified on_close webhook. 
Pass the send_bytes and recv_bytes count to the web hook.
 2015-03-16 15:39:49 +08:00
Nimrod A. Abing (on kohima)
bc93147426 for #308, disable st examples. for #334, refine the st init and event select. 2015-03-16 15:35:01 +08:00
tufang14
6cf5a6a7a9 可能数组越界 
可能数组越界
 2015-03-16 15:08:17 +08:00
winlin
67671e43f9 Merge branch '2.0release' into develop 2015-03-16 10:24:25 +08:00
winlin
8ee0826e9a fix build failed bug. 2015-03-16 10:24:19 +08:00
winlin
0017ee85e0 Merge branch '2.0release' into develop 2015-03-15 19:34:11 +08:00
winlin
59d9af8039 update conf 2015-03-15 19:34:04 +08:00
winlin
a21243ea12 merge from 2.0 2015-03-15 08:16:37 +08:00
winlin
d349a3dbda update stable version check 2015-03-15 08:15:04 +08:00
winlin
519c25a064 fork srs2 and start srs3. 3.0.0 2015-03-15 08:06:41 +08:00
winlin
636bc574af start 2.0release, 80773 lines. 2015-03-15 07:48:27 +08:00
winlin
e6058c1560 update donation 2015-03-14 20:25:21 +08:00
winlin
320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 2015-03-14 20:07:56 +08:00
winlin
27cb62b7aa for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 2015-03-14 19:45:13 +08:00
winlin
995b130090 for #324, refine code for hstrs, support hijack handler. 2015-03-14 14:55:45 +08:00
winlin
5c6ef6ded6 fix warning for xcode. 2015-03-14 13:09:34 +08:00
winlin
6d15d0ea99 for #324, refine code, add hstrs config. 2015-03-14 09:52:47 +08:00
winlin
74fa3ba16f fix build failed for linux. 2015-03-13 17:34:33 +08:00
winlin
a15ce1147f for #155, fix all warnings for mac. 2015-03-13 12:53:01 +08:00
wenjie.zhao
643f18abe4 add hds reload supported.#328 2015-03-12 22:38:11 +08:00
winlin
984145de72 for #328, add todo for hds, check whether disabled, support reload. 2015-03-12 11:52:35 +08:00
winlin
5d12a1ab20 for #328, add hds specification. 2015-03-12 11:36:12 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00
winlin
da56e4fbb9 for #328, fix hds compile error on mac. 2015-03-12 07:26:30 +08:00
wenjie.zhao
07d8f060eb refine annotation 2015-03-11 14:36:28 +08:00
wenjie.zhao
570c0d66bd fix path issue. 2015-03-11 14:34:00 +08:00
wenjie.zhao
e57bda8908 Merge code. 
Conflicts:
	trunk/configure
	trunk/src/app/srs_app_source.cpp
	trunk/src/kernel/srs_kernel_error.hpp
 2015-03-11 14:18:09 +08:00
winlin
a739b2c555 fix the bug for fork ffmpeg in mac, the local variable is unvailable. 2015-03-11 15:54:31 +08:00
winlin
3e5821efff enable http api for x86_x64 2015-03-11 15:04:34 +08:00
winlin
3732554844 remove the xcode state. 2015-03-11 14:56:03 +08:00