Title: [236093] trunk/Source/ThirdParty/libwebrtc
- Revision
- 236093
- Author
- [email protected]
- Date
- 2018-09-17 16:21:49 -0700 (Mon, 17 Sep 2018)
Log Message
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:]):
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (236092 => 236093)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2018-09-17 23:00:54 UTC (rev 236092)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2018-09-17 23:21:49 UTC (rev 236093)
@@ -1,5 +1,17 @@
2018-09-17 Youenn Fablet <[email protected]>
+ 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 <[email protected]>
+
Enable VCP for iOS and reenable it for MacOS
https://bugs.webkit.org/show_bug.cgi?id=189635
<rdar://problem/43621029>
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm (236092 => 236093)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm 2018-09-17 23:00:54 UTC (rev 236092)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm 2018-09-17 23:21:49 UTC (rev 236093)
@@ -603,7 +603,7 @@
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.
@@ -610,6 +610,10 @@
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 =
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
