diff --git a/api/test/mock_video_decoder_factory.h b/api/test/mock_video_decoder_factory.h index 48d96ea58b..f661ea3654 100644 --- a/api/test/mock_video_decoder_factory.h +++ b/api/test/mock_video_decoder_factory.h @@ -34,10 +34,6 @@ class MockVideoDecoderFactory : public VideoDecoderFactory { Create, (const Environment&, const SdpVideoFormat&), (override)); - MOCK_METHOD(std::unique_ptr, - CreateVideoDecoder, - (const SdpVideoFormat&), - (override)); MOCK_METHOD(void, Die, ()); }; } // namespace webrtc diff --git a/api/video_codecs/video_decoder_factory.cc b/api/video_codecs/video_decoder_factory.cc index 60fe92bf38..20e9fffa67 100644 --- a/api/video_codecs/video_decoder_factory.cc +++ b/api/video_codecs/video_decoder_factory.cc @@ -10,11 +10,7 @@ #include "api/video_codecs/video_decoder_factory.h" -#include - #include "api/video_codecs/sdp_video_format.h" -#include "api/video_codecs/video_decoder.h" -#include "rtc_base/checks.h" namespace webrtc { @@ -28,18 +24,4 @@ VideoDecoderFactory::CodecSupport VideoDecoderFactory::QueryCodecSupport( format.IsCodecInList(GetSupportedFormats())}; } -std::unique_ptr VideoDecoderFactory::Create( - const Environment& env, - const SdpVideoFormat& format) { - return CreateVideoDecoder(format); -} - -std::unique_ptr VideoDecoderFactory::CreateVideoDecoder( - const SdpVideoFormat& format) { - // Newer code shouldn't call this function, - // Older code should implement it in derived classes. - RTC_CHECK_NOTREACHED(); - return nullptr; -} - } // namespace webrtc diff --git a/api/video_codecs/video_decoder_factory.h b/api/video_codecs/video_decoder_factory.h index 92a2697ca5..89433e03f7 100644 --- a/api/video_codecs/video_decoder_factory.h +++ b/api/video_codecs/video_decoder_factory.h @@ -50,16 +50,9 @@ class RTC_EXPORT VideoDecoderFactory { bool reference_scaling) const; // Creates a VideoDecoder for the specified `format`. - // TODO: bugs.webrtc.org/15791 - Make pure virtual when implemented in all - // derived classes. - virtual std::unique_ptr Create(const Environment& env, - const SdpVideoFormat& format); - - private: - // TODO: bugs.webrtc.org/15791 - Delete when all derived classes implement - // `Create`. - virtual std::unique_ptr CreateVideoDecoder( - const SdpVideoFormat& format); + virtual std::unique_ptr Create( + const Environment& env, + const SdpVideoFormat& format) = 0; }; } // namespace webrtc