Build fix after https://trac.webkit.org/changeset/236070
authoryouenn@apple.com <youenn@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Sep 2018 23:21:49 +0000 (23:21 +0000)
committeryouenn@apple.com <youenn@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 17 Sep 2018 23:21:49 +0000 (23:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=189635
<rdar://problem/44361849>

Unreviewed.
Fix for iOS internal builds.

* Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:
(-[RTCVideoEncoderH264 resetCompressionSessionWithPixelFormat:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@236093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/ThirdParty/libwebrtc/ChangeLog
Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm

index 817b5a2..383c71f 100644 (file)
@@ -1,5 +1,17 @@
 2018-09-17  Youenn Fablet  <youenn@apple.com>
 
+        Build fix after https://trac.webkit.org/changeset/236070
+        https://bugs.webkit.org/show_bug.cgi?id=189635
+        <rdar://problem/44361849>
+
+        Unreviewed.
+        Fix for iOS internal builds.
+
+        * Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm:
+        (-[RTCVideoEncoderH264 resetCompressionSessionWithPixelFormat:]):
+
+2018-09-17  Youenn Fablet  <youenn@apple.com>
+
         Enable VCP for iOS and reenable it for MacOS
         https://bugs.webkit.org/show_bug.cgi?id=189635
         <rdar://problem/43621029>
index 28c391a..ae10956 100644 (file)
@@ -603,13 +603,17 @@ CFStringRef ExtractProfile(webrtc::SdpVideoFormat videoFormat) {
     pixelFormat = nullptr;
   }
   CFDictionaryRef encoderSpecs = nullptr;
-#if (!defined(WEBRTC_IOS) || ENABLE_VCP_ENCODER)
+#if !defined(WEBRTC_IOS)
   auto useHardwareEncoder = webrtc::isH264HardwareEncoderAllowed() ? kCFBooleanTrue : kCFBooleanFalse;
   // Currently hw accl is supported above 360p on mac, below 360p
   // the compression session will be created with hw accl disabled.
   CFTypeRef sessionKeys[] = { kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder, kVTVideoEncoderSpecification_RequireHardwareAcceleratedVideoEncoder, kVTCompressionPropertyKey_RealTime };
   CFTypeRef sessionValues[] = { useHardwareEncoder, useHardwareEncoder, kCFBooleanTrue };
   encoderSpecs = CFDictionaryCreate(kCFAllocatorDefault, sessionKeys, sessionValues, 3, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+#else
+  CFTypeRef sessionKeys[] = { kVTCompressionPropertyKey_RealTime };
+  CFTypeRef sessionValues[] = { kCFBooleanTrue };
+  encoderSpecs = CFDictionaryCreate(kCFAllocatorDefault, sessionKeys, sessionValues, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
 #endif
 
   OSStatus status =