diff --git a/sdk/objc/api/video_codec/RTCWrappedNativeVideoDecoder.mm b/sdk/objc/api/video_codec/RTCWrappedNativeVideoDecoder.mm index 6423c7a8cb..dce479c890 100644 --- a/sdk/objc/api/video_codec/RTCWrappedNativeVideoDecoder.mm +++ b/sdk/objc/api/video_codec/RTCWrappedNativeVideoDecoder.mm @@ -40,12 +40,6 @@ return 0; } -- (NSInteger)startDecodeWithSettings:(RTCVideoEncoderSettings *)settings - numberOfCores:(int)numberOfCores { - RTC_NOTREACHED(); - return 0; -} - - (NSInteger)releaseDecoder { RTC_NOTREACHED(); return 0; diff --git a/sdk/objc/base/RTCVideoDecoder.h b/sdk/objc/base/RTCVideoDecoder.h index 18c6f6b000..8077c698e4 100644 --- a/sdk/objc/base/RTCVideoDecoder.h +++ b/sdk/objc/base/RTCVideoDecoder.h @@ -26,9 +26,7 @@ RTC_OBJC_EXPORT @protocol RTCVideoDecoder - (void)setCallback:(RTCVideoDecoderCallback)callback; -- (NSInteger)startDecodeWithSettings:(RTCVideoEncoderSettings *)settings - numberOfCores:(int)numberOfCores - DEPRECATED_MSG_ATTRIBUTE("use startDecodeWithNumberOfCores: instead"); +- (NSInteger)startDecodeWithNumberOfCores:(int)numberOfCores; - (NSInteger)releaseDecoder; - (NSInteger)decode:(RTCEncodedImage *)encodedImage missingFrames:(BOOL)missingFrames @@ -36,10 +34,6 @@ RTC_OBJC_EXPORT renderTimeMs:(int64_t)renderTimeMs; - (NSString *)implementationName; -// TODO(andersc): Make non-optional when `startDecodeWithSettings:numberOfCores:` is removed. -@optional -- (NSInteger)startDecodeWithNumberOfCores:(int)numberOfCores; - @end NS_ASSUME_NONNULL_END diff --git a/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm b/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm index 69ccc90574..c3342800e0 100644 --- a/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm +++ b/sdk/objc/components/video_codec/RTCVideoDecoderH264.mm @@ -96,11 +96,6 @@ void decompressionOutputCallback(void *decoderRef, return WEBRTC_VIDEO_CODEC_OK; } -- (NSInteger)startDecodeWithSettings:(RTCVideoEncoderSettings *)settings - numberOfCores:(int)numberOfCores { - return WEBRTC_VIDEO_CODEC_OK; -} - - (NSInteger)decode:(RTCEncodedImage *)inputImage missingFrames:(BOOL)missingFrames codecSpecificInfo:(nullable id)info diff --git a/sdk/objc/native/src/objc_video_decoder_factory.mm b/sdk/objc/native/src/objc_video_decoder_factory.mm index c79fb06647..00fac0c260 100644 --- a/sdk/objc/native/src/objc_video_decoder_factory.mm +++ b/sdk/objc/native/src/objc_video_decoder_factory.mm @@ -38,15 +38,7 @@ class ObjCVideoDecoder : public VideoDecoder { : decoder_(decoder), implementation_name_([decoder implementationName].stdString) {} int32_t InitDecode(const VideoCodec *codec_settings, int32_t number_of_cores) override { - if ([decoder_ respondsToSelector:@selector(startDecodeWithNumberOfCores:)]) { - return [decoder_ startDecodeWithNumberOfCores:number_of_cores]; - } else { -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - RTCVideoEncoderSettings *settings = [[RTCVideoEncoderSettings alloc] init]; - return [decoder_ startDecodeWithSettings:settings numberOfCores:number_of_cores]; -#pragma clang diagnostic pop - } + return [decoder_ startDecodeWithNumberOfCores:number_of_cores]; } int32_t Decode(const EncodedImage &input_image,