Add VideoCodec::PreferDecodeLate

webrtc/video/video_receive_stream.cc

Index: webrtc/video/video_receive_stream.cc
diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc
index f5cb3570984f0dcf43af253545630b4d4f78c650..76ee4d3030a71eec45eb547c12925a3fd3f7ae90 100644
--- a/webrtc/video/video_receive_stream.cc
+++ b/webrtc/video/video_receive_stream.cc
@@ -38,8 +38,6 @@ std::string VideoReceiveStream::Decoder::ToString() const {
   ss << "{decoder: " << (decoder != nullptr ? "(VideoDecoder)" : "nullptr");
   ss << ", payload_type: " << payload_type;
   ss << ", payload_name: " << payload_name;
-  ss << ", is_renderer: " << (is_renderer ? "yes" : "no");
-  ss << ", expected_delay_ms: " << expected_delay_ms;
   ss << '}';
 
   return ss.str();
@@ -263,9 +261,7 @@ VideoReceiveStream::VideoReceiveStream(
     const Decoder& decoder = config_.decoders[i];
     RTC_CHECK_EQ(0,
                  vie_channel_->RegisterExternalDecoder(
-                     decoder.payload_type, decoder.decoder, decoder.is_renderer,
-                     decoder.is_renderer ? decoder.expected_delay_ms
-                                         : config.render_delay_ms));
+                     decoder.payload_type, decoder.decoder));
 
     VideoCodec codec = CreateDecoderVideoCodec(decoder);
 
@@ -274,6 +270,7 @@ VideoReceiveStream::VideoReceiveStream(
 
   incoming_video_stream_.reset(new IncomingVideoStream(0));
   incoming_video_stream_->SetExpectedRenderDelay(config.render_delay_ms);
+  vie_channel_->SetExpectedRenderDelay(config.render_delay_ms);

[pbos-webrtc, 2015/11/05 17:47:30]

Can you put this one step down to split up incoming_video_stream and
vie_channel_ calls?

   incoming_video_stream_->SetExternalCallback(this);
   vie_channel_->SetIncomingVideoStream(incoming_video_stream_.get());