external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for #383, refine code to support mix correct algorithm.

Browse source
This commit is contained in:
winlin 2015-04-15 16:17:52 +08:00
parent 542aab4557
commit 8fbc6526bb
6 changed files with 76 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
trunk/conf/full.conf
View file

@ -75,7 +75,7 @@ heartbeat {
# the id of devide.
device_id "my-srs-device";
# whether report with summaries
# if true, put /api/v1/summaries to the request data:
# if on, put /api/v1/summaries to the request data:
# {
# "summaries": summaries object.
# }
@ -1338,6 +1338,11 @@ vhost jitter.srs.com {
# 3. off, disable the time jitter algorithm, like atc.
# default: full
time_jitter full;
# whether use the mix algorithm to correct the timestamp.
# if on, always ensure the timestamp of audio+video is monotonically increase.
# if off, use time_jitter to correct the timestamp if required.
# default: off
mix_correct off;
}
# vhost for atc.