Add VideoCodec::PreferDecodeLate

webrtc/video_engine/vie_channel.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 410 matching lines @@
     // Register codec type with VCM, but do not register RED or ULPFEC.
     if (vcm_->RegisterReceiveCodec(&video_codec, number_of_cores_, false) !=
         VCM_OK) {
       return -1;
     }
   }
   return 0;
 }
 
 
 int32_t ViEChannel::RegisterExternalDecoder(const uint8_t pl_type,

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

I think you can make this void and CHECK that this returns ok.

-                                            VideoDecoder* decoder,
-                                            bool buffered_rendering,
-                                            int32_t render_delay) {
+                                            VideoDecoder* decoder) {
   RTC_DCHECK(!sender_);
-  int32_t result;
-  result = vcm_->RegisterExternalDecoder(decoder, pl_type, buffered_rendering);
-  if (result != VCM_OK) {
-    return result;
-  }
-  return vcm_->SetRenderDelay(render_delay);
+  return vcm_->RegisterExternalDecoder(decoder, pl_type);
 }
 
 int32_t ViEChannel::DeRegisterExternalDecoder(const uint8_t pl_type) {
   RTC_DCHECK(!sender_);
   VideoCodec current_receive_codec;
   int32_t result = 0;
   result = vcm_->ReceiveCodec(&current_receive_codec);
-  if (vcm_->RegisterExternalDecoder(NULL, pl_type, false) != VCM_OK) {
+  if (vcm_->RegisterExternalDecoder(NULL, pl_type) != VCM_OK) {
     return -1;
   }
 
   if (result == 0 && current_receive_codec.plType == pl_type) {
     result = vcm_->RegisterReceiveCodec(&current_receive_codec,
                                         number_of_cores_, false);
   }
   return result;
 }
 
 int32_t ViEChannel::ReceiveCodecStatistics(uint32_t* num_key_frames,
                                            uint32_t* num_delta_frames) {
   CriticalSectionScoped cs(crit_.get());
   *num_key_frames = receive_frame_counts_.key_frames;
   *num_delta_frames = receive_frame_counts_.delta_frames;
   return 0;
 }
 
 uint32_t ViEChannel::DiscardedPackets() const {
   return vcm_->DiscardedPackets();
 }
 
 int ViEChannel::ReceiveDelay() const {
   return vcm_->Delay();
 }
 
+void ViEChannel::SetExpectedRenderDelay(int32_t delay_ms) {
+  vcm_->SetRenderDelay(delay_ms);
+}
+
 void ViEChannel::SetRTCPMode(const RtcpMode rtcp_mode) {
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
     rtp_rtcp->SetRTCPStatus(rtcp_mode);
 }
 
 void ViEChannel::SetProtectionMode(bool enable_nack,
                                    bool enable_fec,
                                    int payload_type_red,
                                    int payload_type_fec) {
   // Validate payload types.
@@ skipping 758 matching lines @@
   CriticalSectionScoped cs(crit_.get());
   receive_stats_callback_ = receive_statistics_proxy;
 }
 
 void ViEChannel::SetIncomingVideoStream(
     IncomingVideoStream* incoming_video_stream) {
   CriticalSectionScoped cs(crit_.get());
   incoming_video_stream_ = incoming_video_stream;
 }
 }  // namespace webrtc