Untangle ViEChannel and ViEEncoder.

webrtc/modules/video_coding/video_coding_robustness_unittest.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 17 matching lines @@
 using ::testing::NiceMock;
 using ::testing::Sequence;
 
 class VCMRobustnessTest : public ::testing::Test {
  protected:
   static const size_t kPayloadLen = 10;
 
   virtual void SetUp() {
     clock_.reset(new SimulatedClock(0));
     ASSERT_TRUE(clock_.get() != NULL);
-    vcm_ = VideoCodingModule::Create(clock_.get(), &event_factory_);
+    vcm_.reset(VideoCodingModule::Create(clock_.get(), &event_factory_));
     ASSERT_TRUE(vcm_ != NULL);
     const size_t kMaxNackListSize = 250;
     const int kMaxPacketAgeToNack = 450;
     vcm_->SetNackSettings(kMaxNackListSize, kMaxPacketAgeToNack, 0);
     ASSERT_EQ(0, vcm_->RegisterFrameTypeCallback(&frame_type_callback_));
     ASSERT_EQ(0, vcm_->RegisterPacketRequestCallback(&request_callback_));
     VideoCodingModule::Codec(kVideoCodecVP8, &video_codec_);
     ASSERT_EQ(VCM_OK, vcm_->RegisterReceiveCodec(&video_codec_, 1));
     vcm_->RegisterExternalDecoder(&decoder_, video_codec_.plType);
   }
 
-  virtual void TearDown() { VideoCodingModule::Destroy(vcm_); }
+  virtual void TearDown() { vcm_.reset(); }
 
   void InsertPacket(uint32_t timestamp,
                     uint16_t seq_no,
                     bool first,
                     bool marker_bit,
                     FrameType frame_type) {
     const uint8_t payload[kPayloadLen] = {0};
     WebRtcRTPHeader rtp_info;
     memset(&rtp_info, 0, sizeof(rtp_info));
     rtp_info.frameType = frame_type;
     rtp_info.header.timestamp = timestamp;
     rtp_info.header.sequenceNumber = seq_no;
     rtp_info.header.markerBit = marker_bit;
     rtp_info.header.payloadType = video_codec_.plType;
     rtp_info.type.Video.codec = kRtpVideoVp8;
     rtp_info.type.Video.codecHeader.VP8.InitRTPVideoHeaderVP8();
     rtp_info.type.Video.isFirstPacket = first;
 
     ASSERT_EQ(VCM_OK, vcm_->IncomingPacket(payload, kPayloadLen, rtp_info));
   }
 
-  VideoCodingModule* vcm_;
+  rtc::scoped_ptr<VideoCodingModule> vcm_;
   VideoCodec video_codec_;
   MockVCMFrameTypeCallback frame_type_callback_;
   MockPacketRequestCallback request_callback_;
   NiceMock<MockVideoDecoder> decoder_;
   NiceMock<MockVideoDecoder> decoderCopy_;
   rtc::scoped_ptr<SimulatedClock> clock_;
   NullEventFactory event_factory_;
 };
 
 TEST_F(VCMRobustnessTest, TestHardNack) {
@@ skipping 134 matching lines @@
 
   clock_->AdvanceTimeMilliseconds(23);
   InsertPacket(3000, 4, false, false, kVideoFrameDelta);
 
   InsertPacket(9000, 9, true, false, kVideoFrameDelta);
   InsertPacket(9000, 10, false, false, kVideoFrameDelta);
   InsertPacket(9000, 11, false, true, kVideoFrameDelta);
   EXPECT_EQ(VCM_OK, vcm_->Decode(33));  // Decode timestamp 9000 complete.
 }
 }  // namespace webrtc