| commit | 2ac2739d06662b5e667290c7e7eebe8fead3aeb8 | [log] [tgz] |
|---|---|---|
| author | Anders Carlsson <andersc@webrtc.org> | Mon Sep 03 14:17:03 2018 +0200 |
| committer | Commit Bot <commit-bot@chromium.org> | Wed Sep 05 08:51:12 2018 +0000 |
| tree | ca1dfe4c2032fad6db896b77f68f4b70f01d895e | |
| parent | 55d5ef0048444ae064ee4f97e040daa78411e00c [diff] [blame] |
Scaling settings nullability in Obj-C SDK. This method is allowed to return nil but was not annotated as such. Bug: webrtc:8560 Change-Id: If54aa94d6ff83b7bdb87b526244616e2627a8999 Reviewed-on: https://webrtc-review.googlesource.com/97380 Reviewed-by: Peter Hanspers <peterhanspers@webrtc.org> Commit-Queue: Anders Carlsson <andersc@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24568}
diff --git a/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm b/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm index 6cd56de..16ad1ff 100644 --- a/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm +++ b/sdk/objc/components/video_codec/RTCVideoEncoderH264.mm
@@ -753,7 +753,7 @@ _bitrateAdjuster->Update(frame.buffer.length); } -- (RTCVideoEncoderQpThresholds *)scalingSettings { +- (nullable RTCVideoEncoderQpThresholds *)scalingSettings { return [[RTCVideoEncoderQpThresholds alloc] initWithThresholdsLow:kLowH264QpThreshold high:kHighH264QpThreshold]; }