diff --git a/media/engine/fake_video_codec_factory.cc b/media/engine/fake_video_codec_factory.cc index 6f4f796b16..c202fb22c2 100644 --- a/media/engine/fake_video_codec_factory.cc +++ b/media/engine/fake_video_codec_factory.cc @@ -61,7 +61,8 @@ std::vector FakeVideoDecoderFactory::GetSupportedFormats() 1, SdpVideoFormat(kFakeCodecFactoryCodecName)); } -std::unique_ptr FakeVideoDecoderFactory::CreateVideoDecoder( +std::unique_ptr FakeVideoDecoderFactory::Create( + const Environment& env, const SdpVideoFormat& format) { return std::make_unique(); } diff --git a/media/engine/fake_video_codec_factory.h b/media/engine/fake_video_codec_factory.h index 4a99120467..9494d9c19c 100644 --- a/media/engine/fake_video_codec_factory.h +++ b/media/engine/fake_video_codec_factory.h @@ -44,8 +44,8 @@ class RTC_EXPORT FakeVideoDecoderFactory : public VideoDecoderFactory { // VideoDecoderFactory implementation std::vector GetSupportedFormats() const override; - std::unique_ptr CreateVideoDecoder( - const SdpVideoFormat& format) override; + std::unique_ptr 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 cf402478a0..a545dd2476 100644 --- a/media/engine/fake_webrtc_video_engine.cc +++ b/media/engine/fake_webrtc_video_engine.cc @@ -95,8 +95,8 @@ FakeWebRtcVideoDecoderFactory::GetSupportedFormats() const { return formats; } -std::unique_ptr -FakeWebRtcVideoDecoderFactory::CreateVideoDecoder( +std::unique_ptr 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 3db4225ced..f397820e1c 100644 --- a/media/engine/fake_webrtc_video_engine.h +++ b/media/engine/fake_webrtc_video_engine.h @@ -63,7 +63,8 @@ class FakeWebRtcVideoDecoderFactory : public webrtc::VideoDecoderFactory { FakeWebRtcVideoDecoderFactory(); std::vector GetSupportedFormats() const override; - std::unique_ptr CreateVideoDecoder( + std::unique_ptr 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 4bb795c1c1..426471c43e 100644 --- a/media/engine/webrtc_video_engine_unittest.cc +++ b/media/engine/webrtc_video_engine_unittest.cc @@ -1421,7 +1421,7 @@ TEST(WebRtcVideoEngineNewVideoCodecFactoryTest, Vp8) { // 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 3ba4fdb677..2b84d1598d 100644 --- a/test/peer_scenario/peer_scenario_client.cc +++ b/test/peer_scenario/peer_scenario_client.cc @@ -195,8 +195,8 @@ class FakeVideoDecoderFactory : public VideoDecoderFactory { std::vector GetSupportedFormats() const override { return {SdpVideoFormat("VP8")}; } - std::unique_ptr CreateVideoDecoder( - const SdpVideoFormat& format) override { + std::unique_ptr Create(const Environment& env, + const SdpVideoFormat& format) override { return std::make_unique(); } }; diff --git a/test/video_decoder_proxy_factory.h b/test/video_decoder_proxy_factory.h index f2b318eadf..2a22f66f2d 100644 --- a/test/video_decoder_proxy_factory.h +++ b/test/video_decoder_proxy_factory.h @@ -34,8 +34,8 @@ class VideoDecoderProxyFactory final : public VideoDecoderFactory { return {}; } - std::unique_ptr CreateVideoDecoder( - const SdpVideoFormat& format) override { + std::unique_ptr Create(const Environment& env, + const SdpVideoFormat& format) override { return std::make_unique(decoder_); }