Add VideoCodec::PreferDecodeLate

webrtc/modules/video_coding/video_receiver.cc

Index: webrtc/modules/video_coding/video_receiver.cc
diff --git a/webrtc/modules/video_coding/video_receiver.cc b/webrtc/modules/video_coding/video_receiver.cc
index c347baa7b809ba34a44a239fe34d1d04919d10b1..9538db06ea963ab60064ba0ab6bcbc576f4b1074 100644
--- a/webrtc/modules/video_coding/video_receiver.cc
+++ b/webrtc/modules/video_coding/video_receiver.cc
@@ -235,11 +235,9 @@ int32_t VideoReceiver::RegisterDecoderTimingCallback(
   return VCM_OK;
 }
 
-// Register an externally defined decoder/render object.
-// Can be a decoder only or a decoder coupled with a renderer.
+// Register an externally defined decoder object.
 void VideoReceiver::RegisterExternalDecoder(VideoDecoder* externalDecoder,
-                                               uint8_t payloadType,
-                                               bool internalRenderTiming) {
+                                            uint8_t payloadType) {
   CriticalSectionScoped cs(_receiveCritSect);
   if (externalDecoder == NULL) {
     // Make sure the VCM updates the decoder next time it decodes.
@@ -247,8 +245,8 @@ void VideoReceiver::RegisterExternalDecoder(VideoDecoder* externalDecoder,
     RTC_CHECK(_codecDataBase.DeregisterExternalDecoder(payloadType));
     return;
   }
-  _codecDataBase.RegisterExternalDecoder(externalDecoder, payloadType,
-                                         internalRenderTiming);
+  _codecDataBase.RegisterExternalDecoder(externalDecoder, payloadType);
+  return;

[stefan-webrtc, 2015/12/07 09:02:19]

Remove

[perkj_webrtc, 2015/12/07 12:06:34]

Done.

 }
 
 // Register a frame type request callback.
@@ -281,14 +279,14 @@ void VideoReceiver::TriggerDecoderShutdown() {
 // Should be called as often as possible to get the most out of the decoder.
 int32_t VideoReceiver::Decode(uint16_t maxWaitTimeMs) {
   int64_t nextRenderTimeMs;
-  bool supports_render_scheduling;
+  bool has_only_one_output_buffer = false;

[stefan-webrtc, 2015/12/07 09:02:19]

prefers_decode_late?

[perkj_webrtc, 2015/12/07 12:06:34]

Done.

   {
     CriticalSectionScoped cs(_receiveCritSect);
-    supports_render_scheduling = _codecDataBase.SupportsRenderScheduling();
+    has_only_one_output_buffer = _codecDataBase.PreferDecodeLate();
   }
 
   VCMEncodedFrame* frame = _receiver.FrameForDecoding(
-      maxWaitTimeMs, nextRenderTimeMs, supports_render_scheduling);
+      maxWaitTimeMs, nextRenderTimeMs, has_only_one_output_buffer);
 
   if (frame == NULL) {
     return VCM_FRAME_NOT_READY;
@@ -369,13 +367,8 @@ int32_t VideoReceiver::Decode(const VCMEncodedFrame& frame) {
                           "type",
                           frame.FrameType());
   // Change decoder if payload type has changed
-  const bool renderTimingBefore = _codecDataBase.SupportsRenderScheduling();
-  _decoder = _codecDataBase.GetDecoder(frame, &_decodedFrameCallback);
-  if (renderTimingBefore != _codecDataBase.SupportsRenderScheduling()) {
-    // Make sure we reset the decode time estimate since it will
-    // be zero for codecs without render timing.
-    _timing.ResetDecodeTime();
-  }
+  _decoder =
+      _codecDataBase.GetDecoder(frame, &_decodedFrameCallback);
   if (_decoder == NULL) {
     return VCM_NO_CODEC_REGISTERED;
   }