Title: [291078] trunk/Source/WebCore
- Revision
- 291078
- Author
- achristen...@apple.com
- Date
- 2022-03-09 14:38:29 -0800 (Wed, 09 Mar 2022)
Log Message
Fix AppleWin build
https://bugs.webkit.org/show_bug.cgi?id=236131
* platform/VideoFrame.cpp:
(WebCore::VideoFrame::asVideoFrameCV):
* platform/VideoFrame.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (291077 => 291078)
--- trunk/Source/WebCore/ChangeLog 2022-03-09 22:35:36 UTC (rev 291077)
+++ trunk/Source/WebCore/ChangeLog 2022-03-09 22:38:29 UTC (rev 291078)
@@ -5,7 +5,16 @@
* platform/VideoFrame.cpp:
(WebCore::VideoFrame::asVideoFrameCV):
+ * platform/VideoFrame.h:
+2022-03-09 Alex Christensen <achristen...@webkit.org>
+
+ Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=236131
+
+ * platform/VideoFrame.cpp:
+ (WebCore::VideoFrame::asVideoFrameCV):
+
2022-03-09 Antoine Quint <grao...@webkit.org>
[web-animations] dominant-baseline should support discrete animation
Modified: trunk/Source/WebCore/platform/VideoFrame.cpp (291077 => 291078)
--- trunk/Source/WebCore/platform/VideoFrame.cpp 2022-03-09 22:35:36 UTC (rev 291077)
+++ trunk/Source/WebCore/platform/VideoFrame.cpp 2022-03-09 22:38:29 UTC (rev 291078)
@@ -123,20 +123,16 @@
const_cast<VideoRotation&>(m_rotation) = rotation;
}
-#if USE(AVFOUNDATION)
+#if PLATFORM(COCOA)
RefPtr<VideoFrameCV> VideoFrame::asVideoFrameCV()
{
-#if PLATFORM(COCOA)
auto buffer = pixelBuffer();
if (!buffer)
return nullptr;
return VideoFrameCV::create(presentationTime(), videoMirrored(), videoRotation(), buffer);
-#else
- return nullptr;
+}
#endif
-}
-#endif // USE(AVFOUNDATION)
}
Modified: trunk/Source/WebCore/platform/VideoFrame.h (291077 => 291078)
--- trunk/Source/WebCore/platform/VideoFrame.h 2022-03-09 22:35:36 UTC (rev 291077)
+++ trunk/Source/WebCore/platform/VideoFrame.h 2022-03-09 22:38:29 UTC (rev 291078)
@@ -31,11 +31,10 @@
namespace WebCore {
-#if USE(AVFOUNDATION)
+#if USE(AVFOUNDATION) && PLATFORM(COCOA)
class VideoFrameCV;
#endif
-
// A class representing a video frame from a decoder, capture source, or similar.
// FIXME: Currently for implementation purposes inherts from MediaSample until capture code
// stops referring to MediaSample
@@ -55,8 +54,10 @@
virtual bool isLibWebRTC() const { return false; }
#if USE(AVFOUNDATION)
virtual bool isCV() const { return false; }
+#if PLATFORM(COCOA)
WEBCORE_EXPORT virtual RefPtr<VideoFrameCV> asVideoFrameCV();
#endif
+#endif
void initializeCharacteristics(MediaTime presentationTime, bool isMirrored, VideoRotation);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
