| commit | d35964a1ceb35dd9ab1c8aca1198b2b87221e4ff | [log] [tgz] |
|---|---|---|
| author | pwestin@webrtc.org <pwestin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Tue Apr 30 16:06:10 2013 +0000 |
| committer | pwestin@webrtc.org <pwestin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | Tue Apr 30 16:06:10 2013 +0000 |
| tree | 8d39104be412f1158bb8966bf38cee1df2a984d7 | |
| parent | 6faba6edc9208c85a935406f4a213ec0773e5197 [diff] [blame] |
Fixing AV sync. Increased 2 const to allow for a bigger difference in AV sync. BUG=1711 Re-wrote the ComputeDelays to be readable and remove the possibilities of returning values lower than base_target_delay_ms R=mflodman@webrtc.org, mikhal@webrtc.org, niklas.enbom@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1367004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3922 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/video_coding/main/source/timing.cc b/webrtc/modules/video_coding/main/source/timing.cc index 1e0475b..6330913 100644 --- a/webrtc/modules/video_coding/main/source/timing.cc +++ b/webrtc/modules/video_coding/main/source/timing.cc
@@ -331,7 +331,8 @@ uint32_t VCMTiming::TargetDelayInternal() const { - return _requiredDelayMs + MaxDecodeTimeMs() + _renderDelayMs; + return std::max(_minTotalDelayMs, + _requiredDelayMs + MaxDecodeTimeMs() + _renderDelayMs); } }