Commit Graph

155 Commits (04a526b3403bcc15338b908cf7e9f09e7b87f166)

Author SHA1 Message Date
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 3a26b23fba change ffmpeg log to ./objs 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 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 c11e266d5c update readme 11 years ago
winlin 4f445f2f60 support ingest stream 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