github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,160 Commits
14 Branches
107 Tags
345 MiB
Commit Graph

882 Commits (6b76e9e6656ff836e25ce9e0aaf4240dd4796ef1)

Author SHA1 Message Date
winlin cfee761899 support full reload. change to 0.9.60
winlin bb87272c39 refine reload, rename some vhost specified to add vhost prefix
winlin dc3c3cff8e support reload http_stream
winlin c33ff4fdb8 support reload http_api
winlin 17ac29d160 refine code for reload http api/stream
winlin 821b58af03 support reload atc
winlin eda1ddc03d support reload log level/logfile/tank
winlin f652c28485 support reload pid.
winlin 0a016e58bf add comments for main
winlin b38df9cd1a refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59
winlin 7c64a893f5 add demo.m3u8 and demo.html
winlin 9eb76cb1eb update demo.conf
winlin 189da7e12e fix bug of demo.conf
winlin 15f651bccd update demo, support acodec
winlin acdd5a827e update api server, support servers
winlin ff90278048 add speex1.2 to transcode flash encoder stream. change to 0.9.58
winlin 64727ce616 add bandwidth test conf
winlin 3a26b23fba change ffmpeg log to ./objs
winlin ca02cfe1bf update server.py
winlin c3c2767363 update api server, add servers
winlin 8295169e0e refine code, unify the coding style
winlin ccba9ba9ba move log level parse to app utility
winlin f2f30dcc52 add utility, change log to trace
winlin 94874e77af refine reload config
winlin 6c5d8b4851 refine reload config
winlin bc61b1de18 fix bug of reload ingest
winlin e0a6fe63cc fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57
winlin 9ed3421586 rename from get_ingest to get_ingest_by_id of config
winlin e432fe931f support reload ingesters(added/removed/updated). change to 0.9.57.
winlin e6d8bc1e5c ingest reload: support disable vhost
winlin 5e504944dc add comments for http conn
winlin dc71eef394 support ingest reload: add new vhost with ingester
winlin e5646e3bb5 refine ingester, add vhost/id info to ingester
winlin 017b96f9b5 fix the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt
winlin 056895a978 add comments for the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt
winlin 9372a7065a refine the ingest log
winlin 4af7b6e383 update conf file, add id for ingest.
winlin 5a3b59d3c8 update conf file, add id for ingest.
winlin ccf0a423be change sleep time from 3s to 0.6s for ingester.
winlin 509504f27d change sleep time from 3s to 0.6s
winlin 5aded78272 change to 0.9.56, for macro changed
winlin eba35e2ac0 refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool
winlin 70e73bc281 add comments for bug
winlin d124772d6a add http server/api to srs.conf. add comments for bug .
winlin 3b59a6c687 fix bug of package for arm
winlin 667191913b fix bug of package for arm
winlin 5c9941989e fix bug of package for arm
winlin 503fb93d4e fix bug of package for arm
winlin 5fd582cd26 fix bug of package for arm
winlin a8c5db3fc7 fix bug of package for arm
winlin 6e88634c5c add transcode to package
winlin 9a8eeb685d update package, add http server and api.
winlin 98809862f7 change to 0.9.55, for 1.0 mainline
winlin 12ba02238d update readme, add ingest
winlin 05e22e9530 fix script run/build/stop bug
winlin c11e266d5c update readme
winlin 3d073f9ef6 update demo script, remove ffmpeg publish. use ingest instead
winlin 4f445f2f60 support ingest stream
winlin 45d8f4346f implements ingest, change to 0.9.53
winlin e89ab84e4e implements ingest, change to 0.9.53
winlin 2742679354 implements the ingest framework
winlin 92281548b6 add ingest config
winlin 9107831b0e add config to read ingesters
winlin f5c4f492da add comments for ffmpeg
winlin c759a7c6b5 refine log of ffmpeg
winlin 4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg
winlin 72c330d47c refine ffmepg and encoder, extract ffmpeg.
winlin 095364a72b refine ingest, start/stop ingest in server
winlin eea2310b07 refine consts
winlin 4a7378b77a ingest stream when server cycle
winlin adfbbbfd68 add ingest files
winlin 7384ad0caa add ingest config section of full.conf
winlin 5e6c490ba0 add ingest compile feature
winlin e80abac4f0 add ingest feature to readme
winlin 983fe46ce2 use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding
winlin 5ff1d589f7 change warn to trace for nginx disabled
winlin d546f815df update build/run/stop script
winlin c4524484e6 add comments for aac encoder
winlin 7916cab50e donot check the aac encoder, ensure aac is ok
winlin 7de8bd7595 allow pi to use ffmpeg
winlin 2949c751f6 update install, create http root
winlin 43979f7505 add htt.hls sample
winlin 30e3323fe4 update readme, add SampleHTTP link
winlin 4e3fe36ae2 refine http server pages. change to 0.9.51
winlin 1c02f4551c always use 64bits for lseek
winlin ced050829e fix bug of http, change to 0.9.50
winlin c5d3b11a6e update http stream. change to 0.9.49
winlin 3c63cf0a86 update demo page, change http port to 8080
winlin 17ce21348d implements the http stream module. change to 0.9.49
winlin ef26e77560 implements the http stream module.
winlin 00eda0d7b2 implements the http stream module.
winlin 83f35d10b1 add http delivery framework
winlin 8d7877ebd1 refine config, group by sections.
winlin b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48
winlin 28b0c3a27f refine log and thread function name. change to 0.9.47.
winlin 6d32ad1828 refine log and thread function name
winlin 1117f78587 support arm build for http api and server
winlin f089eafd9f fix bug , remove app slash of jwplayer, change to 0.9.46
winlin 3f13726544 add log level in conf. change to 0.9.45
winlin 4984631cd6 refine the http crossdomain, send it only required