From bf20cf8a30a4ad923e3fbcc127873eb5e5e4b05a Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Thu, 22 Feb 2024 16:47:54 +0100
Subject: [PATCH] Implement Create instead of CreateVideoDecoder in remaining
 test VideoDecoderFactories
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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}
---
 media/engine/fake_video_codec_factory.cc     | 3 ++-
 media/engine/fake_video_codec_factory.h      | 4 ++--
 media/engine/fake_webrtc_video_engine.cc     | 4 ++--
 media/engine/fake_webrtc_video_engine.h      | 3 ++-
 media/engine/webrtc_video_engine_unittest.cc | 2 +-
 test/peer_scenario/peer_scenario_client.cc   | 4 ++--
 test/video_decoder_proxy_factory.h           | 4 ++--
 7 files changed, 13 insertions(+), 11 deletions(-)

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<SdpVideoFormat> FakeVideoDecoderFactory::GetSupportedFormats()
       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 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<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 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<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 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<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 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<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 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<VideoDecoder> CreateVideoDecoder(
-      const SdpVideoFormat& format) override {
+  std::unique_ptr<VideoDecoder> Create(const Environment& env,
+                                       const SdpVideoFormat& format) override {
     return std::make_unique<DecoderProxy>(decoder_);
   }