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

webrtc/modules/video_coding/video_receiver_unittest.cc

 /*
  *  Copyright (c) 2013 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 <memory>
 #include <vector>
 
 #include "webrtc/modules/video_coding/include/mock/mock_vcm_callbacks.h"
 #include "webrtc/modules/video_coding/include/mock/mock_video_codec_interface.h"
 #include "webrtc/modules/video_coding/include/video_coding.h"
 #include "webrtc/modules/video_coding/test/test_util.h"
 #include "webrtc/modules/video_coding/timing.h"
 #include "webrtc/modules/video_coding/video_coding_impl.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gtest.h"
 
 using ::testing::_;
+using ::testing::AnyNumber;
 using ::testing::NiceMock;
 
 namespace webrtc {
 namespace vcm {
 namespace {
 
 class TestVideoReceiver : public ::testing::Test {
  protected:
   static const int kUnusedPayloadType = 10;
 
   TestVideoReceiver() : clock_(0) {}
 
   virtual void SetUp() {
     timing_.reset(new VCMTiming(&clock_));
     receiver_.reset(
         new VideoReceiver(&clock_, &event_factory_, nullptr, timing_.get()));
     receiver_->RegisterExternalDecoder(&decoder_, kUnusedPayloadType);
     const size_t kMaxNackListSize = 250;
     const int kMaxPacketAgeToNack = 450;
     receiver_->SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, 0);
 
     VideoCodingModule::Codec(kVideoCodecVP8, &settings_);
     settings_.plType = kUnusedPayloadType;  // Use the mocked encoder.
     EXPECT_EQ(0, receiver_->RegisterReceiveCodec(&settings_, 1, true));
+
+    // Since we call Decode, we need to provide a valid receive callback.
+    // However, for the purposes of these tests, we ignore the callbacks.
+    EXPECT_CALL(receive_callback_, OnIncomingPayloadType(_)).Times(AnyNumber());
+    EXPECT_CALL(receive_callback_, OnDecoderImplementationName(_))
+        .Times(AnyNumber());
+    receiver_->RegisterReceiveCallback(&receive_callback_);
   }
 
   void InsertAndVerifyPaddingFrame(const uint8_t* payload,
                                    WebRtcRTPHeader* header) {
     ASSERT_TRUE(header != NULL);
     for (int j = 0; j < 5; ++j) {
       // Padding only packets are passed to the VCM with payload size 0.
       EXPECT_EQ(0, receiver_->IncomingPacket(payload, 0, *header));
       ++header->header.sequenceNumber;
     }
@@ skipping 14 matching lines @@
     EXPECT_EQ(0, receiver_->Decode(100));
   }
 
   SimulatedClock clock_;
   NullEventFactory event_factory_;
   VideoCodec settings_;
   NiceMock<MockVideoDecoder> decoder_;
   NiceMock<MockPacketRequestCallback> packet_request_callback_;
 
   std::unique_ptr<VCMTiming> timing_;
+  MockVCMReceiveCallback receive_callback_;
   std::unique_ptr<VideoReceiver> receiver_;
 };
 
 TEST_F(TestVideoReceiver, PaddingOnlyFrames) {
   EXPECT_EQ(0, receiver_->SetVideoProtection(kProtectionNack, true));
   EXPECT_EQ(
       0, receiver_->RegisterPacketRequestCallback(&packet_request_callback_));
   const size_t kPaddingSize = 220;
   const uint8_t payload[kPaddingSize] = {0};
   WebRtcRTPHeader header;
@@ skipping 112 matching lines @@
 TEST_F(TestVideoReceiver, ReceiverDelay) {
   EXPECT_EQ(0, receiver_->SetMinReceiverDelay(0));
   EXPECT_EQ(0, receiver_->SetMinReceiverDelay(5000));
   EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(-100));
   EXPECT_EQ(-1, receiver_->SetMinReceiverDelay(10010));
 }
 
 }  // namespace
 }  // namespace vcm
 }  // namespace webrtc