commit 355b8d237c4da77361e1687ff570304b01a19469
author Danil Chapovalov <danilchap@webrtc.org> Fri Aug 13 16:50:37 2021 +0200
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 13 16:03:32 2021 +0000
tree aae4c6cc95a667f6dc2252ab3fb1e6b31b262dfa
parent b6bbdeb24d0125b797bbf70898d58ca7b45c2b9c

Use VideoDecoder::Configure interface when setting up decoder

Bug: webrtc:13045
Change-Id: I322ff91d96bab8bb7c40f4dea1c9c2b5c7631635
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/228420
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34756}

modules/video_coding/video_receiver_unittest.cc

diff --git a/modules/video_coding/video_receiver_unittest.cc b/modules/video_coding/video_receiver_unittest.cc
index fcd4f44..d56ed63 100644
--- a/modules/video_coding/video_receiver_unittest.cc
+++ b/modules/video_coding/video_receiver_unittest.cc
@@ -9,12 +9,12 @@
  */
 
 #include "api/test/mock_video_decoder.h"
+#include "api/video_codecs/video_decoder.h"
 #include "modules/video_coding/include/video_coding.h"
 #include "modules/video_coding/timing.h"
 #include "modules/video_coding/video_coding_impl.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"
-#include "test/video_codec_settings.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
@@ -56,9 +56,9 @@
   virtual void SetUp() {
     // Register decoder.
     receiver_.RegisterExternalDecoder(&decoder_, kUnusedPayloadType);
-    webrtc::test::CodecSettings(kVideoCodecVP8, &settings_);
-    EXPECT_EQ(
-        0, receiver_.RegisterReceiveCodec(kUnusedPayloadType, &settings_, 1));
+    VideoDecoder::Settings settings;
+    settings.set_codec_type(kVideoCodecVP8);
+    EXPECT_TRUE(receiver_.RegisterReceiveCodec(kUnusedPayloadType, settings));
 
     // Set protection mode.
     const size_t kMaxNackListSize = 250;
@@ -119,7 +119,6 @@
   }
 
   SimulatedClock clock_;
-  VideoCodec settings_;
   NiceMock<MockVideoDecoder> decoder_;
   NiceMock<MockPacketRequestCallback> packet_request_callback_;
   VCMTiming timing_;