admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated decode:...fragmentationHeader:... objc method.

Browse Source 
Next step after cl https://webrtc-review.googlesource.com/72442.

Bug: webrtc:6471
Change-Id: I2cbb8cef37dbb0762bf5ef57f68d690a21f341de
Reviewed-on: https://webrtc-review.googlesource.com/73820
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23143}
This commit is contained in:
Niels Möller 2018-05-02 15:49:51 +02:00 committed by Commit Bot
parent 3b69b196e4
commit c56ff11984
5 changed files with 6 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.mm
View File

@ -59,15 +59,6 @@
return 0;
}
- (NSInteger)decode:(RTCEncodedImage *)encodedImage
missingFrames:(BOOL)missingFrames
fragmentationHeader:(RTCRtpFragmentationHeader *)fragmentationHeader
codecSpecificInfo:(nullable id<RTCCodecSpecificInfo>)info
renderTimeMs:(int64_t)renderTimeMs {
RTC_NOTREACHED();
return 0;
}
- (NSString *)implementationName {
RTC_NOTREACHED();
return nil;

11
sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm
View File

@ -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<RTCCodecSpecificInfo>)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<RTCCodecSpecificInfo>)info

11
sdk/objc/Framework/Headers/WebRTC/RTCVideoCodec.h
View File

@ -173,23 +173,14 @@ RTC_EXPORT
- (NSInteger)releaseDecoder;
- (NSInteger)decode:(RTCEncodedImage *)encodedImage
missingFrames:(BOOL)missingFrames
fragmentationHeader:(RTCRtpFragmentationHeader *)fragmentationHeader
codecSpecificInfo:(nullable id<RTCCodecSpecificInfo>)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<RTCCodecSpecificInfo>)info
renderTimeMs:(int64_t)renderTimeMs;
@end
NS_ASSUME_NONNULL_END

24
sdk/objc/Framework/Native/src/objc_video_decoder_factory.mm
View File

@ -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) {

9
sdk/objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm
View File

@ -24,15 +24,6 @@
id<RTCVideoDecoderFactory> 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]