diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.mm index c0eea3ed28..2d4d45e378 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.mm @@ -59,15 +59,6 @@ return 0; } -- (NSInteger)decode:(RTCEncodedImage *)encodedImage - missingFrames:(BOOL)missingFrames - fragmentationHeader:(RTCRtpFragmentationHeader *)fragmentationHeader - codecSpecificInfo:(nullable id)info - renderTimeMs:(int64_t)renderTimeMs { - RTC_NOTREACHED(); - return 0; -} - - (NSString *)implementationName { RTC_NOTREACHED(); return nil; diff --git a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm index c39a309ca8..73b2fb70f4 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm +++ b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm @@ -101,17 +101,6 @@ void decompressionOutputCallback(void *decoderRef, return WEBRTC_VIDEO_CODEC_OK; } -- (NSInteger)decode:(RTCEncodedImage *)encodedImage - missingFrames:(BOOL)missingFrames - fragmentationHeader:(RTCRtpFragmentationHeader *)fragmentationHeader - codecSpecificInfo:(nullable id)info - renderTimeMs:(int64_t)renderTimeMs { - return [self decode:encodedImage - missingFrames:missingFrames - codecSpecificInfo:info - renderTimeMs:renderTimeMs]; -} - - (NSInteger)decode:(RTCEncodedImage *)inputImage missingFrames:(BOOL)missingFrames codecSpecificInfo:(nullable id)info diff --git a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h index 063963d2e4..c0d464e068 100644 --- a/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h +++ b/sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h @@ -173,23 +173,14 @@ RTC_EXPORT - (NSInteger)releaseDecoder; - (NSInteger)decode:(RTCEncodedImage *)encodedImage missingFrames:(BOOL)missingFrames - fragmentationHeader:(RTCRtpFragmentationHeader *)fragmentationHeader codecSpecificInfo:(nullable id)info - renderTimeMs:(int64_t)renderTimeMs - DEPRECATED_MSG_ATTRIBUTE("use decode:missingFrames:codecSpecificInfo:renderTimeMs: instead"); + renderTimeMs:(int64_t)renderTimeMs; - (NSString *)implementationName; // TODO(andersc): Make non-optional when `startDecodeWithSettings:numberOfCores:` is removed. @optional - (NSInteger)startDecodeWithNumberOfCores:(int)numberOfCores; -// TODO(andersc): Make non-optional when `decode:...fragmentationHeader:...` is removed. -@optional -- (NSInteger)decode:(RTCEncodedImage *)encodedImage - missingFrames:(BOOL)missingFrames - codecSpecificInfo:(nullable id)info - renderTimeMs:(int64_t)renderTimeMs; - @end NS_ASSUME_NONNULL_END diff --git a/sdk/objc/Framework/Native/src/objc_video_decoder_factory.mm b/sdk/objc/Framework/Native/src/objc_video_decoder_factory.mm index 3d7869f56e..333dda1d26 100644 --- a/sdk/objc/Framework/Native/src/objc_video_decoder_factory.mm +++ b/sdk/objc/Framework/Native/src/objc_video_decoder_factory.mm @@ -50,7 +50,7 @@ class ObjCVideoDecoder : public VideoDecoder { int32_t Decode(const EncodedImage &input_image, bool missing_frames, - const RTPFragmentationHeader *fragmentation, + const RTPFragmentationHeader * /* fragmentation */, const CodecSpecificInfo *codec_specific_info = NULL, int64_t render_time_ms = -1) { RTCEncodedImage *encodedImage = @@ -67,24 +67,10 @@ class ObjCVideoDecoder : public VideoDecoder { } } - if ([decoder_ respondsToSelector:@selector - (decode:missingFrames:codecSpecificInfo:renderTimeMs:)]) { - return [decoder_ decode:encodedImage - missingFrames:missing_frames - codecSpecificInfo:rtcCodecSpecificInfo - renderTimeMs:render_time_ms]; - } else { - RTCRtpFragmentationHeader *header = - [[RTCRtpFragmentationHeader alloc] initWithNativeFragmentationHeader:fragmentation]; -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - return [decoder_ decode:encodedImage - missingFrames:missing_frames - fragmentationHeader:header - codecSpecificInfo:rtcCodecSpecificInfo - renderTimeMs:render_time_ms]; -#pragma clang diagnostic pop - } + return [decoder_ decode:encodedImage + missingFrames:missing_frames + codecSpecificInfo:rtcCodecSpecificInfo + renderTimeMs:render_time_ms]; } int32_t RegisterDecodeCompleteCallback(DecodedImageCallback *callback) { diff --git a/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm b/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm index b002ed26ac..9eb54c61c2 100644 --- a/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm +++ b/sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm @@ -24,15 +24,6 @@ id CreateDecoderFactoryReturning(int return_code) { id decoderMock = OCMProtocolMock(@protocol(RTCVideoDecoder)); OCMStub([decoderMock startDecodeWithNumberOfCores:1]).andReturn(return_code); -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wdeprecated-declarations" - OCMStub([decoderMock decode:[OCMArg any] - missingFrames:NO - fragmentationHeader:[OCMArg any] - codecSpecificInfo:[OCMArg any] - renderTimeMs:0]) - .andReturn(return_code); -#pragma clang diagnostic pop OCMStub([decoderMock decode:[OCMArg any] missingFrames:NO codecSpecificInfo:[OCMArg any]