From 4dfe7ea5afa4cbfde1bf0e5579aec362ea1a4a09 Mon Sep 17 00:00:00 2001
From: Danil Chapovalov <danilchap@webrtc.org>
Date: Thu, 4 Apr 2024 15:22:17 +0200
Subject: [PATCH] Delete legacy VideoEncoderFactory::CreateVideoEncoder

Bug: webrtc:15860
Change-Id: I892aeba67a4ea3be6d6551ff2dc88faaca0c7bd9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/342940
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42033}
---
 api/test/mock_video_encoder_factory.h    |  4 ----
 api/video_codecs/video_encoder_factory.h | 19 +++----------------
 2 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/api/test/mock_video_encoder_factory.h b/api/test/mock_video_encoder_factory.h
index f9a393eab7..beeba29d8a 100644
--- a/api/test/mock_video_encoder_factory.h
+++ b/api/test/mock_video_encoder_factory.h
@@ -34,10 +34,6 @@ class MockVideoEncoderFactory : public webrtc::VideoEncoderFactory {
               Create,
               (const Environment&, const SdpVideoFormat&),
               (override));
-  MOCK_METHOD(std::unique_ptr<VideoEncoder>,
-              CreateVideoEncoder,
-              (const SdpVideoFormat&),
-              (override));
 
   MOCK_METHOD(void, Die, ());
 };
diff --git a/api/video_codecs/video_encoder_factory.h b/api/video_codecs/video_encoder_factory.h
index fa043f5296..d6e7ff93c5 100644
--- a/api/video_codecs/video_encoder_factory.h
+++ b/api/video_codecs/video_encoder_factory.h
@@ -21,7 +21,6 @@
 #include "api/video/render_resolution.h"
 #include "api/video_codecs/sdp_video_format.h"
 #include "api/video_codecs/video_encoder.h"
-#include "rtc_base/checks.h"
 
 namespace webrtc {
 
@@ -97,21 +96,9 @@ class VideoEncoderFactory {
   }
 
   // Creates a VideoEncoder for the specified format.
-  virtual std::unique_ptr<VideoEncoder> Create(const Environment& env,
-                                               const SdpVideoFormat& format) {
-    return CreateVideoEncoder(format);
-  }
-
-  // Deprecated in favor of the `Create` above.
-  // TODO: bugs.webrtc.org/15860 - Make private when all callers are updated
-  // to use Create function above. Delete when all derived classes implement
-  // `Create` instead of this function.
-  virtual std::unique_ptr<VideoEncoder> CreateVideoEncoder(
-      const SdpVideoFormat& format) {
-    // Newer code shouldn't call this function,
-    // Older code should implement it in derived classes.
-    RTC_CHECK_NOTREACHED();
-  }
+  virtual std::unique_ptr<VideoEncoder> Create(
+      const Environment& env,
+      const SdpVideoFormat& format) = 0;
 
   // This method creates a EncoderSelector to use for a VideoSendStream.
   // (and hence should probably been called CreateEncoderSelector()).