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

578 commits

Author SHA1 Message Date
winlin
c759a7c6b5 refine log of ffmpeg 2014-04-07 11:20:03 +08:00
winlin
4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg 2014-04-07 10:15:44 +08:00
winlin
72c330d47c refine ffmepg and encoder, extract ffmpeg. 2014-04-07 09:34:36 +08:00
winlin
095364a72b refine ingest, start/stop ingest in server 2014-04-07 09:27:30 +08:00
winlin
eea2310b07 refine consts 2014-04-07 09:07:12 +08:00
winlin
4a7378b77a ingest stream when server cycle 2014-04-07 08:41:32 +08:00
winlin
adfbbbfd68 add ingest files 2014-04-07 08:32:28 +08:00
winlin
983fe46ce2 use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding 2014-04-06 20:30:51 +08:00
winlin
c4524484e6 add comments for aac encoder 2014-04-06 18:48:39 +08:00
winlin
7916cab50e donot check the aac encoder, ensure aac is ok 2014-04-05 15:01:41 +08:00
winlin
30e3323fe4 update readme, add SampleHTTP link 2014-04-05 13:38:05 +08:00
winlin
4e3fe36ae2 refine http server pages. change to 0.9.51 2014-04-05 13:14:59 +08:00
winlin
1c02f4551c always use 64bits for lseek 2014-04-04 23:28:31 +08:00
winlin
ced050829e fix bug of http, change to 0.9.50 2014-04-04 23:25:32 +08:00
winlin
c5d3b11a6e update http stream. change to 0.9.49 2014-04-04 23:16:31 +08:00
winlin
17ce21348d implements the http stream module. change to 0.9.49 2014-04-04 23:06:46 +08:00
winlin
ef26e77560 implements the http stream module. 2014-04-04 23:06:27 +08:00
winlin
00eda0d7b2 implements the http stream module. 2014-04-04 23:04:38 +08:00
winlin
83f35d10b1 add http delivery framework 2014-04-04 18:55:21 +08:00
winlin
8d7877ebd1 refine config, group by sections. 2014-04-04 17:01:34 +08:00
winlin
b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48 2014-04-04 15:35:17 +08:00
winlin
28b0c3a27f refine log and thread function name. change to 0.9.47. 2014-04-04 12:18:26 +08:00
winlin
6d32ad1828 refine log and thread function name 2014-04-04 12:18:05 +08:00
winlin
f089eafd9f fix bug #38, remove app slash of jwplayer, change to 0.9.46 2014-04-04 10:12:34 +08:00
winlin
3f13726544 add log level in conf. change to 0.9.45 2014-04-03 18:32:51 +08:00
winlin
4984631cd6 refine the http crossdomain, send it only required 2014-04-03 16:39:55 +08:00
winlin
133a6f0dbf add crossdomain support for http error 2014-04-03 15:55:48 +08:00
winlin
b71eb0d49a support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44 2014-04-03 15:53:56 +08:00
winlin
f2216691f9 remove the duplicated http status line when error 2014-04-03 15:20:24 +08:00
winlin
818c1f1520 support http error code, check url 2014-04-03 15:17:02 +08:00
winlin
0ae23d7556 rename version to versions 2014-04-03 14:17:00 +08:00
winlin
4a40075f68 add contributors to api/v1/authors 2014-04-03 13:48:52 +08:00
winlin
5c019c7938 implements api/v1/version, change to 0.9.43 2014-04-03 12:08:22 +08:00
winlin
9c3ba680d8 fix http hooks json encode bug, remove the JFIELD_CONT for the last field 2014-04-03 11:52:06 +08:00
winlin
a14267d2b4 refine the http url handler match. refine json encode 2014-04-03 11:49:14 +08:00
winlin
bfa07465f0 implements basic http response framework 2014-04-02 19:10:22 +08:00
winlin
341b5151d9 create http handler framework 2014-04-02 18:07:34 +08:00
winlin
eae9b94153 add api framework code 2014-04-02 12:55:10 +08:00
winlin
0ba0c14fb8 refine code, donot listen if not enabled http 2014-04-02 12:12:27 +08:00
winlin
ec6d696565 refine http framework, use http message 2014-04-02 12:03:49 +08:00
winlin
e70609cea3 refine code, extract http hooks. 2014-04-01 18:40:24 +08:00
winlin
5bbb76a59d remove the namespace srs, use http prefix 2014-04-01 17:30:55 +08:00
winlin
1922d62ff7 add --with-http-api option 2014-04-01 16:06:32 +08:00
winlin
52263457bf fix bug of no http-server feature 2014-04-01 15:42:27 +08:00
winlin
6ca9b774c1 support http methods, support js crossdomain request 2014-04-01 14:28:19 +08:00
winlin
51c1615173 change to 0.9.42, add http parse framework 2014-04-01 12:36:56 +08:00
winlin
b0d77c4697 move wiki images to srs.release 2014-03-31 11:35:22 +08:00
winlin
c7a4dd8863 move wiki images to srs.release 2014-03-31 11:35:00 +08:00
winlin
27029679e9 donot ensure transaction-id===1 for connect req/res, change to 0.9.41 2014-03-31 10:22:00 +08:00
winlin
64a8dfb09a refine rtmp send protocol, use the same cache for header 2014-03-31 10:04:44 +08:00
winlin
4dfbbcdff4 force st to use epoll, change to 0.9.39 2014-03-30 23:42:29 +08:00
winlin
3932cf1334 update build, always patch st, for we need to build in raspberrypi directly 2014-03-29 14:25:47 +08:00
winlin
41f5217360 refine http code, define CRLF consts for http 2014-03-27 17:13:26 +08:00
winlin
6913efe127 implements the http api/stream framework 2014-03-27 13:25:08 +08:00
winlin
ab3c6c92a0 rename srs-client to srs-rtmp-conn 2014-03-27 12:27:47 +08:00
winlin
aa89f9f51e change to 0.9.37, for http api/stream 2014-03-27 12:14:04 +08:00
winlin
4c8d6d2eb1 fix bug of hls and rename demo player stream to live/demo. change to 0.9.36 2014-03-26 18:13:33 +08:00
winlin
0858bd8b6f Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35 2014-03-26 16:25:02 +08:00
winlin
ebf1139582 fix the forward loop detect bug. change to 0.9.34 2014-03-26 12:34:35 +08:00
winlin
e02293d94d fix bug of handshake with nginx-rtmp for forward, change to 0.9.33 2014-03-26 11:39:10 +08:00
winlin
1386e7a8ab fix bug of handshake with nginx, simple hs 2014-03-26 11:12:34 +08:00
winlin
e56c52ceba change to 0.9.32 2014-03-26 10:05:34 +08:00
winlin
7b3bc8f741 fix bug of bwtc 2014-03-26 10:05:07 +08:00
winlin
644dfa1a6d fix bug of librtmp 2014-03-26 09:03:57 +08:00
winlin
a9d11df3a3 update arm tool chain 2014-03-25 14:36:30 +08:00
winlin
a6d9da5e43 fix bug of script, support both abs and relative path 2014-03-25 11:04:36 +08:00
winlin
c3e750e90f add version to log 2014-03-24 18:07:32 +08:00
winlin
ade3630fa6 add package and install script 2014-03-23 22:52:08 +08:00
winlin
34efa15118 change to 0.9.30, first release for srs1 2014-03-23 21:15:52 +08:00
winlin
cb1499fcb6 change log strategy, write log to file. change to 0.9.29 2014-03-23 14:53:31 +08:00
winlin
ed20bd7078 default write log to file. 2014-03-23 14:51:35 +08:00
winlin
76290a5a12 fix bug of get daemon 2014-03-23 14:47:09 +08:00
winlin
7930add7f9 add log tank config, default to console. 2014-03-23 14:40:55 +08:00
winlin
b290a00de7 refine log 2014-03-23 13:53:07 +08:00
winlin
f1477dc4fe support daemon, default start in daemon. change to 0.9.28 2014-03-23 12:42:42 +08:00
winlin
3ec3c1f532 support daemon 2014-03-23 12:42:05 +08:00
winlin
2c1354b9b9 fix bug of log message 2014-03-23 12:23:23 +08:00
winlin
56679b3c82 add srs_log_file to write log to file. change to 0.9.27 2014-03-23 12:22:01 +08:00
winlin
d94b9f44b3 add srs_log_file to write log to file. change to 0.9.27 2014-03-23 12:21:36 +08:00
winlin
d63cbb3c46 add reload support. add make install and uninstall, change to 0.9.26 2014-03-22 22:07:49 +08:00
winlin
3c920b933c add ./etc/init.d/srs, refine configure to support make clean then make. 2014-03-22 20:53:29 +08:00
winlin
fdad7c25f0 fix isse #35: the gettimeofday jitter, log warn message 2014-03-21 17:56:27 +08:00
winlin
4f284b20f0 drop ts segment when duration is too small 2014-03-21 17:35:27 +08:00
winlin
5758551508 support hls republish 2014-03-21 17:10:24 +08:00
winlin
f25c6558a5 write pid to ./objs/srs.pid. 2014-03-21 15:45:34 +08:00
winlin
0686b8fa5a update readme, add product wiki link 2014-03-21 14:02:14 +08:00
winlin
a0c0c94cf0 refine conf, add comments for other listen type 2014-03-21 14:00:26 +08:00
winlin
2cebaff9d8 refine hls, ts temp file use ext .tmp 2014-03-21 13:10:47 +08:00
winlin
e0fb1029c9 support pure audio hls. change to 0.9.24 2014-03-20 18:55:45 +08:00
winlin
b708f588fc refine the hls module, clear logic dead code, rename TSCache to HlsCache, M3u8Muxer to HlsMuxer. that is, make it to more readable. 2014-03-20 18:19:08 +08:00
winlin
238349b0c0 update configure, change to 0.9.23 2014-03-20 14:08:53 +08:00
winlin
a2c5075002 update comments for handshake. 2014-03-19 23:40:49 +08:00
winlin
a470330383 finish utest for handshake. 2014-03-19 23:34:50 +08:00
winlin
6b84a5e14c change to 0.9.22 2014-03-19 22:51:04 +08:00
winlin
b7d40b5aba support vn/an to disable video/audio, for radio streaming 2014-03-19 22:45:58 +08:00
winlin
747bbd988e change to 0.9.21, refine complex handshake, client/server support complex handshake. 2014-03-19 17:15:52 +08:00
winlin
da93b6fe99 add complex handshake utest 2014-03-19 17:14:42 +08:00
winlin
491ea4b630 support client complex handshake with server 2014-03-19 16:30:43 +08:00
winlin
841f0f8899 change to 0.9.19, verify the s1/s2/c2, refine the handshake. 2014-03-19 14:58:29 +08:00
winlin
152d3539d8 add s1 validation for client/server 2014-03-19 13:10:25 +08:00
winlin
d89d16ca1e print the system info when startup main 2014-03-19 10:51:33 +08:00
winlin
2eeb289c2f assert system is little-endian 2014-03-19 10:38:02 +08:00
winlin
b58ab508f9 add rtmp handshake utest, for arm to finger out the bug 2014-03-19 00:47:10 +08:00
winlin
1c055e7424 add log for ssl disabled. 2014-03-18 17:44:43 +08:00
winlin
1ffbdbc098 refine log, donot show error when client gracefully close it 2014-03-18 16:17:52 +08:00
winlin
c85dde7f3f substitute all TAB with 4spaces. 2014-03-18 11:32:58 +08:00
winlin
e5770b10b1 refine the colorful log for srs. remove the log when client close. 2014-03-18 11:28:22 +08:00
wenjie.zhao
109ce07c1b color text of error msg supported. 
strerror msg supported.
 2014-03-15 04:55:30 +08:00
wenjie.zhao
e0e3504e1d color text of error msg supported. 
strerror msg supported.
 2014-03-15 04:53:46 +08:00
winlin
3721e72e99 arm: change to 0.9.18 2014-03-16 20:59:56 +08:00
winlin
5a4373d483 Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp. 2014-03-16 20:58:04 +08:00
winlin
a9da5903f6 arm support ssl/hls, change to 0.9.17 2014-03-16 20:16:42 +08:00
winlin
7744053d28 add arm research files, change to 0.9.16 2014-03-16 18:05:07 +08:00
winlin
a90cb9dd84 fix ubuntu build warning, the config unused setter 2014-03-15 19:50:40 +08:00
winlin
010b5c0d7a fix ubuntu build warning, the config unused setter 2014-03-15 19:48:11 +08:00
winlin
3066a03fb7 rename SRS_HTTP to SRS_HTTP_CALLBACK 2014-03-10 23:13:09 +08:00
winlin
387be8fa3b change to 0.9.15, finish amf0 utest 2014-03-09 20:37:20 +08:00
winlin
9521fbfaaa change version to 0.9.14, finish amf0 basic utest 2014-03-08 23:10:54 +08:00
winlin
95c2e7fd63 amf0 utest: finish basic utest for amf0 2014-03-08 23:09:24 +08:00
winlin
044138c39e refine summary for amf0 hpp 2014-03-08 23:02:27 +08:00
winlin
9fd48d84c1 refine amf0 object size to total_size, elem count to count 2014-03-08 22:59:30 +08:00
winlin
59db1dd260 utest for amf0 object, refine the count of elem 2014-03-08 22:51:13 +08:00
winlin
8ed9ae6242 amf0 utest: remove the object read/write function, directly use object to read or write. 2014-03-08 22:25:56 +08:00
winlin
a3ae871360 refine code, array to ecma_array. 2014-03-08 22:07:40 +08:00
winlin
3129c738cb amf0 utest: refine interface of amf0, only export required objects 2014-03-08 21:56:14 +08:00
winlin
b55efef2ee amf0 utest: finish amf0 any read/write utest 2014-03-08 21:12:13 +08:00
winlin
609114a5fe amf0 utest: remove the old amf0 read any, discovery object ant use object to read itself. 2014-03-08 21:06:20 +08:00
winlin
3691c106fa amf0 utest: add usage for amf0 2014-03-08 17:18:44 +08:00
winlin
34f94a1be3 amf0 utest: add object and ecma array create function. 2014-03-08 17:04:21 +08:00
winlin
f4aa2f30c1 amf0 utest: change version to 0.9.13 2014-03-08 16:57:13 +08:00
winlin
4306db099d amf0 utest: elem read/write refined 2014-03-08 16:56:35 +08:00
winlin
bfe771bbba amf0 utest: null,undefined,object-eof to any 2014-03-08 14:38:19 +08:00
winlin
e40be6e89d amf0 utest: boolean to any 2014-03-08 14:13:31 +08:00
winlin
4a0023ae63 amf0 utest: finish utest for string to any 2014-03-08 14:05:45 +08:00
winlin
cae8228b09 amf0 utest: remove class SrsAmf0String, use SrsAmf0Any instead 2014-03-08 13:57:08 +08:00
winlin
57ce04ae12 amf0 utest: remove struct use class instead, move class together 2014-03-08 13:41:15 +08:00
winlin
404207db4f amf0 utest: refine amf0 size and finish utest. 2014-03-08 13:35:22 +08:00
winlin
db7a113441 amf0 utest: refine amf0 size and finish utest. 2014-03-08 13:35:04 +08:00
winlin
3083759273 amf0 utest, refine amf0 size and object/array read/write 2014-03-08 13:11:26 +08:00
winlin
48343e4f3a refien build script, regenereate all options. change to 0.9.12 2014-03-08 11:25:02 +08:00
winlin
6e0bebdacf full support gperf gmc/gmp/gcp 2014-03-07 15:40:55 +08:00
winlin
bef7e20ed9 fix rtmp protocol bug, use 31bits timestamp 2014-03-07 13:35:03 +08:00
winlin
c89aea8af7 fix rtmp protocol bug, use 31bits timestamp 2014-03-07 13:34:23 +08:00
winlin
741d6f97f6 support gperf memory check(gmc). 2014-03-07 12:24:47 +08:00
winlin
dcd568a0d7 add gperf to heap check, use reload signal to terminate program normally 2014-03-06 18:12:19 +08:00
winlin
9d08b42c82 change version to 0.9.11 2014-03-05 10:41:23 +08:00
winlin
a488ef8317 fix bug#25: fmle republish bug, srs return special error code and wait for client to republish. 2014-03-05 10:21:31 +08:00
winlin
1ccddf4cfc add gest framework for utest, build success. 2014-03-04 18:46:00 +08:00
winlin
fe5811304b add utest script to generate the utest Makefile 2014-03-04 14:01:43 +08:00
winlin
722e79003b merge from xiangcheng.liu, memory leak in amf0 2014-03-03 09:49:59 +08:00