Attachment 349956 Details for Bug 189635 – iOS internal build fix

[patch] iOS internal build fix

bug-189635-20180917154344.patch (text/plain), 2.59 KB, created by youenn fablet on 2018-09-17 15:43:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2018-09-17 15:43:45 PDT

Size: 2.59 KB

patch

obsolete

>Subversion Revision: 236088
>diff --git a/Source/ThirdParty/libwebrtc/ChangeLog b/Source/ThirdParty/libwebrtc/ChangeLog
>index 817b5a25e1bb3d818eba6dc54ef72b1de065dc3a..383c71fc204a2adabd2e53c166b155fd61a6dab2 100644
>--- a/Source/ThirdParty/libwebrtc/ChangeLog
>+++ b/Source/ThirdParty/libwebrtc/ChangeLog
>@@ -1,3 +1,15 @@
>+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
>diff --git a/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm b/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
>index 28c391a795ccab59f97ddad1299365f38c6839e0..ae109567546455b8fab592ad2e001bd2b6de821d 100644
>--- a/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
>+++ b/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm
>@@ -603,13 +603,17 @@ - (int)resetCompressionSessionWithPixelFormat:(OSType)framePixelFormat {
>     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 =

Actions: View | Formatted Diff | Diff

Attachments on bug 189635: 349822 | 349827 | 349831 | 349840 | 349843 | 349846 | 349847 | 349865 | 349893 | 349907 | 349956