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

1025 commits

Author SHA1 Message Date
winlin
0cd0761508 fix time jitter zero algorithm bug, reset when timestamp overflow. 2014-06-26 10:13:43 +08:00
winlin
1970e18ed6 fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133 2014-06-25 17:14:11 +08:00
winlin
f173345e15 support report summaries in heartbeat. 0.9.132 2014-06-23 15:44:49 +08:00
winlin
db253bc76b fix fms token traverse bug, always update the token by the latest valid client. 2014-06-23 11:18:55 +08:00
winlin
1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130 2014-06-22 20:01:25 +08:00
winlin
41857edaee support edge token traverse, fix #104. 0.9.129 2014-06-21 12:39:04 +08:00
winlin
10953c9743 support token auth in connect args. 0.9.128 2014-06-21 11:41:00 +08:00
winlin
094d82bd06 add connections count to api summaries. 0.9.127 2014-06-19 18:49:05 +08:00
winlin
6ee2ba049b add srs bytes and kbps to api summaries. 0.9.126 2014-06-19 15:28:05 +08:00
winlin
d0b08d0d51 add network bytes to api summaries. 0.9.125 2014-06-18 16:13:02 +08:00
winlin
f893711499 fix #98: workaround for librtmp ping(fmt=1,cid=2 fresh stream). 2014-06-14 20:44:38 +08:00
winlin
31b568b013 refine core, move specified functions to kernel utility. 2014-06-08 13:03:03 +08:00
winlin
5273509554 refine log, to 0.9.123 2014-05-29 14:16:34 +08:00
winlin
7ec202ee41 support flv inject and flv http streaming with start=bytes. 0.9.122 2014-05-29 12:09:26 +08:00
winlin
608083d42f add flv injecter, add flv codec to librtmp. 2014-05-28 15:37:06 +08:00
winlin
978e985519 fix #87: add source id for full trackable log. 0.9.120 2014-05-27 19:18:31 +08:00
winlin
8d99ef27cf fix #84: unpublish source when edge stop, clear gop cache 2014-05-27 17:59:59 +08:00
winlin
5ff1ce7cba for bug #87, response the server SrsId to flash. 2014-05-27 15:34:55 +08:00
winlin
d74921e1ab fix #89, config to /dev/null to disable ffmpeg log. 0.9.117 2014-05-27 14:10:46 +08:00
winlin
14f0a2e046 for bug #88, add timeout for connect. 2014-05-26 18:21:35 +08:00
winlin
69248cedaa http streaming support flv start index. 0.9.115 2014-05-26 14:58:08 +08:00
winlin
b13bd70c86 http streaming support flv start index. 2014-05-26 13:57:08 +08:00
winlin
7b69b8b5c4 fix #79: allow edge vhost to add or remove. 0.9.114 2014-05-25 10:08:17 +08:00
winlin
0eb9e0af5b fix #78 st joinable thread must be stop by other threads, 0.9.113 2014-05-23 17:23:33 +08:00
winlin
5f7bacf678 fix st thread exit bug, never implict invoke the st_thread_exit, which may cause memory leak. 0.9.112 2014-05-23 13:56:40 +08:00
winlin
25e279b7c8 support amf0 StrictArray(0x0a). 0.9.111. 2014-05-22 16:30:24 +08:00
winlin
bd24fe7d75 support flv parser, add amf0 to librtmp. 0.9.110 2014-05-22 15:08:25 +08:00
winlin
d4b8fee61a fix bug #73, http callback api support authentication in tcUrl 2014-05-22 10:23:12 +08:00
winlin
2265173c4d donot install tools when ffmpeg is not open, 0.9.108 2014-05-20 18:11:33 +08:00
winlin
ef0f7f4da8 support http heartbeat, 0.9.107 2014-05-19 17:39:01 +08:00
winlin
cb95b5909c add http heartbeat framework 2014-05-19 15:45:04 +08:00
winlin
0186247fee support http api json, to PUT/POST. 0.9.105 2014-05-18 17:57:20 +08:00
winlin
3064e5ec61 fix bug of nx_json parse, to 0.9.104 2014-05-18 16:48:24 +08:00
winlin
d6355efe22 support http api json, to PUT/POST, to 0.9.103 2014-05-18 16:15:35 +08:00
winlin
b60e8418c6 add json base on nxjson(nx-json/nx_json) decoder for http api. 0.9.102 2014-05-18 14:34:45 +08:00
winlin
2c059d3a80 fix bug #72, also need stream_id for send_and_free_message. 0.9.101 2014-05-17 17:53:27 +08:00
winlin
c59576146b rename struct to class. 0.9.100 2014-05-17 14:59:33 +08:00
winlin
2f89c8b2e8 move some utilities from kernel to app. 0.9.99 2014-05-17 14:53:04 +08:00
winlin
cbbf53f8f9 fix bug #67: fix pithy print bug, stage must has a age 2014-05-14 14:34:28 +08:00
winlin
b175821b62 refine kbps, provides 30s,1m,5m,60m kbps. 0.9.97 2014-05-14 13:56:12 +08:00
winlin
3ebda13802 refine the ptr array free, 0.9.96 2014-05-14 09:58:42 +08:00
winlin
dc66c525fd refine autofree, only free object, never free arrays 2014-05-14 09:41:41 +08:00
winlin
befde6acf7 fix mem leak for delete[] SharedPtrMessage array, explicit free elems. remove srs_freepa. 0.9.95 2014-05-13 14:24:39 +08:00
winlin
7004510cc7 fix ffmpeg log fd leak, always close log_fd. 0.9.94 2014-05-13 11:16:53 +08:00
winlin
74e6e28993 refine the kbps calc module. 0.9.93 2014-05-12 18:06:13 +08:00
winlin
f6dd1371bf fix bug #36: never directly use *(int32_t*) to convert, for arm may not support 2014-05-08 12:12:01 +08:00
winlin
fa9870db96 fix bug #59: edge for FMS, always use schema1(digest-key) for FMS, or connect failed. 2014-05-08 11:51:49 +08:00
winlin
cb64d20575 refine core macros 2014-05-06 18:22:01 +08:00
winlin
f8e8c81e50 refine log, simplify it. to 0.9.90 2014-05-04 16:29:57 +08:00
winlin
7b530bf8d8 update signature 2014-05-04 11:28:17 +08:00
winlin
96a5c7b1ab fix mem leak of encoder, edge and source. add destroy for gmc to detect mem leak. to 0.9.89 2014-05-03 22:59:21 +08:00
winlin
d74f01e2d1 fix signal bug, break for gmc. fix SrsMessage leak, use common message to free payload. to 0.9.88 2014-05-02 12:29:56 +08:00
winlin
0945c2b441 fix RTMP protocol extended timestamp bug, always trust and use the extended-timestamp for the first chunk of msg 2014-04-30 17:16:28 +08:00
winlin
fc501b050b add atc_auto to disable or enable auto detect atc 2014-04-30 12:08:11 +08:00
winlin
d0dff2d332 fix bug #34: convert signal to io. 0.9.85 2014-04-30 11:26:32 +08:00
winlin
6ee49ee029 bravo auto atc per stream. 0.9.84 2014-04-30 10:17:04 +08:00
winlin
f02ac02a50 auto open atc for bravo_atc set 2014-04-29 18:27:00 +08:00
winlin
0f498acd7b add comments and variable for c3 extended-timestamp. to 0.9.82 2014-04-29 18:16:29 +08:00
winlin
80ddddf823 refine RTMP protocol completed, to 0.9.81 2014-04-29 14:44:07 +08:00
winlin
ebf6203c3b refine rtmp protocol stack, refer to go.rtmp 2014-04-29 13:39:16 +08:00
winlin
23b04e2a57 completed the edge reload, to 0.9.79 2014-04-28 17:57:59 +08:00
winlin
a363e3d293 support basic edge(play/publish) RTMP server. 0.9.78 2014-04-27 15:10:25 +08:00
winlin
2bcaeccc51 edge support play and ingest origin stream. change to 0.9.77 2014-04-26 21:41:18 +08:00
winlin
f3b441ba1f add alipay donation page. to 0.9.76 2014-04-25 12:56:48 +08:00
winlin
67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 2014-04-24 16:32:19 +08:00
winlin
35f3a93239 support dvr to hss. change to 0.9.74 2014-04-24 12:22:36 +08:00
winlin
a73bf8d4aa optimizm the http server for send ts file 2014-04-22 12:15:13 +08:00
winlin
8bf1f4ad87 add api/v1 summaries/rusages/self_proc_stats/system_proc_stats/meminfos. change to 0.9.72 2014-04-20 00:17:11 +08:00
winlin
fae1c61c3f update readme. change to 0.9.71 2014-04-19 11:21:13 +08:00
winlin
67ddc9f5ae support dvr(record live to flv file for vod), change to 0.9.70 2014-04-17 18:23:49 +08:00
winlin
73459547e1 support dvr. change to 0.9.69 2014-04-17 16:06:49 +08:00
winlin
5af1da17ed change to 0.9.68 2014-04-16 15:59:32 +08:00
winlin
0c91fa6bed fix dvr mem leak, free msg when not use it. 2014-04-16 15:58:06 +08:00
winlin
78e7a31ddb refine option, add --use-sys-ssl, change to 0.9.67 2014-04-16 14:27:34 +08:00
winlin
47927ab460 refine options, change to 0.9.66 2014-04-16 13:24:00 +08:00
winlin
1ae9178605 add favicon.ico, change to 0.9.65 2014-04-15 11:19:15 +08:00
winlin
2c6b6c6846 fix bug #47: use stream time to stop for duration of rtmpdump 2014-04-14 10:51:31 +08:00
winlin
bc756d6ad9 fix simple handshake bug #46, copy c1 to s2. change to 0.9.63 2014-04-13 21:55:01 +08:00
winlin
9a036958d7 fix bug #45, support duration for live. change to 0.9.62 2014-04-13 21:37:26 +08:00
winlin
a0472f256d support test config file. change to 0.9.61 2014-04-13 16:55:42 +08:00
winlin
cfee761899 support full reload. change to 0.9.60 2014-04-13 13:35:03 +08:00
winlin
b38df9cd1a refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59 2014-04-12 20:35:40 +08:00
winlin
ff90278048 add speex1.2 to transcode flash encoder stream. change to 0.9.58 2014-04-11 10:40:21 +08:00
winlin
e0a6fe63cc fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57 2014-04-10 11:40:06 +08:00
winlin
5aded78272 change to 0.9.56, for macro changed 2014-04-08 15:32:13 +08:00
winlin
98809862f7 change to 0.9.55, for 1.0 mainline 2014-04-07 16:05:18 +08:00
winlin
12ba02238d update readme, add ingest 2014-04-07 15:56:19 +08:00
winlin
45d8f4346f implements ingest, change to 0.9.53 2014-04-07 14:20:26 +08:00
winlin
e89ab84e4e implements ingest, change to 0.9.53 2014-04-07 14:20:03 +08:00
winlin
4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg 2014-04-07 10:15:44 +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
00eda0d7b2 implements the http stream module. 2014-04-04 23:04:38 +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
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
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
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
51c1615173 change to 0.9.42, add http parse framework 2014-04-01 12:36:56 +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
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
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
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
f1477dc4fe support daemon, default start in daemon. change to 0.9.28 2014-03-23 12:42:42 +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
5758551508 support hls republish 2014-03-21 17:10:24 +08:00
winlin
e0fb1029c9 support pure audio hls. change to 0.9.24 2014-03-20 18:55:45 +08:00
winlin
238349b0c0 update configure, change to 0.9.23 2014-03-20 14:08:53 +08:00
winlin
6b84a5e14c change to 0.9.22 2014-03-19 22:51:04 +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
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
2eeb289c2f assert system is little-endian 2014-03-19 10:38:02 +08:00
winlin
c85dde7f3f substitute all TAB with 4spaces. 2014-03-18 11:32:58 +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
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
f4aa2f30c1 amf0 utest: change version to 0.9.13 2014-03-08 16:57:13 +08:00
winlin
48343e4f3a refien build script, regenereate all options. change to 0.9.12 2014-03-08 11:25:02 +08:00
winlin
9d08b42c82 change version to 0.9.11 2014-03-05 10:41:23 +08:00
winlin
d622da3b44 update readme, finish modularity and wiki, change to 0.9.10 2014-03-02 21:57:36 +08:00
winlin
db22af07a0 change to 0.9.9 2014-03-02 00:06:24 +08:00
winlin
713b05541b add librtmp demo srs_publish 2014-03-01 23:24:53 +08:00
winlin
7d570fb4f3 use fast log 2014-03-01 18:06:20 +08:00
winlin
b407021d45 move config to app, for its application level features 2014-03-01 15:59:55 +08:00
winlin
517d346a52 change macro for all rtmp protocol files. 2014-03-01 14:09:22 +08:00
winlin
0296c8eff4 change to 0.9.6 2014-03-01 13:39:52 +08:00
winlin
4a8bc3b277 change version to 0.9.5 2014-03-01 12:46:05 +08:00
winlin
fddd60b962 change to 0.9.4, extract kernel module 2014-03-01 11:06:01 +08:00
winlin
bcbea86202 extract auto_free to core module 2014-03-01 10:19:11 +08:00
winlin
4e91a3d5aa extract core and app module. 2014-03-01 10:14:25 +08:00
winlin
62fbe9e760 refine modules, extract core module 2014-03-01 10:05:14 +08:00
winlin
c2ccb83912 rename core to app 2014-03-01 09:56:48 +08:00
winlin
91d57ae7f9 refine build script, add comments for app.sh. change version to 0.9.3 2014-03-01 09:35:41 +08:00
winlin
4aeed8df1d fix bug of SrsFMLEStartPacket command name, set_recv_timeout(SRS_PAUSED_RECV_TIMEOUT_US) 2014-02-24 09:12:57 +08:00
winlin
797d548766 fix bug of comment, change version to 0.9.2 2014-02-19 15:31:29 +08:00
winlin
980b53dfbe change version to 0.9.1 2014-02-19 15:15:32 +08:00
winlin
745797365e change version to 0.9.1 2014-02-19 15:14:46 +08:00
winlin
39f15ba3da refine the comments, fix bug of parse message 2014-02-19 14:54:04 +08:00
winlin
73b298cab5 fix bug of connect app response data 2014-02-19 09:38:49 +08:00
winlin
11c5b2cf14 refine code, use RTMP_FMT_TYPE0 instead 2014-02-16 10:23:23 +08:00
winlin
7a91826732 refine code, use RTMP_FMT_TYPE0 instead 2014-02-16 10:22:52 +08:00
winlin
8697adacd9 fix compile warning on 64bit centos 2014-02-11 13:54:05 +08:00
liuxc0116
490033f601 forget delete memset 
at last modify,forget delete memset(payload, 0, size);
 2014-01-27 11:34:50 +08:00
liuxc0116
81e085dd1b memory will leaks 
the payload pointor assigned two memory,will lead to memory leaks
 2014-01-23 18:05:55 +08:00
winlin
1d3621dc23 fix warning on 32bits centos6. 2014-01-19 10:49:40 +08:00
winlin
574536d9ed merge wenjie. fix jw/flower player pause bug, which send closeStream actually. 2014-01-11 19:55:55 +08:00
winlin
63388e8ac3 merge from wenjie, fix the flower player play bug, play(reset=amf0-number) 2014-01-02 19:09:25 +08:00
wenjiegit
e981cde90c update master 2014-01-02 17:38:44 +08:00
wenjiegit
f8a7db51f2 fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number] 2014-01-02 14:16:26 +08:00
wenjiegit
bfef0eebfe fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number] 2014-01-02 14:00:00 +08:00
wenjiegit
e959bb6c5c fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number] 2014-01-02 13:26:25 +08:00
winlin
993c5daec7 chunk size default to 60000, high performance. set chunk size when forward 2014-01-01 21:39:06 +08:00
winlin
4955425be9 fix the listen backlog bug, change from 10 to 512 2014-01-01 20:14:46 +08:00
winlin
3dbb2132d3 change server timeout longer, recv timeout from 5s to 30s 2014-01-01 19:58:33 +08:00
winlin
99b9fa0c25 fix the forwarder dead when st_thread interrupt at st_usleep, check thread->can_loop(). 2014-01-01 16:27:45 +08:00
winlin
dba7329682 refine readme. 2014-01-01 11:28:43 +08:00
winlin
0b7c7240e6 refine the authors and license 2014-01-01 11:21:52 +08:00
winlin
bb3c88fef7 change copyright from 2013 to 2013-2014. 2014-01-01 10:37:12 +08:00
winlin
20d1732ced merge from wenjie, the bandwidth test feature. 2013-12-27 17:03:12 +08:00
wenjiegit
237fb13e1b add linux version of band check app; add web version of band check app 2013-12-26 06:06:16 +08:00
wenjiegit
c7cd726f1b merge upstream 2013-12-24 10:59:38 +08:00
wenjiegit
00fb37a831 merge upstream 2013-12-24 10:49:17 +08:00
wenjiegit
3753e8c5f1 merge upstream 2013-12-24 10:38:38 +08:00
winlin
593d16446e add bandwidth workflow 2013-12-22 17:45:08 +08:00
winlin
908f0d87e9 add bandwidth workflow 2013-12-22 17:41:28 +08:00
winlin
084ad79534 refine the bandwidth test 2013-12-22 17:38:51 +08:00
winlin
9455181790 merge from wenjie, support banwidth test. 2013-12-22 17:28:29 +08:00
winlin
bad6f0d3a8 revert the copyrigh, only when commit feature, add the copyright field 2013-12-22 12:40:46 +08:00
winlin
dfb3e117f8 add contributor to core.hpp 2013-12-22 12:35:41 +08:00
winlin
725ff8e5a5 merge from wenjie: support set chunk size at vhost level 2013-12-22 12:23:20 +08:00
winlin
4b74435e89 fix bug of resolve vhost, must strip then get from config. 2013-12-22 00:33:38 +08:00
winlin
632255f08f update the signature, when connect to server, parse the response. 2013-12-21 21:13:55 +08:00
wenjiegit
9a70ce7865 add bandcheck code and modified srs code for merge 2013-12-21 16:19:16 +08:00
winlin
9080c2e559 ensure the HLS(ts) is continous when republish stream. 2013-12-15 20:36:59 +08:00
winlin
e262147e81 fix the hls reload bug, feed it the sequence header. 2013-12-15 20:29:18 +08:00
winlin
27255a3e7a refine protocol, use int64_t timestamp for ts and jitter. 2013-12-15 19:59:32 +08:00
winlin
ce4928cef6 support set the live queue length(in seconds), drop when full. 2013-12-15 19:38:39 +08:00
winlin
5836ffd2d4 refine the forwarder, use srs message queue 2013-12-15 19:24:29 +08:00
winlin
c47f07c69a refine the consumer, use srs message queue to shrink message when overflow. 2013-12-15 19:11:57 +08:00
winlin
b4093bfbe4 support set live queue length 2013-12-15 18:25:55 +08:00
winlin
270041b225 fix the forwarder reconnect bug, feed it the sequence header. 2013-12-15 17:09:25 +08:00
winlin
d911c85a12 add todo for the reload 2013-12-15 13:27:08 +08:00
winlin
b3ef28f831 fix bug of get hls enabled config 2013-12-15 13:23:03 +08:00
winlin
fb67f91167 support reload the hls/forwarder/transcoder 2013-12-15 13:07:39 +08:00
winlin
b90b64954e support reload the forwarder 2013-12-15 12:34:22 +08:00
winlin
7622878979 support reload the gop_cache 2013-12-15 12:08:01 +08:00
winlin
2f397d0460 support reload the gop_cache 2013-12-15 12:04:28 +08:00
winlin
e2bb38c483 support reload the removed vhost 2013-12-14 22:54:10 +08:00
winlin
f016914ac1 rename SrsReloadHandler to ISrsReloadHandler 2013-12-14 21:34:54 +08:00
winlin
010b7a7595 refine config. 2013-12-14 21:19:47 +08:00
winlin
5b29d0ec42 refine the config 2013-12-14 16:44:27 +08:00
winlin
3dd7156f0d refine the config buffer. 2013-12-14 15:56:20 +08:00
winlin
ac5ccbc77e refine the thread model for the retry threads 2013-12-14 14:06:32 +08:00
wenjiegit
c87e55a2cc merged master 2013-12-13 02:41:31 +08:00
wenjiegit
25caf5db36 for merge 2013-12-13 02:07:50 +08:00
wenjie
6e9f375606 +server support band check +every vhost can have it's own chunk size 2013-12-12 20:56:19 +08:00
winlin
6329284b39 add todo for the bug of forwarder 2013-12-12 16:18:32 +08:00
winlin
7baa53a8d6 add todo for memory increase when forwarder server failed. 2013-12-12 12:42:53 +08:00
winlin
ff9c434eb9 add todo for memory increase when forwarder server failed. 2013-12-12 10:41:27 +08:00
winlin
66048cebbb add todo for source 2013-12-10 14:49:35 +08:00
winlin
8887754b17 change version to 0.9 dev 2013-12-08 14:28:04 +08:00
winlin
3fd3ac5a11 support http hooks: on_connect/close/publish/unpublish/play/stop. 2013-12-08 12:48:03 +08:00
winlin
889ad9238b support http hooks: on_connect/close/publish/unpublish/play/stop. 2013-12-08 12:45:12 +08:00
winlin
2887cda176 support multiple http hooks for a event. 2013-12-08 10:46:33 +08:00
winlin
30099dfa09 support multiple http hooks for a event. 2013-12-08 10:46:15 +08:00
winlin
a478452f57 support http callback hooks: on_connect 2013-12-07 23:23:19 +08:00
winlin
65fde21e6c add http client 2013-12-07 22:06:53 +08:00
winlin
bb22c3b5cd add http library, support in build script 2013-12-07 20:51:27 +08:00
winlin
3600be9796 add http callback in config 2013-12-07 20:38:14 +08:00
winlin
4b9eabdf01 udpate files. 2013-12-07 19:28:11 +08:00
winlin
263213d8b6 update version, add build date 2013-12-07 19:27:31 +08:00
winlin
3b09f9bea9 support audio transcode only, speex/mp3 to aac 2013-12-06 14:35:03 +08:00
winlin
2d592d177d refine the signals of ffmpeg. 2013-12-06 14:12:01 +08:00
winlin
71895a4da6 fix the ffmpeg kill bug, wait until ffmpeg quit. 2013-12-06 14:07:37 +08:00
winlin
cab88dfe70 hls support multiple publish/unpublish. disable hls when not support 2013-12-06 14:02:10 +08:00
winlin
679e851f07 support max_connections, drop if exceed. 2013-12-06 11:00:37 +08:00
winlin
86b1f3349a fix bug of forward, erase msgs when error 2013-12-06 10:23:28 +08:00
winlin
89c0170850 fix bug of forward, earse the forwarded msgs. 2013-12-06 10:16:24 +08:00
winlin
8c5661b9ff fix bug of hls muxer, support close/open/flush even muxer is closed. 2013-12-06 09:44:23 +08:00
winlin
6207a2f19e fix the rewind bug, support republish by restart the ffmpeg encoder. 2013-12-05 23:54:30 +08:00
winlin
b9440df745 add encoder/hls pithy print 2013-12-05 23:34:26 +08:00
winlin
464d78b762 add todo for ffmpeg 2013-12-03 00:26:40 +08:00
winlin
113731dd6b reap the transcode process 2013-12-02 23:51:51 +08:00
winlin
b5bba29768 refine hls, extract ts cache for ts cache audio and flush once 2013-12-02 22:09:10 +08:00
winlin
1c2f5052dd refine the hls muxer module 2013-12-02 15:55:10 +08:00
winlin
b4eb38c86b refine hls code, reorder classes. 2013-12-02 14:24:09 +08:00
winlin
d6897205c7 add todo for protocol 2013-12-02 12:56:52 +08:00
winlin
a2e6e6718e fix the m3u8 crash bug, simplify it 2013-12-02 11:46:39 +08:00
winlin
2b0bef18ed add todo for forward 2013-12-01 20:03:07 +08:00
winlin
09f9811a97 fix the hls crash bug 2013-12-01 19:54:52 +08:00
winlin
6f0bba9856 add todo: cycle all process, reap the exited 2013-12-01 18:53:24 +08:00
winlin
2695e4d0c6 fix bug of core 2013-12-01 17:42:09 +08:00
winlin
6af0794bab support dead-loop detect for forwarder and transcoder. 2013-12-01 17:32:06 +08:00
winlin
35676920be convert to unix format 2013-12-01 13:05:43 +08:00
winlin
18028ad4cb update readme 2013-12-01 13:04:09 +08:00
winlin
9a0d8855d8 support ffmpeg filter 2013-12-01 10:54:41 +08:00
winlin
f85b70966c rename global username and email 2013-11-30 23:26:40 +08:00
winlin
951cd08f1f refine the params 2013-11-30 23:21:14 +08:00
winlin
407801b8a6 add ffempty 2013-11-30 23:20:46 +08:00
winlin
b88596b6dc update readme 2013-11-30 23:15:25 +08:00
winlin
601a69aa70 update readme 2013-11-30 23:15:13 +08:00
winlin
525af4599f support live stream transcoding by ffmpeg. 2013-11-30 23:04:47 +08:00
winlin
06278176dd add research empty ffmpeg 2013-11-30 21:53:28 +08:00
winlin
80a81b1661 parse ffmpeg params 2013-11-30 21:02:21 +08:00
winlin
ce15f4bce3 update encoder framework 2013-11-30 19:14:19 +08:00
winlin
8d91561ca0 add ffmpeg transcoding framework 2013-11-30 18:31:07 +08:00
winlin
a086e2bbfa add transcoding params to config 2013-11-30 16:23:01 +08:00
winlin
57064237d0 rename author to contributor 2013-11-30 14:35:59 +08:00
winlin
790294f437 add authors 2013-11-29 23:08:50 +08:00
winlin
28572b009a remove the clock msg from log 2013-11-29 22:39:50 +08:00
winlin
5d69236bff convert to unix format 2013-11-29 22:21:31 +08:00
winlin
db405b7e0e support forward stream to origin/edge 2013-11-29 22:20:51 +08:00
winlin
f656087d74 add forward framework 2013-11-29 16:52:24 +08:00
winlin
2fa7610f9c add rtmp client 2013-11-29 15:07:05 +08:00
winlin
844718c99b refine the forwarder 2013-11-28 23:43:52 +08:00
winlin
1f8bb0e935 add forward st thread 2013-11-28 23:18:05 +08:00
winlin
f09d457644 add forward framework 2013-11-28 22:59:00 +08:00
winlin
3515af9dff add tools 2013-11-28 22:32:50 +08:00
winlin
de95bf74b1 refine source, extract gop cache, add srs forwarder. 2013-11-28 22:28:34 +08:00
winlin
ecebedfed2 refine code 2013-11-28 15:12:08 +08:00
winlin
af5e7f002f fix the memory leak error 2013-11-28 14:53:46 +08:00
winlin
005f821441 fix bug of hls conf detect 2013-11-28 09:14:56 +08:00
winlin
3877ab0ff2 fix bug of hls conf detect 2013-11-28 09:14:31 +08:00
winlin
1653e444dd add comments for auto ptr message 2013-11-27 23:02:37 +08:00
winlin
90af450d63 add todo for response client detail error 2013-11-27 22:54:43 +08:00
winlin
62a2384a35 check publish streaming available 2013-11-27 22:53:08 +08:00
winlin
ec5cb39b96 add options --with/without -hls/ssl 2013-11-27 22:41:58 +08:00
winlin
f8855cfcbb fix the aac jump bug on iphone, correct the audio pts, use audio buffer and flush audio 2013-11-27 17:30:16 +08:00
winlin
c78baedf4e fix bug of 0.5 release. 2013-11-26 18:20:04 +08:00
winlin
94623c0cee fix bug of shared ptr, must copy the payload for it free it. 2013-11-26 18:11:45 +08:00
winlin
758dff0e97 fix bug of hls, close the muxer when segment finished 2013-11-26 17:56:55 +08:00
winlin
00ec634d56 support hls_fragment and hls_window 2013-11-26 17:48:35 +08:00
winlin
04cfe20279 support HLS, refine the dir use app 2013-11-26 17:21:49 +08:00
winlin
57ea56970d add nginx and used as http server 2013-11-26 16:45:50 +08:00
winlin
0c72c56f74 support HLS(m3u8) 2013-11-26 16:06:58 +08:00
winlin
749b7bdb2a refine hls, support time jitter detect and correct 2013-11-26 11:48:18 +08:00
winlin
326713fbed refine code, extract the rtmp jitter for hls 2013-11-26 11:15:44 +08:00
winlin
501b182dc9 refine code, write audio immediatly 2013-11-26 10:56:29 +08:00
winlin
dbdfb29de1 refine code, remove the base dts, donot drop start BP frames 2013-11-26 10:48:37 +08:00
winlin
b4235582dc refine code, remove the base dts, donot drop start BP frames 2013-11-26 10:47:05 +08:00
winlin
9e5b3afcbe update readme 2013-11-26 00:03:07 +08:00
winlin
7ed20cc670 support write ts file 2013-11-25 23:54:01 +08:00
winlin
164392f6aa fix bug of ts_info 2013-11-25 10:59:21 +08:00
winlin
d5b84b5e20 refine ts code 2013-11-25 00:46:08 +08:00
winlin
38e66be490 fix ts audio bug, aac adts header and PES_packet_length fixed 2013-11-25 00:02:01 +08:00
winlin
4fca914694 support write ts file 2013-11-24 23:13:14 +08:00
winlin
ca6720aab2 add time to write ts file 2013-11-24 18:55:39 +08:00
winlin
385394315d add ts mux framework 2013-11-24 17:53:36 +08:00
winlin
4af3982721 add ts muxer to write hls/ts file 2013-11-24 17:15:37 +08:00
winlin
ce021b25c7 update the config file format 2013-11-24 16:49:00 +08:00
winlin
19f16ba7a8 remove the analysis doc for ts 2013-11-24 16:00:45 +08:00
winlin
ecc8688455 ensure sequence header is ok when parse avc/aac data 2013-11-24 15:11:18 +08:00
winlin
c243ad3282 avc/aac demux the flv samples 2013-11-24 15:08:43 +08:00
winlin
fcfd51ee20 decoded audio and video. add avc file format doc 2013-11-24 14:28:58 +08:00
winlin
ba234e8741 add avc format doc. decode the flv codec info 2013-11-24 12:39:47 +08:00
winlin
b87318dec0 extract method to process publish message 2013-11-23 20:33:10 +08:00
winlin
195a857f22 nginx never keep the metadata. 2013-11-23 20:23:00 +08:00
winlin
4f3cdd51c1 change metadata. add hls class. 2013-11-23 20:16:47 +08:00
winlin
200a6a6975 add hls config 2013-11-23 19:15:11 +08:00
winlin
e3e0db9bb1 fix the format to unix without x 2013-11-23 18:20:02 +08:00
winlin
2c4c91d821 convert format to unix 2013-11-23 11:36:07 +08:00
winlin
974af0605b fix protocol decode PCUC packet bug, requires 4bytes 2013-11-20 20:41:46 +08:00
winlin
bc8828a7de update the random generater 2013-11-20 14:52:47 +08:00
winlin
4bba9ddcbb add ts_info doc 2013-11-20 11:51:07 +08:00
winlin
d1e20dc866 fix the global static instance error, use function to get server 2013-11-20 10:08:52 +08:00
winlin
ff565c4d9b fix bug of amf0 decode 2013-11-16 12:54:48 +08:00
winlin
bf1113dad7 add log for update video/audio sequence header 2013-11-14 17:13:20 +08:00
winlin
687d190da1 reset the audio sample size and video frame size when unpublish 2013-11-13 13:29:03 +08:00
winlin
0645f5e927 calc the delta for time jitter for video 2013-11-12 18:41:22 +08:00
winlin
8f528ae5b2 v0.4 released. 12500 lines. 2013-11-10 12:05:13 +08:00
winlin
b855caa045 refine handshake, pithy print clock 2013-11-10 12:00:01 +08:00
winlin
3669419e4c support config and reload the pithy print. 2013-11-10 11:52:19 +08:00
winlin
6c3b5943e9 add reload config comments for config. 2013-11-09 22:53:59 +08:00
winlin
68ccd7eb64 support reload config(listen and chunk_size) by SIGHUP(1). 2013-11-09 22:41:44 +08:00
winlin
ed3525056c support config the chunk_size. 2013-11-09 20:56:35 +08:00
winlin
c78af697a1 support pause for live stream. 2013-11-09 11:49:38 +08:00
winlin
c77695ce55 add comments for extended-timestamp, always send the extended-timestamp even chunk type=0x03 2013-11-08 15:35:24 +08:00
winlin
883b054f9d update readme. 2013-11-04 23:08:34 +08:00
winlin
6e62efb9e6 update readme. 2013-11-04 23:08:07 +08:00
winlin
751323fac8 release v0.3, 11773 lines 2013-11-04 22:55:19 +08:00
winlin
58d9677ddd support vhosts specified config. 2013-11-04 22:42:03 +08:00
winlin
9f94f891ad delete the cache when unpublish, when publish the encoder will update it 2013-11-03 19:57:54 +08:00
winlin
a5339c2a27 refine socket buffer, append bytes to vector directly 2013-11-02 19:52:33 +08:00
winlin
c0b6982e0d support listen multiple ports. 2013-11-02 19:32:52 +08:00
winlin
2aa15a1134 support nginx-style config file 2013-11-02 17:55:59 +08:00
winlin
a1a3a2eef9 add macro to disable the srs_trace 2013-10-30 11:37:11 +08:00
winlin
b4427877f7 support pithy print log message specified by stage. 2013-10-29 22:16:18 +08:00
winlin
293399dcf5 fix bug of time jitter correcter 2013-10-29 18:46:46 +08:00
winlin
3aa6be8645 fix the timestamp bug. correct the audio diff by audiosamplerate 2013-10-29 10:17:33 +08:00
winlin
3accc969ab update the signature of server 2013-10-29 07:46:55 +08:00
winlin
3c8e1f8ff7 fix bug of extended-timestamp, support librtmp/ffmpeg publish 2013-10-28 22:09:11 +08:00
winlin
0ed8807727 support cache last gop for video 2013-10-27 11:25:42 +08:00
winlin
359c7da19b support flash publish 2013-10-25 18:44:56 +08:00
winlin
6d385f15a7 refine code, add todo command 2013-10-25 17:35:37 +08:00
winlin
24a54a40e8 refine code, add prefix srs 2013-10-25 17:22:52 +08:00
winlin
53a668e34d support h264/avc codec by rtmp complex handshake(SrsComplexHandshake) 2013-10-25 17:16:23 +08:00
winlin
f0f4837a97 define the structs for c0c1 complex handshake 2013-10-25 07:42:18 +08:00
winlin
e6ca039dd6 add rtmp complex handshake classes 2013-10-25 07:15:33 +08:00
winlin
598aaa5c98 detect the video/audio codec, only cache the h264/aac sequence header 2013-10-24 22:29:12 +08:00
winlin
2987a24877 add TODO for complex handshake 2013-10-23 22:25:35 +08:00
winlin
2ee913bd70 update comment TODO for sequence header and fast-startup caching last gop 2013-10-23 22:20:08 +08:00
winlin
9da31de1c1 support decode user control message. response ping automatically 2013-10-23 22:17:57 +08:00
winlin
0a92faf2e3 update timestamp comments 2013-10-23 21:44:24 +08:00
winlin
b40d0467a8 time jitter detect and correct, very simple algorithm 2013-10-23 21:37:22 +08:00
winlin
e31e3d601d time jitter detect and correct, very simple algorithm 2013-10-23 21:31:22 +08:00
winlin
2a346c2398 support send acknowledgement when recv message. 2013-10-23 20:59:08 +08:00
winlin
5d1d0ff8bb update help 2013-10-23 12:20:03 +08:00
winlin
a0a0da5f23 release v0.1, support FMLE/FFMPEG publish, vp6 codec live streaming 2013-10-23 11:57:47 +08:00
winlin
54b9c5d389 support FMLE/FFMPEG publish vp6 codec, h264/aac not support yet 2013-10-23 00:17:44 +08:00
winlin
444a45facd fix bug to accept FFMPEG streaming 2013-10-23 00:01:59 +08:00
winlin
150489af51 support ffmpeg publish 2013-10-22 23:37:44 +08:00
winlin
584a427c2e dispatch video/audio/data to consumers 2013-10-22 20:08:55 +08:00
winlin
0a0d33335a rename base message to ISrsMessage 2013-10-22 19:51:46 +08:00
winlin
52a454c41b rename base message to ISrsMessage 2013-10-22 19:48:50 +08:00
winlin
d8a99dde52 rename SrsSharedMessage to SrsSharedPtrMessage 2013-10-22 19:45:02 +08:00
winlin
cdd843a641 rename SrsMessage to SrsCommonMessage 2013-10-22 19:44:12 +08:00
winlin
c64ed83378 add shared ptr to video/audio/data 2013-10-22 19:38:14 +08:00
winlin
5af377e41d add shared ptr message 2013-10-22 18:30:36 +08:00
winlin
940d2f02eb basic media cache framework 2013-10-22 18:20:54 +08:00
winlin
a24d0ecf0c support decode onMetaData. 2013-10-22 17:26:05 +08:00
winlin
ed371d6e7e support FMLE publish streaming 2013-10-22 16:44:10 +08:00
winlin
33c586181d support fmle publish. fix bug of rtmp chunk stream. 2013-10-22 15:48:33 +08:00
winlin
e598616e14 fix objectEncoding bug, default to AMF0, change to AMF3 if required. 2013-10-22 12:27:22 +08:00
winlin
99aa8bc087 support FMLE releaseStream, FCPublish 2013-10-22 12:12:10 +08:00
winlin
58a54176f7 support onStatus, RtmpSampleAccess, DataStart 2013-10-22 11:31:52 +08:00
winlin
adc382ad48 support set chunk size, PCUC 4bytes packets 2013-10-22 08:00:13 +08:00
winlin
af5961432d support createStream and play, identity the play client 2013-10-21 22:42:36 +08:00
winlin
5475d0e435 support ack size. 2013-10-20 22:22:55 +08:00
winlin
2e590e18f4 fix bug of send rtmp message 2013-10-20 21:58:03 +08:00
winlin
1beee1e970 support ecma array. connect app response. 2013-10-20 17:55:44 +08:00
winlin
8283ed465a support encode amf0 packet, connect app response packet 2013-10-20 17:13:01 +08:00
winlin
57dd58d557 send set peer bandwidth packet. 2013-10-20 15:59:26 +08:00
winlin
2abfcee10f support set ack window size. 2013-10-20 15:28:55 +08:00
winlin
1047e06bf3 encode packet and send out 2013-10-20 14:28:37 +08:00
winlin
a2d2fa1a25 log the req. 2013-10-20 08:55:42 +08:00
winlin
bd64ae8257 refine the protocol and amf0, extract the template method as global static method 2013-10-20 08:45:29 +08:00
winlin
2c53134bbb connect vhost/app packet decoded. 2013-10-19 21:39:19 +08:00
winlin
df400ef1c5 connect vhost/app packet decoded. 2013-10-19 21:32:41 +08:00
winlin
2886672347 amf0 object decode framework 2013-10-19 20:06:07 +08:00
winlin
810bb6ba38 decode amf0 string 2013-10-19 18:46:12 +08:00
winlin
a638ebd1c6 decode the amf0 command message: connect. 2013-10-19 18:27:52 +08:00
winlin
63bf9e112d decode the amf0 command message: connect. 2013-10-19 18:20:39 +08:00
winlin
25468e4ff8 refine buffer read socket logic. 2013-10-19 16:52:22 +08:00
winlin
496c5ecfde add amf0 decode framework. 2013-10-19 16:47:40 +08:00
winlin
f5672998fd expect rtmp packet which decoded from message payload 2013-10-19 16:16:06 +08:00
winlin
bf5378434f decode chunk stream to RTMP message 2013-10-19 13:52:07 +08:00
winlin
2625ecc151 decode message header 2013-10-19 12:12:52 +08:00
winlin
f730ccbf9f decode basic header 2013-10-19 11:18:15 +08:00
winlin
393e32ee0f add rtmp specification 2013-10-19 09:17:56 +08:00
winlin
bd66702299 add rtmp specification 2013-10-19 09:16:25 +08:00
winlin
9541ac1e35 add log macro use __PRETTY_FUNCTION__ for c++ 2013-10-19 09:10:17 +08:00
winlin
49a7cb9afb refine comments. 2013-10-19 09:01:56 +08:00
winlin
56e78bdf6f add comments. refine naming 2013-10-19 09:00:17 +08:00
winlin
a323483bea add protocol stack 2013-10-19 08:42:21 +08:00
winlin
fbe6e061c0 simple handshake(specified by rtmp protocol v1.0) success 2013-10-18 22:04:39 +08:00
winlin
3976a17841 add auto free. recv c0c1 2013-10-18 21:57:52 +08:00
winlin
0609eeb7c8 add socket rtmp and buffer. rename logs 2013-10-18 21:41:05 +08:00
winlin
d4b6178f0f get peer ip and add rtmp class 2013-10-18 20:15:05 +08:00
winlin
96e1de255c close fd when delete connection object 2013-10-18 17:10:24 +08:00
winlin
973bea1e14 extract the rtmp connection 2013-10-18 16:57:21 +08:00
winlin
d8a64603c0 support listen and accept framework 2013-10-18 16:23:06 +08:00
winlin
5b02f9c78b init st, add error code 2013-10-18 10:39:37 +08:00
winlin
a4c5f94b15 add copyright info 2013-10-17 22:27:47 +08:00
winlin
78c69016ba add srs_core.cpp 2013-10-17 22:14:11 +08:00
winlin
67d96fcab4 add log 2013-10-17 22:09:10 +08:00
winlin
7268dd15a1 add build framework 2013-10-17 20:58:04 +08:00