Title: [288931] trunk/Source/WebCore
- Revision
- 288931
- Author
- [email protected]
- Date
- 2022-02-01 17:32:09 -0800 (Tue, 01 Feb 2022)
Log Message
Fix build error with VIDEO=ON
https://bugs.webkit.org/show_bug.cgi?id=235982
Reviewed by Eric Carlson.
* Modules/WebGPU/GPUExternalTextureDescriptor.idl:
* Modules/webcodecs/VideoColorPrimaries.idl:
* Modules/webcodecs/VideoMatrixCoefficients.idl:
* Modules/webcodecs/VideoTransferCharacteristics.idl:
* platform/MediaSample.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (288930 => 288931)
--- trunk/Source/WebCore/ChangeLog 2022-02-02 01:18:04 UTC (rev 288930)
+++ trunk/Source/WebCore/ChangeLog 2022-02-02 01:32:09 UTC (rev 288931)
@@ -1,3 +1,16 @@
+2022-02-01 Pablo Saavedra <[email protected]>
+
+ Fix build error with VIDEO=ON
+ https://bugs.webkit.org/show_bug.cgi?id=235982
+
+ Reviewed by Eric Carlson.
+
+ * Modules/WebGPU/GPUExternalTextureDescriptor.idl:
+ * Modules/webcodecs/VideoColorPrimaries.idl:
+ * Modules/webcodecs/VideoMatrixCoefficients.idl:
+ * Modules/webcodecs/VideoTransferCharacteristics.idl:
+ * platform/MediaSample.h:
+
2022-02-01 Ben Nham <[email protected]>
Forward messages from NetworkProcess to webpushd
Modified: trunk/Source/WebCore/Modules/WebGPU/GPUExternalTextureDescriptor.idl (288930 => 288931)
--- trunk/Source/WebCore/Modules/WebGPU/GPUExternalTextureDescriptor.idl 2022-02-02 01:18:04 UTC (rev 288930)
+++ trunk/Source/WebCore/Modules/WebGPU/GPUExternalTextureDescriptor.idl 2022-02-02 01:32:09 UTC (rev 288931)
@@ -29,6 +29,8 @@
EnabledBySetting=WebGPU
]
dictionary GPUExternalTextureDescriptor : GPUObjectDescriptorBase {
+#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
required HTMLVideoElement source;
+#endif
GPUPredefinedColorSpace colorSpace = "srgb";
};
Modified: trunk/Source/WebCore/Modules/webcodecs/VideoColorPrimaries.idl (288930 => 288931)
--- trunk/Source/WebCore/Modules/webcodecs/VideoColorPrimaries.idl 2022-02-02 01:18:04 UTC (rev 288930)
+++ trunk/Source/WebCore/Modules/webcodecs/VideoColorPrimaries.idl 2022-02-02 01:32:09 UTC (rev 288931)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-enum VideoColorPrimaries {
+[Conditional=VIDEO] enum VideoColorPrimaries {
"bt709",
"bt470bg",
"smpte170m"
Modified: trunk/Source/WebCore/Modules/webcodecs/VideoMatrixCoefficients.idl (288930 => 288931)
--- trunk/Source/WebCore/Modules/webcodecs/VideoMatrixCoefficients.idl 2022-02-02 01:18:04 UTC (rev 288930)
+++ trunk/Source/WebCore/Modules/webcodecs/VideoMatrixCoefficients.idl 2022-02-02 01:32:09 UTC (rev 288931)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-enum VideoMatrixCoefficients {
+[Conditional=VIDEO] enum VideoMatrixCoefficients {
"rgb",
"bt709",
"bt470bg",
Modified: trunk/Source/WebCore/Modules/webcodecs/VideoTransferCharacteristics.idl (288930 => 288931)
--- trunk/Source/WebCore/Modules/webcodecs/VideoTransferCharacteristics.idl 2022-02-02 01:18:04 UTC (rev 288930)
+++ trunk/Source/WebCore/Modules/webcodecs/VideoTransferCharacteristics.idl 2022-02-02 01:32:09 UTC (rev 288931)
@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-enum VideoTransferCharacteristics {
+[Conditional=VIDEO] enum VideoTransferCharacteristics {
"bt709",
"smpte170m",
"iec61966-2-1"
Modified: trunk/Source/WebCore/platform/MediaSample.h (288930 => 288931)
--- trunk/Source/WebCore/platform/MediaSample.h 2022-02-02 01:18:04 UTC (rev 288930)
+++ trunk/Source/WebCore/platform/MediaSample.h 2022-02-02 01:32:09 UTC (rev 288931)
@@ -107,7 +107,9 @@
virtual VideoRotation videoRotation() const { return VideoRotation::None; }
virtual bool videoMirrored() const { return false; }
virtual uint32_t videoPixelFormat() const { return 0; }
+#if defined(ENABLE_VIDEO) && ENABLE_VIDEO
virtual std::optional<MediaSampleVideoFrame> videoFrame() const { return std::nullopt; };
+#endif
bool isSync() const { return flags() & IsSync; }
bool isNonDisplaying() const { return flags() & IsNonDisplaying; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
