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
3016 commits 13 branches 107 tags 375 MiB
Commit graph

2258 commits

Author SHA1 Message Date
winlin
8a9dbaefb7 use cache for flv tag header. 2015-05-24 23:16:56 +08:00
winlin
960341b9b2 for #405, improve the HTT FLV to 3k. 2.0.169 2015-05-24 22:43:02 +08:00
winlin
b53e9814b3 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-05-24 21:17:26 +08:00
winlin
fc995473eb for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168 2015-05-24 21:17:00 +08:00
winlin
cf9ee04611 fix the utest build failed bug. 2015-05-24 18:56:52 +08:00
winlin
069ee0afc3 fix #404, register handler then start http thread. 2.0.167. 2015-05-24 15:19:09 +08:00
winlin
a45cf38d44 auto detect the sed command for osx. 2015-05-24 14:52:37 +08:00
winlin
f510a3d6fb add /api/v1/versions for http server for go-sharp to detect. 2015-05-24 13:01:23 +08:00
winlin
94efe3f727 update wiki 2015-05-24 09:15:30 +08:00
winlin
5840bc1053 add flv cluster confs. 2015-05-24 08:41:29 +08:00
winlin
7571d70f16 fix the build failed bug. 2015-05-23 19:32:27 +08:00
winlin
93a1d097dc update jwplayer to support play HTTP flv. 2015-05-23 19:22:37 +08:00
winlin
e96150b7db update readme 2015-05-23 15:22:20 +08:00
winlin
5908096fc3 refine the thread, protocol, kbps code. 2.0.166 2015-05-23 10:04:28 +08:00
winlin
af172d9593 refine script, use PROTOCOL as RTMP. 2015-05-23 09:59:24 +08:00
winlin
68d835021e refine code, move the kbps to protocol 2015-05-23 09:58:00 +08:00
winlin
cfc0877ec9 refine the thread, add all callback. 2015-05-23 09:49:15 +08:00
winlin
e5f449ce36 refine the thread to three category. 2015-05-23 09:20:16 +08:00
winlin
2f0ef87d6d refine code, rename the sync call to common class. 2015-05-23 07:57:45 +08:00
winlin
0bb90145ba fix #391, copy request for async call. 2015-05-23 07:46:45 +08:00
winlin
6bfb743aa0 remove the unused app http file 2015-05-22 22:38:15 +08:00
winlin
f0ae66a081 merge the app http to conn. 2015-05-22 22:34:03 +08:00
winlin
ce1bb6c605 refine code, extrat the ISrsHttpMessage. 2015-05-22 22:24:05 +08:00
winlin
e2955da78f refine code, extract the http protocol sdk to module. 2015-05-22 20:47:27 +08:00
winlin
d645411392 refine the kbps comments, add one usage. 2015-05-22 20:31:07 +08:00
winlin
6ca46e84bc fix #397, the USER_HZ maybe not 100. 2.0.165 2015-05-22 17:16:33 +08:00
winlin
c17a1198cb fix #399, disconnect when not keep alive. 2015-05-22 16:27:48 +08:00
winlin
46a81372e7 fix #398, set recv timeout for http connection. 2015-05-22 13:57:04 +08:00
winlin
6f8c076b30 add comments for srs thread, add never quit thread. 2015-05-22 12:10:06 +08:00
winlin
948d200ce1 fix #400, parse when got entire http header, by feilong. 2.0.164. 2015-05-22 12:00:48 +08:00
winlin
5d7b0edccc merge from bravo code, fix some warnings. 2015-05-22 11:20:25 +08:00
winlin
44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. 2015-05-19 18:06:20 +08:00
winlin
0f7cafe50b order the xcode project 2015-05-15 14:34:59 +08:00
winlin
c617d2aaa5 support push flv stream over HTTP POST to SRS. 2015-05-10 10:35:35 +08:00
winlin
77ee2400df fix the unicode to ascii 2015-05-09 23:12:12 +08:00
winlin
7fc1cda392 add stream status to api. 2015-05-08 16:45:25 +08:00
winlin
ac13817aae update donation 2015-05-08 07:04:31 +08:00
winlin
f6252c7f72 enable hls for push flv. 2015-05-07 11:07:32 +08:00
winlin
ffdabf32ed add push flv conf 2015-05-05 11:44:20 +08:00
winlin
e221d002a2 fix the flv caster bug, when nread is 0, disconnect it. 2015-05-05 07:37:12 +08:00
winlin
ad32048c1c fix the http flv stream caster. 2015-05-04 21:55:19 +08:00
winlin
cba6675560 refine the http message, set the connection if required. 2015-05-04 19:06:38 +08:00
winlin
ba6c3132e3 refine code, use decoder to parse flv stream 2015-05-04 18:28:41 +08:00
winlin
ea1e015a4e fix the http read chunked encoding bug. 2015-05-04 18:11:52 +08:00
winlin
a95fd6d140 read the http flv stream. 2015-05-03 23:57:22 +08:00
winlin
022b6aa561 refine the http remux for http flv stream. 2015-05-03 23:34:59 +08:00
winlin
f0c24eeacc add stream caster for post flv over http. 2015-05-03 10:56:20 +08:00
winlin
4b372d8d16 change primary to the primary branch. 2015-04-29 18:46:47 +08:00
winlin
e63b8eda51 migarate to srs org. 2015-04-29 18:03:17 +08:00
winlin
8603dba697 migarate to srs org. 2015-04-29 18:01:16 +08:00
winlin
b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:38:23 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
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