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}
This commit is contained in:
Danil Chapovalov
2021-08-13 16:50:37 +02:00
committed by WebRTC LUCI CQ
parent b6bbdeb24d
commit 355b8d237c
16 changed files with 94 additions and 144 deletions

View File

@ -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 @@ class TestVideoReceiver : public ::testing::Test {
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 @@ class TestVideoReceiver : public ::testing::Test {
}
SimulatedClock clock_;
VideoCodec settings_;
NiceMock<MockVideoDecoder> decoder_;
NiceMock<MockPacketRequestCallback> packet_request_callback_;
VCMTiming timing_;