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

712 commits

Author SHA1 Message Date
winlin
52d1fa8df5 fix mem leak for send packet, always free in send msg. 2014-05-02 12:34: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
daca90db95 disable verbose log for av 2014-04-30 17:37:00 +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
37476df704 refine log for recv message 2014-04-30 15:42:19 +08:00
winlin
7cbe18902f fix bug of librtmp after RTMP protocol stack refined, never use cid=2 to send data. 2014-04-30 13:20:53 +08:00
winlin
fc501b050b add atc_auto to disable or enable auto detect atc 2014-04-30 12:08:11 +08:00
winlin
30bb3ff704 add dvr_plan hss to full.conf 2014-04-30 11:56:19 +08:00
winlin
aebff659b6 remove wait interval for signal 2014-04-30 11:29:03 +08:00
winlin
d0dff2d332 fix bug #34: convert signal to io. 0.9.85 2014-04-30 11:26:32 +08:00
winlin
a14220d4fb fix bug of auto bravo atc 2014-04-30 10:31:05 +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
be4c182d11 refine RTMP protocol stack. 2014-04-29 14:18:10 +08:00
winlin
ebf6203c3b refine rtmp protocol stack, refer to go.rtmp 2014-04-29 13:39:16 +08:00
winlin
2e5337a26e refactor: remove the unused super. 2014-04-29 10:06:52 +08:00
winlin
fd0efecbc8 refine ingester pithy print 2014-04-29 09:57:59 +08:00
winlin
cb2959ae7d fix bug #53, never use msg when sent it 2014-04-29 09:32:30 +08:00
winlin
23b04e2a57 completed the edge reload, to 0.9.79 2014-04-28 17:57:59 +08:00
winlin
c681098949 fix bug of edge, one fd for one thread 2014-04-28 17:20:35 +08:00
winlin
a363e3d293 support basic edge(play/publish) RTMP server. 0.9.78 2014-04-27 15:10:25 +08:00
winlin
bc7648724d use directly send publish edge mode. 2014-04-27 14:57:28 +08:00
winlin
2295ebb346 remove the edge message flag, use directly send mode 2014-04-27 14:23:21 +08:00
winlin
5ddc71685b pre change publish edge to directly send mode 2014-04-27 14:21:19 +08:00
winlin
16319d73fd implements basic edge(play and publish), with bug 2014-04-27 12:28:45 +08:00
winlin
79c9c6dcb7 implements the proxy for edge publish mode 2014-04-27 11:11:15 +08:00
winlin
ec96072472 add publish edge framework 2014-04-27 09:29:37 +08:00
winlin
270b1270af fix bug of edge, refine state to user state. 2014-04-26 22:51:01 +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
acba4cfdc6 add edge framework 2014-04-26 18:08:21 +08:00
winlin
b0951d36d3 refine source, rename req to _req 2014-04-26 17:16:18 +08:00
winlin
a2f317a113 add chad.wang to authors for srs-librtmp on windows build project 2014-04-26 14:47:38 +08:00
winlin
a63a3812e3 add srs app edge 2014-04-25 16:35:03 +08:00
winlin
d6948d613f add author byteman for h264 to flv. 2014-04-25 15:27:50 +08:00
winlin
f3b441ba1f add alipay donation page. to 0.9.76 2014-04-25 12:56:48 +08:00
winlin
3ed59f190b refine srs live flashP2P(integrated by chnvideo) 2014-04-24 17:38:57 +08:00
winlin
67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 2014-04-24 16:32:19 +08:00
winlin
b276714573 support chnvideo hss streaming 2014-04-24 14:26:24 +08:00
winlin
35f3a93239 support dvr to hss. change to 0.9.74 2014-04-24 12:22:36 +08:00
winlin
e271cb607f refine plan, add stream start time for atc 2014-04-23 17:53:14 +08:00
winlin
0c0010d529 update dvr, extract flv segment 2014-04-23 16:33:42 +08:00
winlin
7ff8df4d97 refine code, notice api when segment close 2014-04-23 16:25:18 +08:00
winlin
435e02db5d dvr use .tmp and rename to .flv when finished. 2014-04-22 17:50:22 +08:00
winlin
733ca2475d call http api when dvr got keyframe 2014-04-22 17:32:45 +08:00
winlin
36d8fdfc1a move the ts buffer to http message 2014-04-22 12:20:58 +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
a5f4f6bd14 add meminfo 2014-04-20 00:15:26 +08:00
winlin
15aea4d9b3 add cpuinfo 2014-04-19 23:18:00 +08:00
winlin
951a93ab86 get self proc and system proc stat 2014-04-19 21:43:13 +08:00
winlin
117fd67950 add cpu stat 2014-04-19 21:23:34 +08:00
winlin
c530a8e5fc fix bug of ingest for android, init the variable to 0 2014-04-19 12:47:16 +08:00
winlin
fae1c61c3f update readme. change to 0.9.71 2014-04-19 11:21:13 +08:00
winlin
608b28f223 add srs ingest flv/rtmp base on srs-librtmp 2014-04-19 09:47:47 +08:00
winlin
25630b5211 fix bug of utest build. 2014-04-18 09:16:43 +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
ab9a2ddd6c dvr support segment plan 2014-04-17 18:13:59 +08:00
winlin
2d1c28cff9 update dvr, support segment plan 2014-04-17 17:35:21 +08:00
winlin
6f19a83114 dvr support plan and default session plan 2014-04-17 16:57:04 +08:00
winlin
4b82a4f510 support reload dvr 2014-04-17 16:22:21 +08:00
winlin
9861fc4fe3 refine dvr, add comments 2014-04-17 16:16:17 +08:00
winlin
56ff70cdf8 remove lseek and size of fs stream 2014-04-17 16:10:05 +08:00
winlin
271b969d0b set audio/video flag to 0 in flv header. 2014-04-17 16:08:56 +08:00
winlin
73459547e1 support dvr. change to 0.9.69 2014-04-17 16:06:49 +08:00
winlin
996d042a33 add comments for file stream 2014-04-17 12:59:35 +08:00
winlin
f5ff9c7241 update dvr comments 2014-04-16 17:54:41 +08:00
winlin
fdd0678bcb add thread cid to log 2014-04-16 16:58:54 +08:00
winlin
ae3f7d9cb8 change meeting hls to an 2014-04-16 16:18:02 +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
88094af97a refine log, add user original configure 2014-04-16 15:04:38 +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
005502a07e update comments for HLS on_hls_start 2014-04-16 11:11:53 +08:00
winlin
fd0002e499 add dvr framework 2014-04-16 09:28:02 +08:00
winlin
96115ac4f7 fix bug of config params. x86/x64/pi never use static 2014-04-15 16:07:25 +08:00
winlin
90dee0924d fix bug of build script 2014-04-15 14:24:03 +08:00
winlin
23a1b29935 add dvr option. refine macros of auto headers 2014-04-15 14:01:57 +08:00
winlin
1ae9178605 add favicon.ico, change to 0.9.65 2014-04-15 11:19:15 +08:00
winlin
b86c83b0e0 refine the info for log to file. 2014-04-14 12:14:01 +08:00
winlin
ce64dafc3c use stream time for live duration. change to 0.9.64 2014-04-14 10:55:46 +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
73c310cd2e refine the macro. 2014-04-14 09:10:36 +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
04a526b340 change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE 2014-04-13 17:14:33 +08:00
winlin
a0472f256d support test config file. change to 0.9.61 2014-04-13 16:55:42 +08:00
winlin
f980340e89 refine config option 2014-04-13 13:57:39 +08:00
winlin
aa784377fd refine reload, ignore if parse config file failed. 2014-04-13 13:50:58 +08:00
winlin
cfee761899 support full reload. change to 0.9.60 2014-04-13 13:35:03 +08:00
winlin
bb87272c39 refine reload, rename some vhost specified to add vhost prefix 2014-04-13 13:31:59 +08:00
winlin
dc3c3cff8e support reload http_stream 2014-04-13 13:27:51 +08:00
winlin
c33ff4fdb8 support reload http_api 2014-04-13 13:08:10 +08:00
winlin
17ac29d160 refine code for reload http api/stream 2014-04-12 22:16:39 +08:00
winlin
821b58af03 support reload atc 2014-04-12 22:00:27 +08:00
winlin
eda1ddc03d support reload log level/logfile/tank 2014-04-12 21:35:26 +08:00
winlin
f652c28485 support reload pid. 2014-04-12 20:46:32 +08:00
winlin
0a016e58bf add comments for main 2014-04-12 20:37:16 +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
15f651bccd update demo, support acodec 2014-04-11 14:13:14 +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
3a26b23fba change ffmpeg log to ./objs 2014-04-10 17:19:49 +08:00
winlin
8295169e0e refine code, unify the coding style 2014-04-10 14:22:09 +08:00
winlin
ccba9ba9ba move log level parse to app utility 2014-04-10 14:20:02 +08:00
winlin
f2f30dcc52 add utility, change log to trace 2014-04-10 14:12:22 +08:00
winlin
94874e77af refine reload config 2014-04-10 14:06:23 +08:00
winlin
6c5d8b4851 refine reload config 2014-04-10 14:05:01 +08:00
winlin
bc61b1de18 fix bug of reload ingest 2014-04-10 11:47:38 +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
9ed3421586 rename from get_ingest to get_ingest_by_id of config 2014-04-10 11:24:27 +08:00
winlin
e432fe931f support reload ingesters(added/removed/updated). change to 0.9.57. 2014-04-10 11:21:47 +08:00
winlin
e6d8bc1e5c ingest reload: support disable vhost 2014-04-10 10:35:02 +08:00
winlin
5e504944dc add comments for http conn 2014-04-10 10:22:22 +08:00
winlin
dc71eef394 support ingest reload: add new vhost with ingester 2014-04-10 10:09:30 +08:00
winlin
e5646e3bb5 refine ingester, add vhost/id info to ingester 2014-04-10 09:20:23 +08:00
winlin
9372a7065a refine the ingest log 2014-04-08 18:01:14 +08:00
winlin
ccf0a423be change sleep time from 3s to 0.6s for ingester. 2014-04-08 15:43:47 +08:00
winlin
509504f27d change sleep time from 3s to 0.6s 2014-04-08 15:43:18 +08:00
winlin
5aded78272 change to 0.9.56, for macro changed 2014-04-08 15:32:13 +08:00
winlin
eba35e2ac0 refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool 2014-04-08 15:28:34 +08:00
winlin
70e73bc281 add comments for bug #39 2014-04-08 13:56:45 +08:00
winlin
d124772d6a add http server/api to srs.conf. add comments for bug #6. 2014-04-08 13:54:16 +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
c11e266d5c update readme 2014-04-07 15:04:31 +08:00
winlin
4f445f2f60 support ingest stream 2014-04-07 14:28:06 +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
2742679354 implements the ingest framework 2014-04-07 13:32:00 +08:00
winlin
92281548b6 add ingest config 2014-04-07 13:13:57 +08:00
winlin
9107831b0e add config to read ingesters 2014-04-07 11:57:24 +08:00
winlin
f5c4f492da add comments for ffmpeg 2014-04-07 11:49:20 +08:00
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