Updates to VCMDecodedFrameCallback, VideoReceiver and a few related classes/tests.

webrtc/modules/video_coding/video_coding_impl.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.
  */
 
 #include "webrtc/modules/video_coding/video_coding_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/thread_checker.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/video_bitrate_allocator.h"
 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
 #include "webrtc/modules/video_coding/codecs/vp8/temporal_layers.h"
 #include "webrtc/modules/video_coding/encoded_frame.h"
 #include "webrtc/modules/video_coding/include/video_codec_initializer.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/jitter_buffer.h"
 #include "webrtc/modules/video_coding/packet.h"
 #include "webrtc/modules/video_coding/timing.h"
@@ skipping 64 matching lines @@
                   pre_decode_image_callback,
                   timing_.get(),
                   nack_sender,
                   keyframe_request_sender) {}
 
   virtual ~VideoCodingModuleImpl() {}
 
   int64_t TimeUntilNextProcess() override {
     int64_t sender_time = sender_.TimeUntilNextProcess();
     int64_t receiver_time = receiver_.TimeUntilNextProcess();
-    assert(sender_time >= 0);
-    assert(receiver_time >= 0);
+    RTC_DCHECK(sender_time >= 0);
+    RTC_DCHECK(receiver_time >= 0);

[stefan-webrtc, 2017/03/14 09:58:17]

GE

[tommi, 2017/03/14 10:52:10]

Done.

     return VCM_MIN(sender_time, receiver_time);
   }
 
   void Process() override {
     sender_.Process();
     receiver_.Process();
   }
 
   int32_t RegisterSendCodec(const VideoCodec* sendCodec,
                             uint32_t numberOfCores,
@@ skipping 70 matching lines @@
                                           requireKeyFrame);
   }
 
   void RegisterExternalDecoder(VideoDecoder* externalDecoder,
                                uint8_t payloadType) override {
     receiver_.RegisterExternalDecoder(externalDecoder, payloadType);
   }
 
   int32_t RegisterReceiveCallback(
       VCMReceiveCallback* receiveCallback) override {
+    RTC_DCHECK(construction_thread_.CalledOnValidThread());
     return receiver_.RegisterReceiveCallback(receiveCallback);
   }
 
   int32_t RegisterReceiveStatisticsCallback(
       VCMReceiveStatisticsCallback* receiveStats) override {
     return receiver_.RegisterReceiveStatisticsCallback(receiveStats);
   }
 
   int32_t RegisterDecoderTimingCallback(
       VCMDecoderTimingCallback* decoderTiming) override {
     return receiver_.RegisterDecoderTimingCallback(decoderTiming);
   }
 
   int32_t RegisterFrameTypeCallback(
       VCMFrameTypeCallback* frameTypeCallback) override {
     return receiver_.RegisterFrameTypeCallback(frameTypeCallback);
   }
 
   int32_t RegisterPacketRequestCallback(
       VCMPacketRequestCallback* callback) override {
+    RTC_DCHECK(construction_thread_.CalledOnValidThread());
     return receiver_.RegisterPacketRequestCallback(callback);
   }
 
   int32_t Decode(uint16_t maxWaitTimeMs) override {
     return receiver_.Decode(maxWaitTimeMs);
   }
 
   int32_t ReceiveCodec(VideoCodec* currentReceiveCodec) const override {
     return receiver_.ReceiveCodec(currentReceiveCodec);
   }
@@ skipping 47 matching lines @@
   }
 
   void RegisterPostEncodeImageCallback(
       EncodedImageCallback* observer) override {
     post_encode_callback_.Register(observer);
   }
 
   void TriggerDecoderShutdown() override { receiver_.TriggerDecoderShutdown(); }
 
  private:
+  rtc::ThreadChecker construction_thread_;
   EncodedImageCallbackWrapper post_encode_callback_;
   vcm::VideoSender sender_;
   std::unique_ptr<VideoBitrateAllocator> rate_allocator_;
   std::unique_ptr<VCMTiming> timing_;
   vcm::VideoReceiver receiver_;
 };
 }  // namespace
 
 void VideoCodingModule::Codec(VideoCodecType codecType, VideoCodec* codec) {
   VCMCodecDataBase::Codec(codecType, codec);
@@ skipping 19 matching lines @@
                                    nullptr,   // NackSender
                                    nullptr);  // KeyframeRequestSender
 }
 
 // Create method for the new jitter buffer.
 VideoCodingModule* VideoCodingModule::Create(
     Clock* clock,
     EventFactory* event_factory,
     NackSender* nack_sender,
     KeyFrameRequestSender* keyframe_request_sender) {
-  assert(clock);
-  assert(event_factory);
+  RTC_DCHECK(clock);
+  RTC_DCHECK(event_factory);
   return new VideoCodingModuleImpl(clock, event_factory, nack_sender,
                                    keyframe_request_sender, nullptr);
 }
 
 }  // namespace webrtc