Title: [264517] trunk/Source/ThirdParty/libwebrtc
- Revision
- 264517
- Author
- [email protected]
- Date
- 2020-07-17 09:50:55 -0700 (Fri, 17 Jul 2020)
Log Message
Unreviwed build fix after r265592; rather than remove the dead code causing link errors
instead link against CoreGraphics and UIKit for debug builds; revert the previous build
fix as well.
* Configurations/DebugRelease.xcconfig:
* Source/webrtc/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm:
(-[RTCI420Buffer debugQuickLookObject]):
Modified Paths
Diff
Modified: trunk/Source/ThirdParty/libwebrtc/ChangeLog (264516 => 264517)
--- trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-07-17 16:38:05 UTC (rev 264516)
+++ trunk/Source/ThirdParty/libwebrtc/ChangeLog 2020-07-17 16:50:55 UTC (rev 264517)
@@ -1,3 +1,13 @@
+2020-07-17 Jer Noble <[email protected]>
+
+ Unreviwed build fix after r265592; rather than remove the dead code causing link errors
+ instead link against CoreGraphics and UIKit for debug builds; revert the previous build
+ fix as well.
+
+ * Configurations/DebugRelease.xcconfig:
+ * Source/webrtc/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm:
+ (-[RTCI420Buffer debugQuickLookObject]):
+
2020-07-16 Jer Noble <[email protected]>
Unreviewed build fix after r264492; previously dead code in RTCNativeI420Buffer.mm was
Modified: trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig (264516 => 264517)
--- trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2020-07-17 16:38:05 UTC (rev 264516)
+++ trunk/Source/ThirdParty/libwebrtc/Configurations/DebugRelease.xcconfig 2020-07-17 16:50:55 UTC (rev 264517)
@@ -41,3 +41,6 @@
DEBUG_DEFINES[config=Debug] = $(DEBUG_DEFINES_debug);
GCC_OPTIMIZATION_LEVEL[config=Debug] = $(GCC_OPTIMIZATION_LEVEL_debug);
+OTHER_LDFLAGS[config=Debug][sdk=iphone*] = $(inherited) -framework UIKit -framework CoreGraphics
+OTHER_LDFLAGS[config=Debug][sdk=tv*] = $(inherited) -framework UIKit -framework CoreGraphics
+OTHER_LDFLAGS[config=Debug][sdk=watch*] = $(inherited) -framework UIKit -framework CoreGraphics
Modified: trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm (264516 => 264517)
--- trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm 2020-07-17 16:38:05 UTC (rev 264516)
+++ trunk/Source/ThirdParty/libwebrtc/Source/webrtc/sdk/objc/api/video_frame_buffer/RTCNativeI420Buffer.mm 2020-07-17 16:50:55 UTC (rev 264517)
@@ -109,4 +109,30 @@
return _i420Buffer;
}
+#pragma mark - Debugging
+
+#if !defined(NDEBUG) && defined(WEBRTC_IOS)
+- (id)debugQuickLookObject {
+ UIGraphicsBeginImageContext(CGSizeMake(_i420Buffer->width(), _i420Buffer->height()));
+ CGContextRef c = UIGraphicsGetCurrentContext();
+ uint8_t *ctxData = (uint8_t *)CGBitmapContextGetData(c);
+
+ libyuv::I420ToARGB(_i420Buffer->DataY(),
+ _i420Buffer->StrideY(),
+ _i420Buffer->DataU(),
+ _i420Buffer->StrideU(),
+ _i420Buffer->DataV(),
+ _i420Buffer->StrideV(),
+ ctxData,
+ CGBitmapContextGetBytesPerRow(c),
+ CGBitmapContextGetWidth(c),
+ CGBitmapContextGetHeight(c));
+
+ UIImage *image = UIGraphicsGetImageFromCurrentImageContext();
+ UIGraphicsEndImageContext();
+
+ return image;
+}
+#endif
+
@end
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
