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

253 commits

Author SHA1 Message Date
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
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
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
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
0c91fa6bed fix dvr mem leak, free msg when not use it. 2014-04-16 15:58:06 +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
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
3a26b23fba change ffmpeg log to ./objs 2014-04-10 17:19:49 +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
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
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
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