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

2514 commits

Author SHA1 Message Date
winlin
e743795f3d Merge branch '2.0release' into develop 2015-06-14 08:43:53 +08:00
winlin
baa892a762 merge srs_app_st_socket to srs_app_st. 2015-06-14 08:43:38 +08:00
winlin
c58b7231e2 Merge branch '2.0release' into develop 2015-06-13 17:23:53 +08:00
winlin
17c276113e refine the hls dispose, when not cycle always dispose it. 2015-06-13 17:23:38 +08:00
winlin
ec90ae2082 refine the space of code. 2015-06-13 16:42:05 +08:00
winlin
2f44a29b76 Merge branch '2.0release' into develop 2015-06-13 16:05:26 +08:00
winlin
d103557a8b merge the rtmp sdk to stack. 2015-06-13 16:04:59 +08:00
winlin
0d66e92ab5 refine code, support configure to enable --memory-watch 2015-06-13 15:45:25 +08:00
winlin
69b7c57511 Merge branch '2.0release' into develop 2015-06-12 16:08:58 +08:00
winlin
0d6a574216 fix the hls_dispose bug, ignore for 0. 2015-06-12 16:08:47 +08:00
winlin
b0ce38dc8f merge from 2.0 2015-06-10 15:38:44 +08:00
winlin
56938efdbd fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 2015-06-10 15:38:13 +08:00
winlin
12eab8a128 merge from srs2. 2015-06-10 13:53:57 +08:00
winlin
6941f2c072 fix #424, fix aggregate timestamp bug. 2.0.174 2015-06-10 13:53:13 +08:00
winlin
8e8c8108fc refine the time jitter code. 2015-06-09 21:04:30 +08:00
winlin
1f1776a0d8 fix the export project bug. wakeup connection when dispose server. 2015-06-09 14:38:05 +08:00
winlin
bf9166dbec Merge branch '2.0release' into develop 2015-06-09 11:51:49 +08:00
winlin
969ed7b0ae refine build summary. 2015-06-09 11:51:40 +08:00
winlin
66837ffa6e fix the thread stop bug, must wait when not joinable. 2015-06-09 11:47:04 +08:00
winlin
d317528af9 refine the signal manager. 2015-06-09 11:19:28 +08:00
winlin
7996b3b789 add warning for gmp, use gmc to detect memory leak. 2015-06-09 10:52:32 +08:00
winlin
f347099fd1 for memory leak detect, move the payload create to message. 2015-06-09 10:13:25 +08:00
winlin
863dddde09 fix typo of code. 2015-06-08 17:43:28 +08:00
winlin
19e1f610a3 merge from bravo, parse the http reponse in json of bravo system. 2015-06-08 17:28:39 +08:00
winlin
00d1fdded0 Merge branch '2.0release' into develop 2015-06-08 15:02:30 +08:00
winlin
574cf6a094 use libfdk_aac for srs2. 2015-06-08 15:02:19 +08:00
winlin
00a25ee5c5 cleanup connections when terminate server. 2015-06-08 14:08:12 +08:00
winlin
d7e5df2578 cleanup connections when terminate server. 2015-06-08 14:03:16 +08:00
winlin
573495a19f refine the memory watcher. 2015-06-08 09:47:45 +08:00
winlin
bb4db61192 add srs memory watcher. 2015-06-07 15:12:55 +08:00
winlin
811ef4bcf6 dispose the gop cache 2015-06-07 09:27:47 +08:00
winlin
600e8e10d0 Merge branch '2.0release' into develop 2015-06-06 22:04:37 +08:00
winlin
beb0431746 detect the monotonically increase and warn to use mix_correct 2015-06-06 22:04:24 +08:00
winlin
57f01185f5 Merge branch '2.0release' into develop 2015-06-06 21:54:54 +08:00
winlin
2d9f258eaf refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio. 2015-06-06 21:54:43 +08:00
winlin
17d6016bf6 Merge branch '2.0release' into develop 2015-06-06 21:42:12 +08:00
winlin
ec24533955 use smaller value for publish timeout. 2015-06-06 21:42:01 +08:00
winlin
a6dd8fb3a1 fix #421, when mix correct on, must check the type of dequeue msg. 2015-06-06 21:31:39 +08:00
winlin
5d75e32e1d Merge branch '2.0release' into develop 2015-06-06 21:24:06 +08:00
winlin
a1dd734318 fix #421, drop video for unkown RTMP header. 2015-06-06 21:23:57 +08:00
winlin
679b4317d8 fix the build failed bug. 2015-06-06 20:34:49 +08:00
winlin
0fbfad4172 fix gop cache, drop video only when video and not h.264 2015-06-06 20:23:18 +08:00
winlin
2a1db36750 refine the pithy print of ingesters. 2015-06-06 18:57:41 +08:00
winlin
d10d57716a Merge branch '2.0release' into develop 2015-06-05 21:34:39 +08:00
winlin
e4c27a51b8 fix the hls bug 2015-06-05 21:34:28 +08:00
winlin
4400b12515 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-06-05 20:38:51 +08:00
winlin
26b76c0e4c fix #420, remove ts for hls ram mode. 2015-06-05 20:38:01 +08:00
winlin
5dd81d182c Merge branch '2.0release' into develop 2015-06-03 10:13:58 +08:00
winlin
af9efe9213 disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls. 2015-06-03 10:13:46 +08:00
winlin
982a937e84 Merge branch '2.0release' into develop 2015-06-02 12:56:17 +08:00
winlin
4e42b9c628 copy the request for hls. 2015-06-02 12:56:04 +08:00
winlin
091b480ac9 Merge branch '2.0release' into develop 2015-06-01 10:14:58 +08:00
winlin
679583dad6 refine comments of ffmpeg. 2015-06-01 10:14:46 +08:00
winlin
c1172c9940 Merge branch '2.0release' into develop 2015-05-30 21:40:51 +08:00
winlin
03d951c0fb fix the audio or video pid generate bug. 2015-05-30 21:40:39 +08:00
winlin
c3c4cb2f2a Merge branch '2.0release' into develop 2015-05-30 21:20:21 +08:00
winlin
96f8f1f502 fix build bug. 2015-05-30 21:20:07 +08:00
winlin
09750082e5 Merge branch '2.0release' into develop 2015-05-30 21:14:56 +08:00
winlin
0a87b567f6 fix the build failed bug. 2015-05-30 21:14:10 +08:00
winlin
9dce971d57 merge from srs2 2015-05-30 14:41:47 +08:00
winlin
223ae194b1 fix #209, cleanup hls when stop and timeout. 2.0.173. 2015-05-30 14:41:09 +08:00
winlin
4a80a5a71e for #209, support cleanup when srs stop. 2015-05-30 13:48:29 +08:00
winlin
860d68e6e7 for #374, use fast stop for ingesters to stop many FFMPEG. 2015-05-30 11:25:33 +08:00
winlin
d611bb6b45 for #209, server cycle to enable the hls to cleanup. do dispose 2015-05-30 10:48:02 +08:00
winlin
567d84e997 fix #374: when terminate srs, cleanup to ensure FFMPEG quit. 2015-05-30 09:58:17 +08:00
winlin
db57a519a9 for #374, use SIGINT then SIGKILL to try to kill FFMPEG gracefullly. 2015-05-30 09:32:03 +08:00
winlin
597993d414 support pure video hls. 2015-05-29 21:53:37 +08:00
winlin
5caafadd45 fix #409: support pure video hls. 2.0.172. 2015-05-29 21:43:17 +08:00
winlin
27a1fee6b9 Merge branch '2.0release' into develop 2015-05-28 21:02:50 +08:00
winlin
af4eec90ac for srs-dolphin, support HTTP and RTMP. 2015-05-28 21:02:43 +08:00
winlin
b44987fac7 Merge branch '2.0release' into develop 2015-05-28 14:59:19 +08:00
winlin
394e070b2e support dolphin 2015-05-28 14:59:12 +08:00
winlin
e5461d2df9 refine code 2015-05-28 07:03:38 +08:00
winlin
60775485c4 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 2015-05-27 23:44:07 +08:00
winlin
385ee893f5 update readme 2015-05-27 23:43:44 +08:00
zhengfl
4864e796d6 fix #408:Queue丢视频时，不应该丢弃SequenceHeader 2015-05-27 16:16:15 +08:00
winlin
7e04975b8d fix the test configure script 2015-05-27 11:38:10 +08:00
winlin
1150cde829 fix the verbose build failed. 2015-05-27 11:12:52 +08:00
winlin
ca01bd407b fix the bug of test configure script. 2015-05-27 10:55:46 +08:00
winlin
fec8422d6b fix bug of configure. 2015-05-27 10:23:40 +08:00
winlin
eb488e3bde fix the test configure script bug 2015-05-27 07:32:51 +08:00
winlin
02c4741d64 add usage and make jobs support for configure test script 2015-05-27 07:30:37 +08:00
winlin
c1b9541b5c support disable all 2015-05-27 07:22:44 +08:00
winlin
9ab579c6e8 refine the configure test script. 2015-05-27 07:06:16 +08:00
winlin
409c1e4823 Merge branch '2.0release' into develop 2015-05-25 08:17:22 +08:00
winlin
2e1ca3c751 fix the build failed bug. 2015-05-25 08:17:11 +08:00
winlin
cd162c2848 merge from 2.0 2015-05-25 01:04:04 +08:00
winlin
d12fc7fcc5 fix #405, improve the HTTP FLV performance to 6k. 2.0.171 2015-05-25 01:02:06 +08:00
winlin
4df19ba99a for #405, improve the http flv to 3k. 2.0.170 2015-05-24 23:29:17 +08:00
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
2661e3c419 Merge branch '2.0release' into develop 2015-05-24 18:57:02 +08:00
winlin
cf9ee04611 fix the utest build failed bug. 2015-05-24 18:56:52 +08:00
winlin
f540ce307b merge from 2.0 2015-05-24 15:19:50 +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
58b336451d Merge branch '2.0release' into develop 2015-05-24 09:15:37 +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
2f66c8dd09 Merge branch '2.0release' into develop 2015-05-23 19:22:45 +08:00
winlin
93a1d097dc update jwplayer to support play HTTP flv. 2015-05-23 19:22:37 +08:00
winlin
829b3a392b merge from 2.0 2015-05-23 18:11:33 +08:00
winlin
e96150b7db update readme 2015-05-23 15:22:20 +08:00
winlin
6b28dec8ec merge from 2.0release. refine the thread, protocol, kbps code. 2.0.166 2015-05-23 10:05:06 +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
478873fdec Merge branch '2.0release' into develop 2015-05-23 09:49:23 +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
7243cdbff6 merge from 2.0release. 2015-05-22 17:20:30 +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
f6d2fd991b merge from 2.0.162 2015-05-10 10:36:49 +08:00
winlin
c617d2aaa5 support push flv stream over HTTP POST to SRS. 2015-05-10 10:35:35 +08:00
winlin
39f5f80b6c Merge branch '2.0release' into develop 2015-05-09 23:12:23 +08:00
winlin
77ee2400df fix the unicode to ascii 2015-05-09 23:12:12 +08:00
winlin
1fd69beea5 Merge branch '2.0release' into develop 2015-05-08 16:45:48 +08:00
winlin
7fc1cda392 add stream status to api. 2015-05-08 16:45:25 +08:00
winlin
7ce9398b41 Merge branch '2.0release' into develop 2015-05-08 07:04:36 +08:00
winlin
ac13817aae update donation 2015-05-08 07:04:31 +08:00
winlin
2d61a8cfaf Merge branch '2.0release' into develop 2015-05-07 11:07:42 +08:00
winlin
f6252c7f72 enable hls for push flv. 2015-05-07 11:07:32 +08:00
winlin
644454a4f5 Merge branch '2.0release' into develop 2015-05-05 11:46:28 +08:00
winlin
ffdabf32ed add push flv conf 2015-05-05 11:44:20 +08:00
winlin
f13c4d3a0f Merge branch '2.0release' into develop 2015-05-05 07:37: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
e516c7f7a5 Merge branch '2.0release' into develop 2015-05-04 21:55:28 +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
411f5a1d2a Merge branch '2.0release' into develop 2015-05-04 18:12:00 +08:00
winlin
ea1e015a4e fix the http read chunked encoding bug. 2015-05-04 18:11:52 +08:00
winlin
da00b67c76 Merge branch '2.0release' into develop 2015-05-03 23:57:32 +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
91e285b0cd Merge branch '2.0release' into develop 2015-04-29 18:46:54 +08:00
winlin
4b372d8d16 change primary to the primary branch. 2015-04-29 18:46:47 +08:00
winlin
94681702e1 Merge branch '2.0release' into develop 2015-04-29 18:03:20 +08:00
winlin
e63b8eda51 migarate to srs org. 2015-04-29 18:03:17 +08:00
winlin
42ddb76544 Merge branch '2.0release' into develop 2015-04-29 18:01:24 +08:00
winlin
8603dba697 migarate to srs org. 2015-04-29 18:01:16 +08:00
winlin
17b15deee6 Merge branch '2.0release' into develop 2015-04-29 17:38:29 +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
53e92a17f5 Merge branch '2.0release' into develop 2015-04-29 17:06:40 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
5559fb9842 Merge branch '2.0release' into develop 2015-04-29 15:44:53 +08:00
winlin
b3bd007f0d update git commit 2015-04-29 15:09:03 +08:00
winlin
ae6d0a5ab1 Merge branch '2.0release' into develop 2015-04-29 09:25:08 +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
114f4447bb Merge branch '2.0release' into develop 2015-04-21 18:18:59 +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
3e0ba172a3 Merge branch '2.0release' into develop 2015-04-21 12:53:52 +08:00
winlin
a28eec89b0 support ingest hls with m3u8 in m3u8. 2015-04-21 12:53:45 +08:00
winlin
7d5f1c2be8 Merge branch '2.0release' into develop 2015-04-20 18:31:52 +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
6726a88f47 merge from 2.0release 2015-04-15 17:12:57 +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
70c1d3cc7e Merge branch '2.0release' into develop 2015-04-14 11:37:06 +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
0c939e7114 merge from 2.0.160: 2015-04-13 10:33: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