| commit | 2a1bbc342219db86a908824cd5ce3e71fc706d27 | [log] [tgz] |
|---|---|---|
| author | Anders Carlsson <andersc@webrtc.org> | Wed Apr 04 12:49:43 2018 +0200 |
| committer | Commit Bot <commit-bot@chromium.org> | Wed Apr 04 12:29:30 2018 +0000 |
| tree | 1d6c6a6ac1b628c9efc2c6ed8020177e0bcc0dde | |
| parent | 98ee49d5fb03c6746de92ac4f275d7f4cc61052d [diff] |
ObjC: Deprecate codec settings parameter in startDecode method. 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}
diff --git a/sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.mm b/sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.mm index 7529ebf..79c942a 100644 --- a/sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.mm +++ b/sdk/objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.mm
@@ -35,6 +35,11 @@ RTC_NOTREACHED(); } +- (NSInteger)startDecodeWithNumberOfCores:(int)numberOfCores { + RTC_NOTREACHED(); + return 0; +} + - (NSInteger)startDecodeWithSettings:(RTCVideoEncoderSettings *)settings numberOfCores:(int)numberOfCores { RTC_NOTREACHED();
diff --git a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm index b5b4cc9..8460228 100644 --- a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm +++ b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm
@@ -92,6 +92,10 @@ [self setVideoFormat:nullptr]; } +- (NSInteger)startDecodeWithNumberOfCores:(int)numberOfCores { + return WEBRTC_VIDEO_CODEC_OK; +} + - (NSInteger)startDecodeWithSettings:(RTCVideoEncoderSettings *)settings numberOfCores:(int)numberOfCores { return WEBRTC_VIDEO_CODEC_OK;