Implement Create instead of CreateVideoDecoder in remaining test VideoDecoderFactories to allow Create become virtual in the VideoDecoderFactory interface Bug: webrtc:15791 Change-Id: Id0d793164906473fa37346fa9177248ad8ef29bb Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/340341 Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Auto-Submit: Danil Chapovalov <danilchap@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#41791}
diff --git a/media/engine/fake_video_codec_factory.cc b/media/engine/fake_video_codec_factory.cc index 6f4f796..c202fb2 100644 --- a/media/engine/fake_video_codec_factory.cc +++ b/media/engine/fake_video_codec_factory.cc
@@ -61,7 +61,8 @@ 1, SdpVideoFormat(kFakeCodecFactoryCodecName)); } -std::unique_ptr<VideoDecoder> FakeVideoDecoderFactory::CreateVideoDecoder( +std::unique_ptr<VideoDecoder> FakeVideoDecoderFactory::Create( + const Environment& env, const SdpVideoFormat& format) { return std::make_unique<test::FakeDecoder>(); }
diff --git a/media/engine/fake_video_codec_factory.h b/media/engine/fake_video_codec_factory.h index 4a99120..9494d9c 100644 --- a/media/engine/fake_video_codec_factory.h +++ b/media/engine/fake_video_codec_factory.h
@@ -44,8 +44,8 @@ // VideoDecoderFactory implementation std::vector<SdpVideoFormat> GetSupportedFormats() const override; - std::unique_ptr<VideoDecoder> CreateVideoDecoder( - const SdpVideoFormat& format) override; + std::unique_ptr<VideoDecoder> Create(const Environment& env, + const SdpVideoFormat& format) override; }; } // namespace webrtc
diff --git a/media/engine/fake_webrtc_video_engine.cc b/media/engine/fake_webrtc_video_engine.cc index cf40247..a545dd2 100644 --- a/media/engine/fake_webrtc_video_engine.cc +++ b/media/engine/fake_webrtc_video_engine.cc
@@ -95,8 +95,8 @@ return formats; } -std::unique_ptr<webrtc::VideoDecoder> -FakeWebRtcVideoDecoderFactory::CreateVideoDecoder( +std::unique_ptr<webrtc::VideoDecoder> FakeWebRtcVideoDecoderFactory::Create( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) { if (format.IsCodecInList(supported_codec_formats_)) { num_created_decoders_++;
diff --git a/media/engine/fake_webrtc_video_engine.h b/media/engine/fake_webrtc_video_engine.h index 3db4225..f397820 100644 --- a/media/engine/fake_webrtc_video_engine.h +++ b/media/engine/fake_webrtc_video_engine.h
@@ -63,7 +63,8 @@ FakeWebRtcVideoDecoderFactory(); std::vector<webrtc::SdpVideoFormat> GetSupportedFormats() const override; - std::unique_ptr<webrtc::VideoDecoder> CreateVideoDecoder( + std::unique_ptr<webrtc::VideoDecoder> Create( + const webrtc::Environment& env, const webrtc::SdpVideoFormat& format) override; void DecoderDestroyed(FakeWebRtcVideoDecoder* decoder);
diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc index 4bb795c..426471c 100644 --- a/media/engine/webrtc_video_engine_unittest.cc +++ b/media/engine/webrtc_video_engine_unittest.cc
@@ -1421,7 +1421,7 @@ // Expect no decoder to be created at this point. The decoder will only be // created if we receive payload data. - EXPECT_CALL(*decoder_factory, CreateVideoDecoder(format)).Times(0); + EXPECT_CALL(*decoder_factory, Create).Times(0); // Create a call. webrtc::GlobalSimulatedTimeController time_controller(
diff --git a/test/peer_scenario/peer_scenario_client.cc b/test/peer_scenario/peer_scenario_client.cc index 3ba4fdb..2b84d15 100644 --- a/test/peer_scenario/peer_scenario_client.cc +++ b/test/peer_scenario/peer_scenario_client.cc
@@ -195,8 +195,8 @@ std::vector<SdpVideoFormat> GetSupportedFormats() const override { return {SdpVideoFormat("VP8")}; } - std::unique_ptr<VideoDecoder> CreateVideoDecoder( - const SdpVideoFormat& format) override { + std::unique_ptr<VideoDecoder> Create(const Environment& env, + const SdpVideoFormat& format) override { return std::make_unique<FakeDecoder>(); } };
diff --git a/test/video_decoder_proxy_factory.h b/test/video_decoder_proxy_factory.h index f2b318e..2a22f66 100644 --- a/test/video_decoder_proxy_factory.h +++ b/test/video_decoder_proxy_factory.h
@@ -34,8 +34,8 @@ return {}; } - std::unique_ptr<VideoDecoder> CreateVideoDecoder( - const SdpVideoFormat& format) override { + std::unique_ptr<VideoDecoder> Create(const Environment& env, + const SdpVideoFormat& format) override { return std::make_unique<DecoderProxy>(decoder_); }