commit ed2b1c954c7fa52cb3a535445ac74c1b99c10f1e
author Anders Carlsson <andersc@webrtc.org> Thu Nov 02 13:15:15 2017 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Nov 06 13:40:27 2017 +0000
tree 3f6d8ba6e07279dba82f5ef048cb03456ecbf2ce
parent 47836b4ebb8a5c71695b5ec07bffd5ee4e3bc2ff

Ignore output callbacks with null parameters in iOS H264 encode.

This can occur if there are callbacks in-flight when the compression
session is destroyed. Has been observed but is rare.

Bug: webrtc:8489
Change-Id: I5d4b35c555f6ff68af48edfcc7acf53395fa86fe
Reviewed-on: https://webrtc-review.googlesource.com/18220
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20561}

sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm

diff --git a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
index 3d4ae71..3eca55b 100644
--- a/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
+++ b/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
@@ -151,10 +151,12 @@
                                OSStatus status,
                                VTEncodeInfoFlags infoFlags,
                                CMSampleBufferRef sampleBuffer) {
-  RTC_CHECK(params);
+  if (!params) {
+    // If there are pending callbacks when the encoder is destroyed, this can happen.
+    return;
+  }
   std::unique_ptr<RTCFrameEncodeParams> encodeParams(
       reinterpret_cast<RTCFrameEncodeParams *>(params));
-  RTC_CHECK(encodeParams->encoder);
   [encodeParams->encoder frameWasEncoded:status
                                    flags:infoFlags
                             sampleBuffer:sampleBuffer