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

2686 commits

Author SHA1 Message Date
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
winlin
9759b78da8 Merge branch '2.0release' into develop 2015-04-10 21:06:16 +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
17c1423f4a Merge branch '2.0release' into develop 2015-04-10 12:01:52 +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
425e69e0cd Merge branch '2.0release' into develop 2015-04-09 18:03:55 +08:00
winlin
23b310971e guess again when annexb change to ibmf. 2015-04-09 18:03:45 +08:00
winlin
71e1602458 merge from 2.0.159 2015-04-09 12:35:53 +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
cfed8e81c5 merge from 2.0.158 2015-04-07 17:44:09 +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
931370e9f6 Merge branch '2.0release' into develop 2015-04-07 10:30:53 +08:00
winlin
e7fd309cb0 refine hls info, show the deviation in seconds and pieces. 2015-04-07 10:30:45 +08:00
winlin
e958305d09 Merge branch '2.0release' into develop 2015-04-04 18:24:13 +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
4f9df4f1a0 merge from 2.0.157, reap ts on the IDR. 2015-04-04 13:31:02 +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
90cd16aae4 Merge branch '2.0release' into develop 2015-04-03 14:36:09 +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
cb148e43ee merge from 2.0.155 2015-04-03 10:57:34 +08:00
winlin
17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 2015-04-03 10:56:56 +08:00
winlin
d95e5a3f47 Merge branch '2.0release' into develop 2015-04-02 15:07:29 +08:00
winlin
4d98cbb965 add hls config in api. 2015-04-02 15:05:09 +08:00
winlin
fe5783e7a4 merge 2.0.154 2015-04-02 11:52:49 +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
2d3d628865 merge from 2.0.153 2015-03-31 18:09:13 +08:00
winlin
717d088376 support server cycle handler. 2.0.153. 2015-03-31 18:06:55 +08:00
winlin
e75b7e89d6 merge from 2.0.152 2015-03-31 17:53:32 +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
ef28865991 merge from 2.0.151 2015-03-31 15:54:37 +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
40f186ba82 Merge branch '2.0release' into develop 2015-03-30 14:08:26 +08:00
winlin
cd682ae4be update donations. fix hls path bug. 2015-03-30 14:08:17 +08:00
winlin
abbed8f66c merge from 2.0release 2015-03-30 12:56:52 +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
922adaf59f Merge branch '2.0release' into develop 2015-03-29 22:35:10 +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
winlin
75ca70c619 Merge branch '2.0release' into develop 2015-03-26 19:58:27 +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
12d5431f3b Merge branch '2.0release' into develop 2015-03-26 10:31:19 +08:00
winlin
b319e9ff9c ignore when sps/pps consumed all frame. 2015-03-26 10:31:13 +08:00
winlin
c250e3e651 Merg branch '2.0release' into develop 2015-03-25 20:39:01 +08:00
winlin
e818f36316 fix #360, fix build bug for centos7. 2015-03-25 20:38:51 +08:00
winlin
713cedfbb4 fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 2015-03-23 23:14:29 +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
d16ae193f6 Merge branch '2.0release' into develop 2015-03-23 22:06:25 +08:00
winlin
fcab17741c fix #222, the dvr path rule changed. 2015-03-23 22:06:18 +08:00
winlin
df3f24403e Merge branch '2.0release' into develop 2015-03-23 21:21:42 +08:00
winlin
02addf61f7 fix #302, remove the thread unsafe code, no static. 2015-03-23 21:21:36 +08:00
winlin
bfa46e7a98 fix #302, remove the thread unsafe code, no static. 2015-03-23 21:19:35 +08:00
winlin
f69fa7273b fix #302, remove the thread unsafe code, no static. 2015-03-23 21:19:04 +08:00
winlin
09ce6651eb Merge branch '2.0release' into develop 2015-03-23 17:49:52 +08:00
winlin
1cb2992808 refine build for modules, add defines. 2015-03-23 17:49:45 +08:00
winlin
0a7b179e14 Merge branch '2.0release' into develop 2015-03-21 15:38:29 +08:00
winlin
2f2aaf5ee4 for #155, refine code, donot check network devices for osx. 2015-03-21 15:38:22 +08:00
winlin
e7e17cf15d fix osx bug. 2015-03-21 15:24:26 +08:00
winlin
33cca3e027 for #155, add todo for osx. 2.0.146 2015-03-21 15:22:45 +08:00
winlin
e45c62003a Merge branch '2.0release' into develop 2015-03-21 11:55:35 +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
45d9018051 Merge branch '2.0release' into develop 2015-03-21 10:25:09 +08:00
winlin
c6817cc422 for #354, remove the double underscore of macro. 2015-03-21 10:25:03 +08:00
winlin
3ca906d560 Merge branch '2.0release' into develop 2015-03-20 15:10:34 +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
b1142d83fc Merge branch '2.0release' into develop 2015-03-19 17:24:37 +08:00
winlin
0319e85f99 support config the audio overflow ratio. 2015-03-19 17:24:27 +08:00
winlin
b7138ba9c5 merge from 2.0 2015-03-19 10:17:51 +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
4a50bf1894 Merge branch '2.0release' into develop 2015-03-18 16:50:54 +08:00
winlin
fbd722bf76 refine the fast buffer to more readable. 2015-03-18 16:50:47 +08:00
winlin
d25eb0aaa2 merge from 2.0 2015-03-18 16:35:24 +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
df2644c850 merge from 2.0release 2015-03-17 23:48:50 +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
winlin
1ad0c847ce fix http parse bug 2015-03-11 14:55:46 +08:00
winlin
f247ac9daf fix the http parse bug. 2015-03-11 14:48:51 +08:00
wenjie.zhao
d4198ee8ba add hds supported. 2015-03-11 13:34:58 +08:00
winlin
5370493140 add ingest to mac.dev conf. 2015-03-11 13:24:14 +08:00
winlin
24616e15b5 remove the code for xcode, not required. 2015-03-10 18:33:32 +08:00
winlin
b3aed2cb59 fix the bug of configure. 2015-03-10 18:18:47 +08:00
winlin
f9767c91b5 fix configure bug, refine code for stream caster. 2015-03-10 18:07:43 +08:00
winlin
6c11207e28 fix http ts bug, the adts use id=1 which indicates the aac encoding. 2015-03-10 17:58:29 +08:00
winlin
5c3c38684b fix the bug of flv stream, metadata type should be 18 2015-03-10 17:04:02 +08:00
winlin
0ff49fd299 for #155, debug srs on xcode. 2015-03-10 13:13:31 +08:00
winlin
db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 2015-03-10 12:50:27 +08:00
winlin
20fb5f3e8e modify the colorful bash for osx. 2015-03-09 23:20:12 +08:00
winlin
b0953c1d3a add comments of audio profile supported by srs. 2015-03-08 20:02:43 +08:00
winlin
5143e3a58d fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 2015-03-08 19:59:10 +08:00
winlin
2e9f2753c9 for #316, add stream codec info. 2.0.135 2015-03-08 18:33:35 +08:00
winlin
885b9af122 for #310, refine code to support he/hev2, use aac object. 2015-03-08 17:56:49 +08:00
winlin
8dbabe3708 fix #310, refine aac LC, support aac HE/HEv2. 2.0.134. 2015-03-08 17:36:43 +08:00
winlin
d3e2838fc6 for #310, refine the aac profile for adts and aac object for RTMP sequence header. 2015-03-08 17:33:52 +08:00
winlin
04f3f2a8f8 for #316, add codec info to stream. 2015-03-08 15:33:08 +08:00
winlin
8bf60895a9 refine the kbps of server. 2015-03-08 12:55:40 +08:00
winlin
fbbe46d272 refine the config, support directly parse file. 2015-03-07 22:25:43 +08:00
winlin
b8e70f8538 support module 2015-03-07 16:49:21 +08:00
winlin
ee30e6bb1f Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop 2015-03-07 16:39:56 +08:00
winlin
05d238f860 support modules. 2015-03-07 16:39:05 +08:00
winlin
688890cd7a refine configure, generate objs/makefile first. 2015-03-07 16:37:29 +08:00
winlin
a29b8a7a5b refine configure, move auto headers to script. 2015-03-07 16:33:06 +08:00
winlin
aaf87cf3d9 add srs module rule. 2015-03-07 16:29:18 +08:00
winlin
b360fe279d remove libaacplus. 2015-03-06 22:35:02 +08:00
winlin
496f689de7 fix bug for libfdk aac. 2015-03-06 22:29:49 +08:00
winlin
f26e719800 fix #322, fix http-flv stream bug, support multiple streams. 2.0.133. 2015-03-06 13:37:57 +08:00
winlin
1277968d4a refine http client, use initialize to set host and port. 2015-03-06 12:07:12 +08:00
winlin
2bcb4f811c refine http. 2015-03-06 11:56:28 +08:00
winlin
964e4be9d4 refine http request post. 2.0.132. 2015-03-06 11:51:20 +08:00
winlin
3982ec1d87 refine http request parse. 2.0.132. 2015-03-06 11:36:26 +08:00
winlin
4325809daf refine http 2015-03-05 21:45:01 +08:00
winlin
6fccfa061d refine the http request code. 2015-03-05 10:36:40 +08:00
winlin
025b707330 refine the http request reader. 2015-03-04 18:20:15 +08:00
winlin
3e394a5f06 for #320, set socket send buffer to smaller macro. 2.0.131 2015-03-04 16:52:43 +08:00
winlin
04dc60ebe1 refine http for srs, rename SrsGoHttp to SrsHttp. 2015-03-04 13:09:35 +08:00
winlin
983ab8fb89 pass all utest for 2.0 2015-03-04 12:24:22 +08:00
winlin
e7fd733dc5 fix the long long warning. 2015-03-04 09:59:40 +08:00
winlin
3d47fbdc5c fix build failed of utest. 2015-03-04 09:18:15 +08:00
winlin
a47dbf7a92 for #320, refine code. 2015-03-03 17:28:07 +08:00
winlin
34d6a2ece5 for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129 2015-03-03 17:22:44 +08:00
winlin
f619f174e6 add readme for ide. 2015-03-03 15:28:18 +08:00
winlin
5d0cb7e68f update conf for rtsp 2015-03-01 21:24:01 +08:00
winlin
012c29e124 for #133, update the wiki. 2015-03-01 21:08:44 +08:00
winlin
fb3fced8d0 for #179, revert dvr http api. 2.0.128. 2015-03-01 17:57:28 +08:00
winlin
8ed256b7e9 for #179, wait keyframe for dvr. 2.0.127 2015-02-27 21:11:29 +08:00
winlin
0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 2015-02-27 20:39:36 +08:00
winlin
b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 2015-02-25 09:20:11 +08:00
winlin
1cb8e44b1b fix #304, fix hls bug, write pts/dts error. 2.0.124. 2015-02-24 18:39:31 +08:00
winlin
a3648063d5 fix #179, support dvr http api. 2.0.123. 2015-02-24 17:29:30 +08:00
winlin
d650118988 fix #179, dvr support api to start or stop. 2.0.123 2015-02-23 19:23:32 +08:00
winlin
1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 2015-02-22 10:45:13 +08:00
winlin
849e59b05d for #179, support http api to start dvr. 2015-02-21 23:09:21 +08:00
winlin
c67a4fdf97 for #179, enable http api crossdomain for dvr api. 2015-02-21 21:17:59 +08:00
winlin
1445086451 for #179, update the metadata of flv dvr file. 2015-02-21 19:14:05 +08:00
winlin
7077b74d03 for #179, add dvr plan append. 2015-02-21 16:52:37 +08:00
winlin
95b4baee7c for #179, refine dvr code to more simple. 2015-02-21 16:25:04 +08:00
winlin
3d225e1bc7 refine dvr, donot append the flv header. 2015-02-19 20:08:56 +08:00
winlin
a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 2015-02-19 19:50:10 +08:00
winlin
1102c7a58f refine pithy print to more easyer to use 2.0.121. 2015-02-19 18:56:21 +08:00
winlin
9d233db27e fix #133, support push rtsp to srs. 2.0.120. 2015-02-18 22:28:39 +08:00
winlin
a954040d29 for #133, rtsp parse aac from rtp packet. 2015-02-18 13:37:08 +08:00
winlin
0cc693a3b8 for #133, decode the h264 NALU from rtp. 2015-02-18 11:49:42 +08:00
winlin
6a64164985 for #133, show more info about rtp. 2015-02-18 07:27:11 +08:00
winlin
45c0b12958 for #133, finish rtsp sdp, start rtp. 2015-02-17 22:20:47 +08:00
winlin
f14af45413 for #133, alloc and free rtp port. 2015-02-17 21:10:06 +08:00
winlin
d4ceff649f the join maybe failed, should use a variable to ensure thread terminated. 2.0.119. 2015-02-17 21:03:39 +08:00
winlin
ccc30c70c4 the join maybe failed, should use a variable to ensure thread terminated. 1.0.28. 2015-02-17 21:01:44 +08:00
winlin
40fbfd8560 for #133, rtsp extract tcp/udp listener. 2015-02-17 16:28:28 +08:00
winlin
4807f7850d for #133, rtsp parse the announce packet, parse the sps/pps and audio sequence header by base64. 2015-02-17 14:16:02 +08:00
winlin
604f4cc57b for #133, support the rtsp options request and response. 2015-02-16 22:15:59 +08:00
winlin
c0e50265bd for #133, create rtsp framework. 2015-02-16 14:05:01 +08:00
winlin
e81e090239 for #133, add rtsp listener and handler. 2015-02-15 21:28:31 +08:00
winlin
78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 2015-02-15 18:11:24 +08:00
winlin
922150b2cf for #304, rewrite hls/ts code, support h.264+mp3 for hls. 2.0.117. 2015-02-15 17:43:35 +08:00
winlin
3c813847bd rewrite the ts remux of hls. 2.0.117 2015-02-15 16:37:28 +08:00
winlin
1ed3e283ab implements the pat/pmt write ts header. 2015-02-14 23:06:01 +08:00
winlin
e88c1e32ee always increasing target duration, for #304 2015-02-14 16:30:04 +08:00
winlin
25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 2015-02-12 13:34:59 +08:00
winlin
381e88d698 add release code. ZhouGuowen for SRS2.0 2015-02-11 08:52:52 +08:00
winlin
b982b27f6f add dev code for each release. HuKaiqun for SRS1.0 2015-02-11 08:48:22 +08:00
winlin
e19ee0cb99 for #311, set pcr_base to dts. 2.0.114. 2015-02-10 23:15:43 +08:00
winlin
87519aaae8 fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114 2015-02-10 22:37:29 +08:00
winlin
66931a8890 try to fix hls problem, print the video packets. 2015-02-10 19:58:24 +08:00
winlin
b8d4f68a69 try to refine hls, always flush video when reap segment. 2015-02-10 19:32:42 +08:00
winlin
5a3cd235fd refine hls, try to fix the hls ts corrupt problem. 2015-02-10 19:09:31 +08:00
winlin
d5e3ac4e7d for #310, the aac profile must be object plus one. 1.0.26 2015-02-10 17:15:50 +08:00
winlin
4820d455d5 for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113 2015-02-10 16:58:13 +08:00
winlin
f8bdd28de6 add comments for hls m3u8, target duration may should not changed. 2015-02-10 15:18:20 +08:00
winlin
693c7a5349 refine hls m3u8, use LR(0x0a, \n) as new line char 2015-02-10 11:38:14 +08:00
winlin
81ea6d34ce add pdf of hls rfc, corrent the content type. 2015-02-10 10:58:27 +08:00
winlin
30b1759aa9 fix bug for memory hls. 2015-02-07 18:01:12 +08:00
winlin
bdda337f33 fix aac adts bug, the frame length is 2bits. 2015-02-04 14:42:49 +08:00
winlin
0af6e5e829 fix bug for srs-librtmp 2015-02-03 17:37:21 +08:00
winlin
dba983d124 for #136, update the config for ram hls. 2015-02-03 16:29:59 +08:00
winlin
a23191497f fix #136, support hls without io(in ram). 2.0.112 2015-02-03 16:01:07 +08:00
winlin
89b37d3469 for #136, refine the conf for hls. 2015-02-02 13:39:23 +08:00
winlin
4d10cc9f59 for #250, add conf. 2015-01-31 23:44:35 +08:00
winlin
16afe7ddbb fix #250, support push MPEGTS over UDP to SRS. 2.0.111 2015-01-31 23:20:00 +08:00
winlin
4246be92c9 for #250, merge avc to codec. use queue to dequeue. 2015-01-31 21:16:42 +08:00
winlin
153a3a6c42 must user pithy print for mpegts print. 2015-01-31 19:49:35 +08:00
winlin
70c8fe13c4 for #250, support h264 video for push mpegts over udp. 2.0.110 2015-01-31 19:46:55 +08:00
winlin
66fccdbbd1 for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109. 2015-01-31 12:21:04 +08:00
winlin
bce78fdab6 for #250, add comments for elemetary stream specifed by stream_id. 2015-01-31 11:46:51 +08:00
winlin
a384cc400a for #250, use udp packet handler. 2015-01-30 00:04:20 +08:00
winlin
35ab0ea627 for #250, use buffer to cache bytes, for system will split the udp packet. 2015-01-29 23:54:04 +08:00
winlin
b38bae2a89 for #250, refine parse pes packet, remove the clear method. 2015-01-29 23:08:26 +08:00
winlin
1685cdd48e for #250, parse pes packet ok, ts message ok. 2015-01-29 22:58:02 +08:00
winlin
486277089d for #250, parse the PES ts packet payload. 2015-01-29 13:54:07 +08:00
winlin
755e61e011 update the qt project. 2015-01-29 11:27:56 +08:00
winlin
8374017329 build libfdk-aac in ffmpeg. 2.0.108 2015-01-29 10:45:19 +08:00
winlin
cc87992fe0 for #250, decode the PMT and PAT 2015-01-27 18:35:43 +08:00
winlin
7692e50fc2 for #250, calc and verify the crc32 of PAT. 2015-01-27 17:04:30 +08:00
winlin
52b62918d9 for #250, decode the PAT of PSI ts packet. 2015-01-27 16:25:46 +08:00
winlin
51aecb8fde for #250, decode the ts packet header and adaptation field. 2015-01-27 14:28:59 +08:00
winlin
bd395904df for #250, the ts packet and adaptation field. 2015-01-27 11:13:03 +08:00
winlin
aff7a1cb4d add ts packet definition for #250. 2015-01-26 17:06:06 +08:00
winlin
919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 2015-01-25 17:06:49 +08:00
winlin
2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 2015-01-25 16:42:22 +08:00
winlin
aaade0f04f for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105 2015-01-25 13:35:53 +08:00
winlin
9cbc753e8e for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25 2015-01-25 13:30:45 +08:00
winlin
c9d270fbe0 refine code for #250, ts remux 2015-01-25 13:19:22 +08:00
winlin
b0daf1482d update version to 1.0.24 2015-01-25 13:10:30 +08:00
winlin
1835957a2b for #151, refine pcr=dts-800ms and use dts/pts directly. 1.0.24 2015-01-25 13:04:12 +08:00
winlin
ea85ad2e20 for #293, #250, move the ts codec to kernel ts. 2015-01-25 10:54:25 +08:00
winlin
d22e4e86d8 update projects for rtmp renamed to protocol 2015-01-24 16:59:36 +08:00
winlin
711b6ca277 for #250, basic stream caster framework. 2.0.104 2015-01-24 16:31:32 +08:00
winlin
6463d22a14 for #250, add mpegts over udp stream caster class. 2015-01-24 16:27:30 +08:00
winlin
7f02bfa3a4 for #250, the mpegts over udp stream caster framework. 2015-01-24 15:36:11 +08:00
winlin
52891b491a listen and serve stream caster mpegts over udp. 2015-01-24 14:52:52 +08:00
winlin
f9d1e1111a merge from feilong, consumer directly sleep when paused. 2015-01-23 17:07:17 +08:00
winlin
8ace73f30d for #151, use absolutely overflow to make jwplayer happy. 2.0.103 2015-01-23 15:29:14 +08:00
winlin
4f5cc9c403 for #151, use absolutely overflow to make jwplayer happy. 1.0.23 2015-01-23 15:14:29 +08:00
winlin
6b89ffbc1d add config section for stream caster. 2015-01-23 15:06:12 +08:00
winlin
73cfdea332 for #299, srs http server support dash vod stream over mp4 range. 2.0.103 2015-01-23 13:45:59 +08:00
winlin
e0ee8de2fb for #299, srs http server support dash, flash request range in range or bytes. 2015-01-23 13:17:50 +08:00
winlin
a4ba40952a for #250, rename rtmp to protocol dir. 2015-01-23 10:07:20 +08:00
winlin
d9a012164e update vs2010 project. 2015-01-22 19:01:21 +08:00
winlin
a647043a06 update readme and wiki url for http ts stream 2015-01-22 18:39:53 +08:00
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