zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate RTCRtpFragmentationHeader argument for objc decoders.

Browse Source 
Bug: webrtc:6471
Change-Id: Id542360c470ed0ea13b7e963f11bcd50d52c1d43
Reviewed-on: https://webrtc-review.googlesource.com/72442
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23036}
This commit is contained in:
Niels Möller
2018-04-26 09:54:25 +02:00
committed by Commit Bot
parent 530a55fc86
commit c199fae89f
5 changed files with 56 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,8 +55,6 @@ class ObjCVideoDecoder : public VideoDecoder {
int64_t render_time_ms = -1) {
RTCEncodedImage *encodedImage =
[[RTCEncodedImage alloc] initWithNativeEncodedImage:input_image];
RTCRtpFragmentationHeader *header =
[[RTCRtpFragmentationHeader alloc] initWithNativeFragmentationHeader:fragmentation];
// webrtc::CodecSpecificInfo only handles a hard coded list of codecs
id<RTCCodecSpecificInfo> rtcCodecSpecificInfo = nil;
@ -69,11 +67,24 @@ class ObjCVideoDecoder : public VideoDecoder {
}
}
return [decoder_ decode:encodedImage
missingFrames:missing_frames
fragmentationHeader:header
codecSpecificInfo:rtcCodecSpecificInfo
renderTimeMs:render_time_ms];
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
}
}
int32_t RegisterDecodeCompleteCallback(DecodedImageCallback *callback) {