Add some unit tests to TestVp8Impl.

webrtc/modules/video_coding/codecs/vp8/test/vp8_impl_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 13 matching lines @@
 #include "webrtc/test/frame_utils.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/fileutils.h"
 #include "webrtc/test/video_codec_settings.h"
 
 namespace webrtc {
 
 namespace {
 constexpr int64_t kMaxWaitEncTimeMs = 100;
 constexpr int64_t kMaxWaitDecTimeMs = 25;
 constexpr uint32_t kTestTimestamp = 123;

[brandtr, 2017/08/30 09:08:17]

kInitialRtpTimestamp?

[åsapersson, 2017/08/30 10:53:49]

Done.

 constexpr int64_t kTestNtpTimeMs = 456;
-constexpr uint32_t kTimestampIncrementPerFrame = 3000;
+constexpr int64_t kTimestampMs = 789;

[brandtr, 2017/08/30 09:08:17]

kInitialTimestampMs?

[åsapersson, 2017/08/30 10:53:49]

Done.

+constexpr uint32_t kTimestampIncrement = 3000;
 constexpr int kNumCores = 1;
 constexpr size_t kMaxPayloadSize = 1440;
 constexpr int kMinPixelsPerFrame = 12345;
 constexpr int kDefaultMinPixelsPerFrame = 320 * 180;
 constexpr int kWidth = 172;
 constexpr int kHeight = 144;
 
 void Calc16ByteAlignedStride(int width, int* stride_y, int* stride_uv) {
   *stride_y = 16 * ((width + 15) / 16);
   *stride_uv = 16 * ((width + 31) / 32);
@@ skipping 13 matching lines @@
       frame_buffer_.reset(new uint8_t[encoded_frame._size]);
     }
     RTC_DCHECK(frame_buffer_);
     memcpy(frame_buffer_.get(), encoded_frame._buffer, encoded_frame._length);
     encoded_frame_ = encoded_frame;
     encoded_frame_._buffer = frame_buffer_.get();
 
     // Skip |codec_name|, to avoid allocating.
     EXPECT_STREQ("libvpx", codec_specific_info->codec_name);
     EXPECT_EQ(kVideoCodecVP8, codec_specific_info->codecType);
+    EXPECT_EQ(0u, codec_specific_info->codecSpecific.VP8.simulcastIdx);
     codec_specific_info_.codecType = codec_specific_info->codecType;
     codec_specific_info_.codecSpecific = codec_specific_info->codecSpecific;
     complete_ = true;
     return Result(Result::OK, 0);
   }
 
   void VerifyQpParser(const EncodedImage& encoded_frame) const {
     int qp;
     ASSERT_TRUE(vp8::GetQp(encoded_frame._buffer, encoded_frame._length, &qp));
     EXPECT_EQ(encoded_frame.qp_, qp) << "Encoder QP != parsed bitstream QP.";
@@ skipping 78 matching lines @@
     int stride_y;
     Calc16ByteAlignedStride(kWidth, &stride_y, &stride_uv);
     EXPECT_EQ(stride_y, 176);
     EXPECT_EQ(stride_uv, 96);
     rtc::scoped_refptr<I420Buffer> stride_buffer(
         I420Buffer::Create(kWidth, kHeight, stride_y, stride_uv, stride_uv));
 
     // No scaling in our case, just a copy, to add stride to the image.
     stride_buffer->ScaleFrom(*compact_buffer);
 
-    input_frame_.reset(new VideoFrame(stride_buffer, kVideoRotation_0, 0));
+    input_frame_.reset(
+        new VideoFrame(stride_buffer, kVideoRotation_0,

[brandtr, 2017/08/30 09:08:17]

Change to "preferred" ctor? Then you don't need to convert to us, but you do
need to prove a render time.

https://cs.chromium.org/chromium/src/third_party/webrtc/api/video/video_frame...

[åsapersson, 2017/08/30 10:53:49]

Done.

+                       kTimestampMs * rtc::kNumMicrosecsPerMillisec));
     input_frame_->set_timestamp(kTestTimestamp);
     fclose(file);
   }
 
   void SetupCodecSettings() {
     webrtc::test::CodecSettings(kVideoCodecVP8, &codec_settings_);
     codec_settings_.maxBitrate = 4000;
     codec_settings_.width = kWidth;
     codec_settings_.height = kHeight;
     codec_settings_.VP8()->denoisingOn = true;
     codec_settings_.VP8()->frameDroppingOn = false;
     codec_settings_.VP8()->automaticResizeOn = false;
     codec_settings_.VP8()->complexity = kComplexityNormal;
     codec_settings_.VP8()->tl_factory = &tl_factory_;
   }
 
   void InitEncodeDecode() {
     EXPECT_EQ(
         WEBRTC_VIDEO_CODEC_OK,
         encoder_->InitEncode(&codec_settings_, kNumCores, kMaxPayloadSize));
     EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
               decoder_->InitDecode(&codec_settings_, kNumCores));
   }
 
+  void EncodeFrame() {
+    EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
+              encoder_->Encode(*input_frame_, nullptr, nullptr));
+  }
+
   void WaitForEncodedFrame() {
     int64_t start_ms = rtc::TimeMillis();
     while (rtc::TimeMillis() - start_ms < kMaxWaitEncTimeMs) {
       if (encoded_cb_.EncodeComplete())
         return;
     }
     ASSERT_TRUE(false);

[brandtr, 2017/08/30 09:08:17]

RTC_NOTREACHED

[åsapersson, 2017/08/30 10:53:49]

Done.

   }
 
   void WaitForDecodedFrame() {

[brandtr, 2017/08/30 11:07:17]

Then I guess this could be removed too?

[åsapersson, 2017/08/30 11:22:20]

Done.

     int64_t start_ms = rtc::TimeMillis();
     while (rtc::TimeMillis() - start_ms < kMaxWaitDecTimeMs) {
       if (decoded_cb_.DecodeComplete())
         return;
     }
     ASSERT_TRUE(false);

[brandtr, 2017/08/30 09:08:17]

RTC_NOTREACHED

[åsapersson, 2017/08/30 10:53:49]

Done.

   }
 
   void ExpectFrameWith(int16_t picture_id,
                        int tl0_pic_idx,
                        uint8_t temporal_idx) {
     WaitForEncodedFrame();
-    EXPECT_EQ(picture_id,
+    EXPECT_EQ(picture_id % (1 << 15),
               encoded_cb_.codec_specific_info_.codecSpecific.VP8.pictureId);
-    EXPECT_EQ(tl0_pic_idx,
+    EXPECT_EQ(tl0_pic_idx % (1 << 8),
               encoded_cb_.codec_specific_info_.codecSpecific.VP8.tl0PicIdx);
     EXPECT_EQ(temporal_idx,
               encoded_cb_.codec_specific_info_.codecSpecific.VP8.temporalIdx);
   }
 
   test::ScopedFieldTrials override_field_trials_;
   EncodedImageCallbackTestImpl encoded_cb_;
   DecodedImageCallbackTestImpl decoded_cb_;
   std::unique_ptr<VideoFrame> input_frame_;
   const std::unique_ptr<VideoEncoder> encoder_;
   const std::unique_ptr<VideoDecoder> decoder_;
   VideoCodec codec_settings_;
   TemporalLayersFactory tl_factory_;
 };
 
-TEST_F(TestVp8Impl, EncodeFrame) {
-  InitEncodeDecode();
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  WaitForEncodedFrame();
-}
-
-TEST_F(TestVp8Impl, EncoderParameterTest) {
-  codec_settings_.maxBitrate = 0;
-  codec_settings_.width = 1440;
-  codec_settings_.height = 1080;
-
-  // Calls before InitEncode().
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, encoder_->Release());
+TEST_F(TestVp8Impl, SetRateAllocation) {
   const int kBitrateBps = 300000;
   BitrateAllocation bitrate_allocation;
   bitrate_allocation.SetBitrate(0, 0, kBitrateBps);
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_UNINITIALIZED,
             encoder_->SetRateAllocation(bitrate_allocation,
                                         codec_settings_.maxFramerate));
+  InitEncodeDecode();
+  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
+            encoder_->SetRateAllocation(bitrate_allocation,
+                                        codec_settings_.maxFramerate));
+}
+
+TEST_F(TestVp8Impl, EncodeFrameAndRelease) {
+  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, encoder_->Release());
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             encoder_->InitEncode(&codec_settings_, kNumCores, kMaxPayloadSize));
+  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
+            encoder_->Encode(*input_frame_, nullptr, nullptr));
+  WaitForEncodedFrame();
+  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, encoder_->Release());
+  EXPECT_EQ(WEBRTC_VIDEO_CODEC_UNINITIALIZED,
+            encoder_->Encode(*input_frame_, nullptr, nullptr));
 }
 
-TEST_F(TestVp8Impl, DecoderParameterTest) {
-  // Calls before InitDecode().
+TEST_F(TestVp8Impl, InitDecode) {
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, decoder_->Release());
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             decoder_->InitDecode(&codec_settings_, kNumCores));
 }
 
+TEST_F(TestVp8Impl, OnEncodedImageReportsInfo) {
+  InitEncodeDecode();
+  EncodeFrame();
+  EXPECT_EQ(kTestTimestamp, encoded_cb_.encoded_frame_._timeStamp);
+  EXPECT_EQ(kTimestampMs, encoded_cb_.encoded_frame_.capture_time_ms_);
+  EXPECT_EQ(kWidth, static_cast<int>(encoded_cb_.encoded_frame_._encodedWidth));
+  EXPECT_EQ(kHeight,
+            static_cast<int>(encoded_cb_.encoded_frame_._encodedHeight));
+  EXPECT_EQ(-1,
+            encoded_cb_.encoded_frame_.adapt_reason_.bw_resolutions_disabled);

[brandtr, 2017/08/30 09:08:17]

Is this field set/related to VP8Impl?

[åsapersson, 2017/08/30 10:53:49]

Should be disabled for a single stream.

+}
+
 // We only test the encoder here, since the decoded frame rotation is set based
 // on the CVO RTP header extension in VCMDecodedFrameCallback::Decoded.
 // TODO(brandtr): Consider passing through the rotation flag through the decoder
 // in the same way as done in the encoder.
 TEST_F(TestVp8Impl, EncodedRotationEqualsInputRotation) {
   InitEncodeDecode();
-
   input_frame_->set_rotation(kVideoRotation_0);
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  WaitForEncodedFrame();
+  EncodeFrame();

[brandtr, 2017/08/30 09:08:18]

is WaitForEncodedFrame() not needed here?

Is it ever needed, due to the synchronous behaviour of libvpx?

[åsapersson, 2017/08/30 10:53:49]

Do not think it is ever needed, removed WaitForEncodedFrame and added check for
EncodeComplete in EncodeFrame.

   EXPECT_EQ(kVideoRotation_0, encoded_cb_.encoded_frame_.rotation_);
 
   input_frame_->set_rotation(kVideoRotation_90);
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  WaitForEncodedFrame();
+  EncodeFrame();

[brandtr, 2017/08/30 09:08:18]

and here.

   EXPECT_EQ(kVideoRotation_90, encoded_cb_.encoded_frame_.rotation_);
 }
 
 TEST_F(TestVp8Impl, DecodedQpEqualsEncodedQp) {
   InitEncodeDecode();
   encoder_->Encode(*input_frame_, nullptr, nullptr);
   WaitForEncodedFrame();
   // First frame should be a key frame.
   encoded_cb_.encoded_frame_._frameType = kVideoFrameKey;
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
@@ skipping 44 matching lines @@
             decoder_->Decode(encoded_cb_.encoded_frame_, false, nullptr));
   // Now setting a key frame.
   encoded_cb_.encoded_frame_._frameType = kVideoFrameKey;
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             decoder_->Decode(encoded_cb_.encoded_frame_, false, nullptr));
   ASSERT_TRUE(decoded_cb_.frame_);
   EXPECT_GT(I420PSNR(input_frame_.get(), &*decoded_cb_.frame_), 36);
 }
 
 TEST_F(TestVp8Impl, EncoderRetainsRtpStateAfterRelease) {
+  codec_settings_.VP8()->numberOfTemporalLayers = 2;
   InitEncodeDecode();
-  // Override default settings.
-  codec_settings_.VP8()->numberOfTemporalLayers = 2;
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->InitEncode(&codec_settings_, kNumCores, kMaxPayloadSize));
 
   // Temporal layer 0.
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  WaitForEncodedFrame();
+  EncodeFrame();

[brandtr, 2017/08/30 09:08:17]

and here

   EXPECT_EQ(0, encoded_cb_.codec_specific_info_.codecSpecific.VP8.temporalIdx);
   int16_t picture_id =
       encoded_cb_.codec_specific_info_.codecSpecific.VP8.pictureId;
   int tl0_pic_idx =
       encoded_cb_.codec_specific_info_.codecSpecific.VP8.tl0PicIdx;
-
   // Temporal layer 1.
-  input_frame_->set_timestamp(input_frame_->timestamp() +
-                              kTimestampIncrementPerFrame);
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  ExpectFrameWith((picture_id + 1) % (1 << 15), tl0_pic_idx, 1);
-
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 1, tl0_pic_idx + 0, 1);
   // Temporal layer 0.
-  input_frame_->set_timestamp(input_frame_->timestamp() +
-                              kTimestampIncrementPerFrame);
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  ExpectFrameWith((picture_id + 2) % (1 << 15), (tl0_pic_idx + 1) % (1 << 8),
-                  0);
-
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 2, tl0_pic_idx + 1, 0);
   // Temporal layer 1.
-  input_frame_->set_timestamp(input_frame_->timestamp() +
-                              kTimestampIncrementPerFrame);
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  ExpectFrameWith((picture_id + 3) % (1 << 15), (tl0_pic_idx + 1) % (1 << 8),
-                  1);
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 3, tl0_pic_idx + 1, 1);
 
   // Reinit.
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK, encoder_->Release());
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             encoder_->InitEncode(&codec_settings_, kNumCores, kMaxPayloadSize));
 
   // Temporal layer 0.
-  input_frame_->set_timestamp(input_frame_->timestamp() +
-                              kTimestampIncrementPerFrame);
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  ExpectFrameWith((picture_id + 4) % (1 << 15), (tl0_pic_idx + 2) % (1 << 8),
-                  0);
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 4, tl0_pic_idx + 2, 0);
+  // Temporal layer 1.
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 5, tl0_pic_idx + 2, 1);
+  // Temporal layer 0.
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 6, tl0_pic_idx + 3, 0);
+  // Temporal layer 1.
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 7, tl0_pic_idx + 3, 1);
+}
 
-  // Temporal layer 1.
-  input_frame_->set_timestamp(input_frame_->timestamp() +
-                              kTimestampIncrementPerFrame);
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  ExpectFrameWith((picture_id + 5) % (1 << 15), (tl0_pic_idx + 2) % (1 << 8),
-                  1);
+TEST_F(TestVp8Impl, EncodeWithThreeTemporalLayers) {
+  codec_settings_.VP8()->numberOfTemporalLayers = 3;
+  InitEncodeDecode();
 
   // Temporal layer 0.
-  input_frame_->set_timestamp(input_frame_->timestamp() +
-                              kTimestampIncrementPerFrame);
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  ExpectFrameWith((picture_id + 6) % (1 << 15), (tl0_pic_idx + 3) % (1 << 8),
-                  0);
-
+  EncodeFrame();
+  EXPECT_EQ(0, encoded_cb_.codec_specific_info_.codecSpecific.VP8.temporalIdx);
+  int16_t picture_id =
+      encoded_cb_.codec_specific_info_.codecSpecific.VP8.pictureId;
+  int tl0_pic_idx =
+      encoded_cb_.codec_specific_info_.codecSpecific.VP8.tl0PicIdx;
+  // Temporal layer 2.
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 1, tl0_pic_idx + 0, 2);
   // Temporal layer 1.
-  input_frame_->set_timestamp(input_frame_->timestamp() +
-                              kTimestampIncrementPerFrame);
-  EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->Encode(*input_frame_, nullptr, nullptr));
-  ExpectFrameWith((picture_id + 7) % (1 << 15), (tl0_pic_idx + 3) % (1 << 8),
-                  1);
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 2, tl0_pic_idx + 0, 1);
+  // Temporal layer 2.
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 3, tl0_pic_idx + 0, 2);
+  // Temporal layer 0.
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 4, tl0_pic_idx + 1, 0);
+  // Temporal layer 2.
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 5, tl0_pic_idx + 1, 2);
+  // Temporal layer 1.
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 6, tl0_pic_idx + 1, 1);
+  // Temporal layer 2.
+  input_frame_->set_timestamp(input_frame_->timestamp() + kTimestampIncrement);
+  EncodeFrame();
+  ExpectFrameWith(picture_id + 7, tl0_pic_idx + 1, 2);
 }

[brandtr, 2017/08/30 09:08:17]

Might as well add a reinit here, and make this test into
"EncoderWith3TemporalLayersRetainsRtpStateAfterRelease"?

[åsapersson, 2017/08/30 10:53:49]

Done.

 
 TEST_F(TestVp8Impl, ScalingDisabledIfAutomaticResizeOff) {
   codec_settings_.VP8()->frameDroppingOn = true;
   codec_settings_.VP8()->automaticResizeOn = false;
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             encoder_->InitEncode(&codec_settings_, kNumCores, kMaxPayloadSize));
 
   VideoEncoder::ScalingSettings settings = encoder_->GetScalingSettings();
   EXPECT_FALSE(settings.enabled);
 }
@@ skipping 21 matching lines @@
   codec_settings_.VP8()->automaticResizeOn = true;
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
             encoder_->InitEncode(&codec_settings_, kNumCores, kMaxPayloadSize));
 
   VideoEncoder::ScalingSettings settings = encoder_->GetScalingSettings();
   EXPECT_TRUE(settings.enabled);
   EXPECT_EQ(kMinPixelsPerFrame, settings.min_pixels_per_frame);
 }
 
 }  // namespace webrtc