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

webrtc/modules/video_coding/main/source/jitter_buffer_common.h

@@ -17,7 +17,7 @@ namespace webrtc {
 
 enum { kMaxNumberOfFrames     = 300 };
 enum { kStartNumberOfFrames   = 6 };
-enum { kMaxVideoDelayMs       = 2000 };
+enum { kMaxVideoDelayMs       = 10000 };
 
 enum VCMJitterBufferEnum {
   kMaxConsecutiveOldFrames        = 60,

webrtc/modules/video_coding/main/source/timing.cc

@@ -331,7 +331,8 @@ VCMTiming::TargetVideoDelay() const
 uint32_t
 VCMTiming::TargetDelayInternal() const
 {
-    return _requiredDelayMs + MaxDecodeTimeMs() + _renderDelayMs;
+    return std::max(_minTotalDelayMs,
+                    _requiredDelayMs + MaxDecodeTimeMs() + _renderDelayMs);
 }
 
 }