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

1964 commits

Author SHA1 Message Date
winlin
2a05783d5c for #293, support http ts stream. 2.0.101 2015-01-22 18:32:10 +08:00
winlin
dfe385d0c9 for #293, move the simple buffer to kernel. 2015-01-22 18:13:33 +08:00
winlin
77d78eac5c for #293, add http ts stream framework. 2015-01-22 17:40:06 +08:00
winlin
0f59073400 refine code, rename the pts to dts although both ok for audio. 2015-01-22 17:35:07 +08:00
winlin
913f98b902 for bug #293, http ts stream, move the avc codec from app to kernel. 2015-01-22 17:08:38 +08:00
winlin
dc6299171f refine http stream code. 2015-01-22 15:05:38 +08:00
winlin
7d86c6d9e9 for bug #293, refine for fast cache of http stream. 2015-01-22 13:16:54 +08:00
winlin
2167a8385c update version to 3.0.101 2015-01-22 09:36:19 +08:00
winlin
25807298ad alias http_stream to http_server. rename http to http_static of vhost. rename http_flv to http_renux 2015-01-22 09:34:33 +08:00
winlin
7305fa6f03 update vs2010 filter 2015-01-22 08:51:24 +08:00
winlin
f26a2a8f0e add vs2010 filters. 2015-01-22 08:50:16 +08:00
winlin
db700a0c64 update vs solution 2015-01-20 19:11:14 +08:00
winlin
31efea4f33 rename srs cmake ide to jetbrains clion 2015-01-20 18:35:24 +08:00
winlin
664c85cf3d Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop 2015-01-20 18:33:48 +08:00
winlin
a3607c9193 use ide dir for ides. 2015-01-20 18:33:04 +08:00
winlin
49330b98b3 Merge pull request #296 from panda1986/develop 
支持mp3音频编码
 2015-01-20 14:27:46 +08:00
panda1986
797c1b0762 support all acodec. not forced to aac. 2015-01-20 14:06:27 +08:00
panda1986
e7d54c2ca9 Update srs_app_ffmpeg.cpp 
srs develop 新增支持mp3转码后，需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断
 2015-01-20 13:52:31 +08:00
winlin
bb1331cc91 update conf. 2015-01-20 13:46:50 +08:00
winlin
b735e29d05 refine conf, add port. 2015-01-20 12:02:25 +08:00
winlin
e5ef4c2e66 update the conf of http static and stream. 2015-01-20 10:53:57 +08:00
winlin
5f194bc87c merge from feilong, the crash for cosumer wait. 2015-01-19 14:05:59 +08:00
winlin
b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 2015-01-19 13:17:46 +08:00
winlin
29a8932b49 for bug #293, use http stream cache for android weixin to happy. 2015-01-19 12:56:05 +08:00
winlin
f9f2fcbb9c for #293, add http stream cache for audio mp3/aac stream. 2015-01-19 12:24:18 +08:00
winlin
e6549b261c for #293, support http mp3 streaming 2015-01-19 10:18:18 +08:00
winlin
d364a81d8f for #293, support http mp3 streaming 2015-01-19 10:13:43 +08:00
winlin
99bf397487 for bug #293, add mp3 id3 spec 2015-01-19 09:25:07 +08:00
winlin
b04888a35d for #293, #277, support http chunked encoding 2015-01-19 01:05:24 +08:00
winlin
15d87537a1 for bug #293, support aac stream. 2015-01-19 00:14:14 +08:00
winlin
3244c083c7 for bug #293, support http aac stream 2015-01-19 00:05:12 +08:00
winlin
7674524c31 for #239, empty the aac encoder 2015-01-18 22:56:01 +08:00
winlin
c0233542bf for #293, add aac encoder for http aac stream. 2015-01-18 22:51:07 +08:00
winlin
77e43d1813 refine comments of aac publish for #212 2015-01-18 22:11:38 +08:00
winlin
c0a7752718 for #293, add aac mime audio/x-aac 2015-01-18 21:17:41 +08:00
winlin
d546827b1c for #293, refine the mime of content type. 2015-01-18 21:04:52 +08:00
winlin
3b853a6dbd fix #293, support rtmp remux to http flv live stream. 2015-01-18 20:07:54 +08:00
winlin
53d9faf395 for #293, update readme. 2015-01-18 19:50:54 +08:00
winlin
eea31ef4f3 for #293, support rtmp remux to http flv live stream. 2015-01-18 19:49:03 +08:00
winlin
faaa9187f2 for #293, mount http flv stream when publish. 2015-01-18 18:50:15 +08:00
winlin
2698e6dbae for bug #293, http live streaming framework. 2015-01-18 18:39:53 +08:00
winlin
eff2d81016 for #293, add http flv stream 2015-01-18 18:00:40 +08:00
winlin
c4302b9b61 for bug #277, the http server subscribe the reload. 2015-01-18 17:17:07 +08:00
winlin
f1393ee43f for bug #277, use http not found when no file. 2015-01-18 17:02:05 +08:00
winlin
398b212bfa for bug #277, refine code, support default http vhost. 2015-01-18 17:01:39 +08:00
winlin
2742c0d3c2 for #277, support http vhost mount. 2015-01-18 16:38:26 +08:00
winlin
4513486266 refine http server, support mount dir for vhost. 2015-01-18 13:34:26 +08:00
winlin
bfff8413b6 refine code for #277, the copy first param is the dest. 2015-01-18 09:16:14 +08:00
winlin
c695a8fcbd refine code for #277, extract the flv vod stream. 2015-01-18 09:12:53 +08:00
winlin
e71bc0cbc5 for bug #277, refine the http server. 2015-01-17 23:44:21 +08:00
winlin
bbe96a4b31 for bug #277, support flv stream. 2015-01-17 23:19:30 +08:00
winlin
cbed2bbca4 fix #277, refine http server refer to go http-framework. 2.0.98 2015-01-17 23:00:40 +08:00
winlin
9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 2015-01-17 21:58:23 +08:00
winlin
a1f887f46f refine code, move onMetaData to consts. 2015-01-17 13:29:11 +08:00
winlin
04aa6f8296 drop script data except the onMetaData packet. 2015-01-17 13:23:30 +08:00
winlin
cc22ca4890 hotfix #290, use iformat only for rtmp input. 2.0.95 2015-01-17 13:06:18 +08:00
winlin
4449a8d7b0 fix #290, use iformat only for rtmp input. 1.0.22 2015-01-17 13:04:52 +08:00
winlin
29be14dd37 merge from feilong, fix memory leak. 2015-01-17 11:16:13 +08:00
winlin
a4b61081cc merge from feilong, fix memory leak. 2015-01-15 11:26:30 +08:00
winlin
fae006ca7c merge from feilong, fix memory leak. 2015-01-15 10:41:20 +08:00
winlin
63309a0538 refine for bug #288, drop info frame without error. 2015-01-14 11:55:15 +08:00
winlin
b705ed0b90 for bug #288, refine the codec decode info frame failed. 1.0.21 2015-01-14 11:32:19 +08:00
winlin
964668dc73 merge from feilong, print format error. 2015-01-14 11:20:21 +08:00
winlin
b3225100e7 Merge pull request #282 from tufang14/develop 
add client num in statistic with traverse every client for #227
 2015-01-09 09:00:08 +08:00
qiang.li
310e49e7f3 add client num in statistic with traverse every client 2015-01-08 21:58:10 +08:00
winlin
982e9555bd merge from feilong, fix hls msg memory leak bug. 2015-01-08 17:48:45 +08:00
winlin
b466756931 merge from feilong for bug #281. 2015-01-08 17:44:08 +08:00
winlin
27e0521ace fix #281, fix hls bug ignore type-9 send aud. 1.0.20 2015-01-08 17:37:28 +08:00
winlin
6c833902f9 merge http api from tufang. 2.0.92 2015-01-08 16:02:33 +08:00
winlin
ac584a4db2 Merge pull request #279 from tufang14/develop 
add client num for stream in statistic for #227
 2015-01-08 15:52:44 +08:00
qiang.li
46d716612c add client num for stream in statistic 2015-01-07 23:27:24 +08:00
winlin
44f5efda21 refine the print info. 2015-01-07 15:46:00 +08:00
winlin
0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91 2015-01-07 15:37:44 +08:00
winlin
5aa31568ba fix the rtmp dump, parse the aggregate msg. 2015-01-07 15:35:01 +08:00
winlin
5661fc2676 refine dvr and rtmp dump, write the original data. 2015-01-07 15:01:58 +08:00
winlin
a402ca7120 refine code, the consumer always alive longer than queue recv thread. 2015-01-07 14:31:42 +08:00
winlin
89a3cf9efe refine code, failed when specified complex but no ssl for srslibrtmp 2015-01-07 13:37:23 +08:00
winlin
0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 2015-01-07 13:29:30 +08:00
qiang.li
08e9f6ef42 add play client num in statistic 2015-01-06 22:20:31 +08:00
winlin
f1efdcd000 refine code, use global virtual id to generate the id of vhost and stream. 2015-01-05 13:08:11 +08:00
winlin
ae63af6a4a refine code, implements the stat.: 2015-01-05 12:57:48 +08:00
winlin
97bea51499 refine the api, response the error code and data. 2015-01-05 12:49:00 +08:00
winlin
cc796a433a refine the statistic arch. 2015-01-05 12:40:38 +08:00
winlin
40ed2249e8 refine code to use the one coding style. 2015-01-05 12:20:46 +08:00
winlin
4bb17f0c81 replace the TAB with 4spaces 2015-01-05 12:14:02 +08:00
winlin
344ff24f66 add srs_app_statistic to upp project. 2015-01-05 12:12:21 +08:00
winlin
67adc8dc61 merge with security bug fix. 2015-01-05 12:09:15 +08:00
qiang.li
a4a93613d0 add statistic for stream 2015-01-04 22:47:12 +08:00
winlin
dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 2015-01-03 15:33:23 +08:00
winlin
dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88 2015-01-03 15:08:46 +08:00
winlin
247b772449 hotfix to remove the pageUrl for http callback. 1.0.19 2015-01-03 15:07:12 +08:00
winlin
7f60d472e6 remove the change vhost forward. 2015-01-03 14:47:19 +08:00
winlin
45724bfaec update conf for transcode. 2015-01-03 14:46:29 +08:00
winlin
0b9bbdbe74 Merge branch '1.0release' into develop 2015-01-03 13:30:13 +08:00
winlin
f9a33fbeee fix the compile failed for utest at 32bits cpus 2015-01-03 13:29:52 +08:00
qiang.li
8d534d3470 get stream info use http api #227 2015-01-03 12:57:13 +08:00
winlin
f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 2015-01-03 12:54:54 +08:00
winlin
f89941254a refine code of security deny check 2015-01-02 16:06:18 +08:00
winlin
18b15b9099 refine comments of security deny check 2015-01-02 16:04:30 +08:00
winlin
75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 2015-01-02 16:02:13 +08:00
winlin
f8ec7c706d merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85 2015-01-02 12:57:44 +08:00
winlin
e590537dca fix #207, trim the last 0 of log. 1.0.18 2015-01-02 12:56:15 +08:00
winlin
07b207b7e3 remove test code for api-server. 2015-01-02 10:30:25 +08:00
winlin
9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 2015-01-02 10:21:04 +08:00
winlin
8df0f724d6 fix #216, http-callback post in application/json content-type. 2.0.83 2015-01-02 09:22:49 +08:00
winlin
ca977ef739 hotfix #216, http-callback post in application/json content-type. 1.0.17 2015-01-02 09:20:45 +08:00
winlin
518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 2015-01-02 09:05:16 +08:00
winlin
c1c01ec802 hotfix #270, memory leak for http client post. 2.0.81 2015-01-01 11:47:18 +08:00
winlin
bb6dfe40c1 fix #270, memory leak for http client post. 1.0.16 2015-01-01 11:44:28 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
1824e18bd2 fix the comment bug. 2014-12-31 20:20:32 +08:00
winlin
12f4abd553 fix #266, aac profile is object id plus one. 2.0.80 2014-12-29 14:24:22 +08:00
winlin
c0a6c3efa3 merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79 2014-12-29 09:07:50 +08:00
winlin
d9aca8ab82 hotfix #267, the forward dest ep should use server. 1.0.15 2014-12-29 09:05:56 +08:00
winlin
e27c95b0e8 merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78 2014-12-29 08:45:19 +08:00
winlin
513c1ec6d5 fix #268, the hls pcr is negative when startup. 1.0.14 2014-12-29 08:38:29 +08:00
winlin
5e9ff71740 refine the log verbose 2014-12-28 20:17:27 +08:00
winlin
2d229b09be refine rtmp protocol stack comments 2014-12-28 15:16:34 +08:00
winlin
5a229e89bf refine the rtmp protocol stack comments, the stream id in little-endian. 2014-12-28 15:11:55 +08:00
winlin
9e35664510 refine the simple handshake comment. 2014-12-28 12:28:33 +08:00
winlin
8757473a7a Merge branch '1.0release' into develop 2014-12-26 22:45:22 +08:00
winlin
dec4f6b989 hotfix 1.0release, add remote gitlab 2014-12-26 22:45:09 +08:00
winlin
8ea6da2607 Merge branch '1.0release' into develop 2014-12-26 21:49:22 +08:00
winlin
dfd4eeca45 hotfix 1.0release, git checkout develop when commit 2014-12-26 21:49:04 +08:00
winlin
9a66d22f3b hotfix 1.0release, 1.0.13 2014-12-26 21:43:00 +08:00
winlin
b8de3bd3b4 convert the core to unix format. 2014-12-25 10:55:12 +08:00
winlin
92146712d8 fix srs-librtmp send raw aac audio channel bug. 2.0.76 2014-12-25 09:52:18 +08:00
winlin
9788570ba5 fix bug for ubuntu14 to build. 2014-12-24 18:32:37 +08:00
winlin
28eedfc177 merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75 2014-12-22 17:12:09 +08:00
winlin
2e43a63bf4 fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12 2014-12-22 17:10:51 +08:00
winlin
b77e1de1d1 fix bug of utest 2014-12-22 15:31:57 +08:00
winlin
81e70e7bdb for bug https://github.com/winlinvip/st-load/pull/3, add ecma array to object. 2014-12-21 11:41:15 +08:00
winlin
eef8034632 merge from 1.0release for bug #264. 2.0.74 2014-12-20 11:58:39 +08:00
winlin
7737042795 fix #264, remove the test code. 1.0.11 2014-12-20 11:56:16 +08:00
winlin
1dfac0bf1d fix #264, support disconnect publish connect when hls error. 1.0.11 2014-12-20 11:45:59 +08:00
winlin
db13c725a6 refine #259, rename the on_dispose to wakeup. 2.0.73 2014-12-19 09:19:47 +08:00
winlin
61a648f1d2 refine for #259, chmod -x files. 2014-12-19 09:07:31 +08:00
winlin
24815e4efe refine code for bug #239 2014-12-02 15:33:22 +08:00
winlin
304208f822 fix #239, traverse the token before response connect. 1.0.10. 2014-12-02 15:27:36 +08:00
tufang14
3d0d43c5dc token bug 
多级origin-edge模式，edge上功能不生效
 2014-12-02 14:38:54 +08:00
winlin
0c132e9781 update the log position. 2014-11-28 10:58:16 +08:00
winlin
127b96b255 add git2unix and git commit script. 2014-11-28 10:42:47 +08:00
winlin
9c033c7da6 hotfix 1.0, author bug, use error macro. 1.0.9 2014-11-27 18:48:01 +08:00
winlin
575e50b6e2 hotfix to add comments on 1.0release 2014-11-27 17:47:13 +08:00
winlin
be53b10ed3 refine log position 2014-11-27 08:04:39 +08:00
winlin
d91a9dfa9d udpate the srs_bwt. 2014-11-25 11:10:54 +08:00
winlin
cd0ab5fb43 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:50:59 +08:00
winlin
db7af6259a update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:50:25 +08:00
winlin
d672fae255 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8 2014-11-25 10:07:41 +08:00
winlin
44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:06:26 +08:00