Commit Graph

691 Commits (52735095545e8b5d856922fed452e812f9305301)

Author SHA1 Message Date
winlin c681098949 fix bug of edge, one fd for one thread 11 years ago
winlin a363e3d293 support basic edge(play/publish) RTMP server. 0.9.78 11 years ago
winlin bc7648724d use directly send publish edge mode. 11 years ago
winlin 2295ebb346 remove the edge message flag, use directly send mode 11 years ago
winlin 5ddc71685b pre change publish edge to directly send mode 11 years ago
winlin 16319d73fd implements basic edge(play and publish), with bug 11 years ago
winlin 79c9c6dcb7 implements the proxy for edge publish mode 11 years ago
winlin ec96072472 add publish edge framework 11 years ago
winlin 270b1270af fix bug of edge, refine state to user state. 11 years ago
winlin 2bcaeccc51 edge support play and ingest origin stream. change to 0.9.77 11 years ago
winlin acba4cfdc6 add edge framework 11 years ago
winlin b0951d36d3 refine source, rename req to _req 11 years ago
winlin a2f317a113 add chad.wang to authors for srs-librtmp on windows build project 11 years ago
winlin a63a3812e3 add srs app edge 11 years ago
winlin d6948d613f add author byteman for h264 to flv. 11 years ago
winlin f3b441ba1f add alipay donation page. to 0.9.76 11 years ago
winlin 3ed59f190b refine srs live flashP2P(integrated by chnvideo) 11 years ago
winlin 67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 11 years ago
winlin b276714573 support chnvideo hss streaming 11 years ago
winlin 35f3a93239 support dvr to hss. change to 0.9.74 11 years ago
winlin e271cb607f refine plan, add stream start time for atc 11 years ago
winlin 0c0010d529 update dvr, extract flv segment 11 years ago
winlin 7ff8df4d97 refine code, notice api when segment close 11 years ago
winlin 435e02db5d dvr use .tmp and rename to .flv when finished. 11 years ago
winlin 733ca2475d call http api when dvr got keyframe 11 years ago
winlin 36d8fdfc1a move the ts buffer to http message 11 years ago
winlin a73bf8d4aa optimizm the http server for send ts file 11 years ago
winlin 8bf1f4ad87 add api/v1 summaries/rusages/self_proc_stats/system_proc_stats/meminfos. change to 0.9.72 11 years ago
winlin a5f4f6bd14 add meminfo 11 years ago
winlin 15aea4d9b3 add cpuinfo 11 years ago
winlin 951a93ab86 get self proc and system proc stat 11 years ago
winlin 117fd67950 add cpu stat 11 years ago
winlin c530a8e5fc fix bug of ingest for android, init the variable to 0 11 years ago
winlin fae1c61c3f update readme. change to 0.9.71 11 years ago
winlin 608b28f223 add srs ingest flv/rtmp base on srs-librtmp 11 years ago
winlin 25630b5211 fix bug of utest build. 11 years ago
winlin 67ddc9f5ae support dvr(record live to flv file for vod), change to 0.9.70 11 years ago
winlin ab9a2ddd6c dvr support segment plan 11 years ago
winlin 2d1c28cff9 update dvr, support segment plan 11 years ago
winlin 6f19a83114 dvr support plan and default session plan 11 years ago
winlin 4b82a4f510 support reload dvr 11 years ago
winlin 9861fc4fe3 refine dvr, add comments 11 years ago
winlin 56ff70cdf8 remove lseek and size of fs stream 11 years ago
winlin 271b969d0b set audio/video flag to 0 in flv header. 11 years ago
winlin 73459547e1 support dvr. change to 0.9.69 11 years ago
winlin 996d042a33 add comments for file stream 11 years ago
winlin f5ff9c7241 update dvr comments 11 years ago
winlin fdd0678bcb add thread cid to log 11 years ago
winlin ae3f7d9cb8 change meeting hls to an 11 years ago
winlin 5af1da17ed change to 0.9.68 11 years ago
winlin 0c91fa6bed fix dvr mem leak, free msg when not use it. 11 years ago
winlin 88094af97a refine log, add user original configure 11 years ago
winlin 78e7a31ddb refine option, add --use-sys-ssl, change to 0.9.67 11 years ago
winlin 47927ab460 refine options, change to 0.9.66 11 years ago
winlin 005502a07e update comments for HLS on_hls_start 11 years ago
winlin fd0002e499 add dvr framework 11 years ago
winlin 96115ac4f7 fix bug of config params. x86/x64/pi never use static 11 years ago
winlin 90dee0924d fix bug of build script 11 years ago
winlin 23a1b29935 add dvr option. refine macros of auto headers 11 years ago
winlin 1ae9178605 add favicon.ico, change to 0.9.65 11 years ago
winlin b86c83b0e0 refine the info for log to file. 11 years ago
winlin ce64dafc3c use stream time for live duration. change to 0.9.64 11 years ago
winlin 2c6b6c6846 fix bug #47: use stream time to stop for duration of rtmpdump 11 years ago
winlin 73c310cd2e refine the macro. 11 years ago
winlin bc756d6ad9 fix simple handshake bug #46, copy c1 to s2. change to 0.9.63 11 years ago
winlin 9a036958d7 fix bug #45, support duration for live. change to 0.9.62 11 years ago
winlin 04a526b340 change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE 11 years ago
winlin a0472f256d support test config file. change to 0.9.61 11 years ago
winlin f980340e89 refine config option 11 years ago
winlin aa784377fd refine reload, ignore if parse config file failed. 11 years ago
winlin cfee761899 support full reload. change to 0.9.60 11 years ago
winlin bb87272c39 refine reload, rename some vhost specified to add vhost prefix 11 years ago
winlin dc3c3cff8e support reload http_stream 11 years ago
winlin c33ff4fdb8 support reload http_api 11 years ago
winlin 17ac29d160 refine code for reload http api/stream 11 years ago
winlin 821b58af03 support reload atc 11 years ago
winlin eda1ddc03d support reload log level/logfile/tank 11 years ago
winlin f652c28485 support reload pid. 11 years ago
winlin 0a016e58bf add comments for main 11 years ago
winlin b38df9cd1a refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59 11 years ago
winlin 15f651bccd update demo, support acodec 11 years ago
winlin ff90278048 add speex1.2 to transcode flash encoder stream. change to 0.9.58 11 years ago
winlin 3a26b23fba change ffmpeg log to ./objs 11 years ago
winlin 8295169e0e refine code, unify the coding style 11 years ago
winlin ccba9ba9ba move log level parse to app utility 11 years ago
winlin f2f30dcc52 add utility, change log to trace 11 years ago
winlin 94874e77af refine reload config 11 years ago
winlin 6c5d8b4851 refine reload config 11 years ago
winlin bc61b1de18 fix bug of reload ingest 11 years ago
winlin e0a6fe63cc fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57 11 years ago
winlin 9ed3421586 rename from get_ingest to get_ingest_by_id of config 11 years ago
winlin e432fe931f support reload ingesters(added/removed/updated). change to 0.9.57. 11 years ago
winlin e6d8bc1e5c ingest reload: support disable vhost 11 years ago
winlin 5e504944dc add comments for http conn 11 years ago
winlin dc71eef394 support ingest reload: add new vhost with ingester 11 years ago
winlin e5646e3bb5 refine ingester, add vhost/id info to ingester 11 years ago
winlin 9372a7065a refine the ingest log 11 years ago
winlin ccf0a423be change sleep time from 3s to 0.6s for ingester. 11 years ago
winlin 509504f27d change sleep time from 3s to 0.6s 11 years ago
winlin 5aded78272 change to 0.9.56, for macro changed 11 years ago
winlin eba35e2ac0 refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool 11 years ago
winlin 70e73bc281 add comments for bug #39 11 years ago
winlin d124772d6a add http server/api to srs.conf. add comments for bug #6. 11 years ago
winlin 98809862f7 change to 0.9.55, for 1.0 mainline 11 years ago
winlin 12ba02238d update readme, add ingest 11 years ago
winlin c11e266d5c update readme 11 years ago
winlin 4f445f2f60 support ingest stream 11 years ago
winlin 45d8f4346f implements ingest, change to 0.9.53 11 years ago
winlin e89ab84e4e implements ingest, change to 0.9.53 11 years ago
winlin 2742679354 implements the ingest framework 11 years ago
winlin 92281548b6 add ingest config 11 years ago
winlin 9107831b0e add config to read ingesters 11 years ago
winlin f5c4f492da add comments for ffmpeg 11 years ago
winlin c759a7c6b5 refine log of ffmpeg 11 years ago
winlin 4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg 11 years ago
winlin 72c330d47c refine ffmepg and encoder, extract ffmpeg. 11 years ago
winlin 095364a72b refine ingest, start/stop ingest in server 11 years ago
winlin eea2310b07 refine consts 11 years ago
winlin 4a7378b77a ingest stream when server cycle 11 years ago
winlin adfbbbfd68 add ingest files 11 years ago
winlin 983fe46ce2 use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding 11 years ago
winlin c4524484e6 add comments for aac encoder 11 years ago
winlin 7916cab50e donot check the aac encoder, ensure aac is ok 11 years ago
winlin 30e3323fe4 update readme, add SampleHTTP link 11 years ago
winlin 4e3fe36ae2 refine http server pages. change to 0.9.51 11 years ago
winlin 1c02f4551c always use 64bits for lseek 11 years ago
winlin ced050829e fix bug of http, change to 0.9.50 11 years ago
winlin c5d3b11a6e update http stream. change to 0.9.49 11 years ago
winlin 17ce21348d implements the http stream module. change to 0.9.49 11 years ago
winlin ef26e77560 implements the http stream module. 11 years ago
winlin 00eda0d7b2 implements the http stream module. 11 years ago
winlin 83f35d10b1 add http delivery framework 11 years ago
winlin 8d7877ebd1 refine config, group by sections. 11 years ago
winlin b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48 11 years ago
winlin 28b0c3a27f refine log and thread function name. change to 0.9.47. 11 years ago
winlin 6d32ad1828 refine log and thread function name 11 years ago
winlin f089eafd9f fix bug #38, remove app slash of jwplayer, change to 0.9.46 11 years ago
winlin 3f13726544 add log level in conf. change to 0.9.45 11 years ago
winlin 4984631cd6 refine the http crossdomain, send it only required 11 years ago
winlin 133a6f0dbf add crossdomain support for http error 11 years ago
winlin b71eb0d49a support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44 11 years ago
winlin f2216691f9 remove the duplicated http status line when error 11 years ago
winlin 818c1f1520 support http error code, check url 11 years ago
winlin 0ae23d7556 rename version to versions 11 years ago
winlin 4a40075f68 add contributors to api/v1/authors 11 years ago
winlin 5c019c7938 implements api/v1/version, change to 0.9.43 11 years ago
winlin 9c3ba680d8 fix http hooks json encode bug, remove the JFIELD_CONT for the last field 11 years ago
winlin a14267d2b4 refine the http url handler match. refine json encode 11 years ago
winlin bfa07465f0 implements basic http response framework 11 years ago
winlin 341b5151d9 create http handler framework 11 years ago