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

ObjC: Deprecate codec settings parameter in startDecode method.

Browse Source 
This parameter is being removed from the C++ API, remove it from the
ObjC API also. It was never used for anything by the H264 decoder.

Bug: webrtc:9107
Change-Id: I5222eac932a4e7d4129d803f8126b5e8d0b027b6
Reviewed-on: https://webrtc-review.googlesource.com/66740
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22730}
This commit is contained in:
Anders Carlsson
2018-04-04 12:49:43 +02:00
committed by Commit Bot
parent 98ee49d5fb
commit 2a1bbc3422
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,9 +37,15 @@ class ObjCVideoDecoder : public VideoDecoder {
: decoder_(decoder), implementation_name_([decoder implementationName].stdString) {}
int32_t InitDecode(const VideoCodec *codec_settings, int32_t number_of_cores) {
RTCVideoEncoderSettings *settings =
[[RTCVideoEncoderSettings alloc] initWithNativeVideoCodec:codec_settings];
return [decoder_ startDecodeWithSettings:settings numberOfCores:number_of_cores];
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
}
}
int32_t Decode(const EncodedImage &input_image,