Commit Graph

503 Commits (bc61b1de1889954a41508a9d606ecbe95eaaeeda)

Author SHA1 Message Date
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