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, - 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 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 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 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()).