Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(webkit): configure video scale (#2553)

Browse source
This commit is contained in:
Yury Semikhatsky 2020-06-11 19:27:53 -07:00 committed by GitHub
parent 894826dec0
commit bda6203a91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser_patches/webkit/BUILD_NUMBER
View file

@ -1 +1 @@
1279 1280

63
browser_patches/webkit/patches/bootstrap.diff
View file

@ -1280,10 +1280,10 @@ index 0000000000000000000000000000000000000000..dd4c318ec4b9b49ce937266ba899e54f
+} +}
diff --git a/Source/JavaScriptCore/inspector/protocol/Screencast.json b/Source/JavaScriptCore/inspector/protocol/Screencast.json diff --git a/Source/JavaScriptCore/inspector/protocol/Screencast.json b/Source/JavaScriptCore/inspector/protocol/Screencast.json
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..a2ab788ee75f3d4703153882eada4ee8e2701166 index 0000000000000000000000000000000000000000..5da42efd27406d66ad6a2f23e27d79f1512a7a3a
--- /dev/null --- /dev/null
+++ b/Source/JavaScriptCore/inspector/protocol/Screencast.json +++ b/Source/JavaScriptCore/inspector/protocol/Screencast.json
@@ -0,0 +1,52 @@ @@ -0,0 +1,53 @@
+{ +{
+ "domain": "Screencast", + "domain": "Screencast",
+ "availability": ["web"], + "availability": ["web"],
@ -1317,7 +1317,8 @@ index 0000000000000000000000000000000000000000..a2ab788ee75f3d4703153882eada4ee8
+ "parameters": [ + "parameters": [
+ { "name": "file", "type": "string", "description": "Output file location." }, + { "name": "file", "type": "string", "description": "Output file location." },
+ { "name": "width", "type": "integer" }, + { "name": "width", "type": "integer" },
+ { "name": "height", "type": "integer" } + { "name": "height", "type": "integer" },
+ { "name": "scale", "type": "number", "optional": true }
+ ] + ]
+ }, + },
+ { + {
@ -4289,7 +4290,7 @@ index 3bcd0487cfc8766baa01c7804173a15747b47b2d..3b5c230d7e00b9d7e248be8730ab22ab
} // namespace WebCore } // namespace WebCore
diff --git a/Source/WebCore/inspector/agents/InspectorScreencastAgent.cpp b/Source/WebCore/inspector/agents/InspectorScreencastAgent.cpp diff --git a/Source/WebCore/inspector/agents/InspectorScreencastAgent.cpp b/Source/WebCore/inspector/agents/InspectorScreencastAgent.cpp
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..fc70eb56148276a0e3848b68f69799deb8f7e248 index 0000000000000000000000000000000000000000..1b0060aed698b86b6a25c52cb14c1250814dee4e
--- /dev/null --- /dev/null
+++ b/Source/WebCore/inspector/agents/InspectorScreencastAgent.cpp +++ b/Source/WebCore/inspector/agents/InspectorScreencastAgent.cpp
@@ -0,0 +1,160 @@ @@ -0,0 +1,160 @@
@ -4399,7 +4400,7 @@ index 0000000000000000000000000000000000000000..fc70eb56148276a0e3848b68f69799de
+ --m_inflightFrames; + --m_inflightFrames;
+} +}
+ +
+void InspectorScreencastAgent::startVideoRecording(Inspector::ErrorString& errorString, const String&, int, int) +void InspectorScreencastAgent::startVideoRecording(Inspector::ErrorString& errorString, const String&, int, int, const double*)
+{ +{
+ errorString = "Not implemented."_s; + errorString = "Not implemented."_s;
+} +}
@ -4455,7 +4456,7 @@ index 0000000000000000000000000000000000000000..fc70eb56148276a0e3848b68f69799de
+#endif // PLATFORM(WPE) || PLATFORM(WIN) +#endif // PLATFORM(WPE) || PLATFORM(WIN)
diff --git a/Source/WebCore/inspector/agents/InspectorScreencastAgent.h b/Source/WebCore/inspector/agents/InspectorScreencastAgent.h diff --git a/Source/WebCore/inspector/agents/InspectorScreencastAgent.h b/Source/WebCore/inspector/agents/InspectorScreencastAgent.h
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..8c1a662351c8bb406484dd6ec4750de42f07cad2 index 0000000000000000000000000000000000000000..f725430dd38ec528396b8edae12a9a941bb0b835
--- /dev/null --- /dev/null
+++ b/Source/WebCore/inspector/agents/InspectorScreencastAgent.h +++ b/Source/WebCore/inspector/agents/InspectorScreencastAgent.h
@@ -0,0 +1,81 @@ @@ -0,0 +1,81 @@
@ -4520,7 +4521,7 @@ index 0000000000000000000000000000000000000000..8c1a662351c8bb406484dd6ec4750de4
+ void start(Inspector::ErrorString&, const String& format, const int* quality) override; + void start(Inspector::ErrorString&, const String& format, const int* quality) override;
+ void stop(Inspector::ErrorString&) override; + void stop(Inspector::ErrorString&) override;
+ void frameAck(Inspector::ErrorString&) override; + void frameAck(Inspector::ErrorString&) override;
+ void startVideoRecording(Inspector::ErrorString&, const String& file, int width, int height) override; + void startVideoRecording(Inspector::ErrorString&, const String& file, int width, int height, const double* scale) override;
+ void stopVideoRecording(Ref<StopVideoRecordingCallback>&&) override; + void stopVideoRecording(Ref<StopVideoRecordingCallback>&&) override;
+ +
+ void willDisplay(); + void willDisplay();
@ -8782,10 +8783,10 @@ index 59cdfdafab1d85ea3a5aecb3cd2293e6dfb1eb8d..52fe7990b1c18b964ee3cfa9f324e3c2
// The timeout we use when waiting for a DidUpdateGeometry message. // The timeout we use when waiting for a DidUpdateGeometry message.
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..88892d0e1128a23f8f586610691800fc306b2a0d index 0000000000000000000000000000000000000000..d9f9c4b81174f9f0a8ae77cf5163a259ccd58fad
--- /dev/null --- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp +++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.cpp
@@ -0,0 +1,263 @@ @@ -0,0 +1,271 @@
+/* +/*
+ * Copyright (C) 2020 Microsoft Corporation. + * Copyright (C) 2020 Microsoft Corporation.
+ * + *
@ -8928,7 +8929,7 @@ index 0000000000000000000000000000000000000000..88892d0e1128a23f8f586610691800fc
+#endif +#endif
+} +}
+ +
+void InspectorScreencastAgent::startVideoRecording(Inspector::ErrorString& errorString, const String& file, int width, int height) +void InspectorScreencastAgent::startVideoRecording(Inspector::ErrorString& errorString, const String& file, int width, int height, const double* scale)
+{ +{
+#if PLATFORM(GTK) || PLATFORM(WPE) +#if PLATFORM(GTK) || PLATFORM(WPE)
+ if (m_encoder) { + if (m_encoder) {
@ -8940,8 +8941,16 @@ index 0000000000000000000000000000000000000000..88892d0e1128a23f8f586610691800fc
+ errorString = "Invalid size"_s; + errorString = "Invalid size"_s;
+ return; + return;
+ } + }
+ Optional<double> optionalScale;
+ if (scale) {
+ if (*scale <= 0 || *scale > 1) {
+ errorString = "Unsupported scale"_s;
+ return;
+ }
+ +
+ m_encoder = ScreencastEncoder::create(errorString, file, IntSize(width, height)); + optionalScale = *scale;
+ }
+ m_encoder = ScreencastEncoder::create(errorString, file, IntSize(width, height), optionalScale);
+ if (!m_encoder) + if (!m_encoder)
+ return; + return;
+ +
@ -9051,7 +9060,7 @@ index 0000000000000000000000000000000000000000..88892d0e1128a23f8f586610691800fc
+} // namespace WebKit +} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..be0d7aa673210ca4d0c11c7789ee69edd680c2a1 index 0000000000000000000000000000000000000000..9b18c5ff9e18cd1c40df8ccd2daefeb7974e4d74
--- /dev/null --- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h +++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h
@@ -0,0 +1,89 @@ @@ -0,0 +1,89 @@
@ -9118,7 +9127,7 @@ index 0000000000000000000000000000000000000000..be0d7aa673210ca4d0c11c7789ee69ed
+ void start(Inspector::ErrorString&, const String& format, const int* quality) override; + void start(Inspector::ErrorString&, const String& format, const int* quality) override;
+ void stop(Inspector::ErrorString&) override; + void stop(Inspector::ErrorString&) override;
+ void frameAck(Inspector::ErrorString&) override; + void frameAck(Inspector::ErrorString&) override;
+ void startVideoRecording(Inspector::ErrorString&, const String& file, int width, int height) override; + void startVideoRecording(Inspector::ErrorString&, const String& file, int width, int height, const double* scale) override;
+ void stopVideoRecording(Ref<StopVideoRecordingCallback>&&) override; + void stopVideoRecording(Ref<StopVideoRecordingCallback>&&) override;
+ +
+ +
@ -9146,10 +9155,10 @@ index 0000000000000000000000000000000000000000..be0d7aa673210ca4d0c11c7789ee69ed
+} // namespace WebKit +} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..4fe06984b854ec4d36a0b1c7c6ba534d35880c1f index 0000000000000000000000000000000000000000..3fe6f5d5b0bf43f79e452addb8ac21bf3c3bf904
--- /dev/null --- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp +++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.cpp
@@ -0,0 +1,401 @@ @@ -0,0 +1,410 @@
+/* +/*
+ * Copyright (c) 2010, The WebM Project authors. All rights reserved. + * Copyright (c) 2010, The WebM Project authors. All rights reserved.
+ * Copyright (c) 2013 The Chromium Authors. All rights reserved. + * Copyright (c) 2013 The Chromium Authors. All rights reserved.
@ -9434,9 +9443,10 @@ index 0000000000000000000000000000000000000000..4fe06984b854ec4d36a0b1c7c6ba534d
+ std::unique_ptr<vpx_image_t> m_image; + std::unique_ptr<vpx_image_t> m_image;
+}; +};
+ +
+ScreencastEncoder::ScreencastEncoder(std::unique_ptr<VPXCodec>&& vpxCodec, IntSize size) +ScreencastEncoder::ScreencastEncoder(std::unique_ptr<VPXCodec>&& vpxCodec, IntSize size, Optional<double> scale)
+ : m_vpxCodec(WTFMove(vpxCodec)) + : m_vpxCodec(WTFMove(vpxCodec))
+ , m_size(size) + , m_size(size)
+ , m_scale(scale)
+{ +{
+ ASSERT(!size.isZero()); + ASSERT(!size.isZero());
+} +}
@ -9449,7 +9459,7 @@ index 0000000000000000000000000000000000000000..4fe06984b854ec4d36a0b1c7c6ba534d
+static constexpr uint32_t vp9fourcc = 0x30395056; +static constexpr uint32_t vp9fourcc = 0x30395056;
+static constexpr int fps = 30; +static constexpr int fps = 30;
+ +
+RefPtr<ScreencastEncoder> ScreencastEncoder::create(String& errorString, const String& filePath, IntSize size) +RefPtr<ScreencastEncoder> ScreencastEncoder::create(String& errorString, const String& filePath, IntSize size, Optional<double> scale)
+{ +{
+ const uint32_t fourcc = vp8fourcc; + const uint32_t fourcc = vp8fourcc;
+ vpx_codec_iface_t* codec_interface = vpx_codec_vp8_cx(); + vpx_codec_iface_t* codec_interface = vpx_codec_vp8_cx();
@ -9491,7 +9501,7 @@ index 0000000000000000000000000000000000000000..4fe06984b854ec4d36a0b1c7c6ba534d
+ +
+ std::unique_ptr<VPXCodec> vpxCodec(new VPXCodec(fourcc, codec, cfg, file)); + std::unique_ptr<VPXCodec> vpxCodec(new VPXCodec(fourcc, codec, cfg, file));
+ fprintf(stderr, "ScreencastEncoder initialized with: %s\n", vpx_codec_iface_name(codec_interface)); + fprintf(stderr, "ScreencastEncoder initialized with: %s\n", vpx_codec_iface_name(codec_interface));
+ return adoptRef(new ScreencastEncoder(WTFMove(vpxCodec), size)); + return adoptRef(new ScreencastEncoder(WTFMove(vpxCodec), size, scale));
+} +}
+ +
+void ScreencastEncoder::flushLastFrame() +void ScreencastEncoder::flushLastFrame()
@ -9525,6 +9535,14 @@ index 0000000000000000000000000000000000000000..4fe06984b854ec4d36a0b1c7c6ba534d
+ RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, m_size.width(), m_size.height())); + RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, m_size.width(), m_size.height()));
+ { + {
+ RefPtr<cairo_t> cr = adoptRef(cairo_create(surface.get())); + RefPtr<cairo_t> cr = adoptRef(cairo_create(surface.get()));
+
+ // TODO: compare to libyuv scale functions?
+ cairo_matrix_t transform;
+ if (m_scale) {
+ cairo_matrix_init_scale(&transform, *m_scale, *m_scale);
+ cairo_transform(cr.get(), &transform);
+ }
+
+ // Record top left part of the drawing area that fits into the frame. + // Record top left part of the drawing area that fits into the frame.
+ cairo_set_source_surface(cr.get(), drawingAreaSurface, 0, 0); + cairo_set_source_surface(cr.get(), drawingAreaSurface, 0, 0);
+ cairo_paint(cr.get()); + cairo_paint(cr.get());
@ -9553,10 +9571,10 @@ index 0000000000000000000000000000000000000000..4fe06984b854ec4d36a0b1c7c6ba534d
+} // namespace WebKit +} // namespace WebKit
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h diff --git a/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..01993e4925b6bea6741873e503f1fc3b401facee index 0000000000000000000000000000000000000000..0f1209d8e96391d050261dcef4225b30fecc90cd
--- /dev/null --- /dev/null
+++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h +++ b/Source/WebKit/UIProcess/Inspector/Agents/ScreencastEncoder.h
@@ -0,0 +1,61 @@ @@ -0,0 +1,62 @@
+/* +/*
+ * Copyright (C) 2020 Microsoft Corporation. + * Copyright (C) 2020 Microsoft Corporation.
+ * + *
@ -9598,10 +9616,10 @@ index 0000000000000000000000000000000000000000..01993e4925b6bea6741873e503f1fc3b
+ WTF_MAKE_NONCOPYABLE(ScreencastEncoder); + WTF_MAKE_NONCOPYABLE(ScreencastEncoder);
+ WTF_MAKE_FAST_ALLOCATED; + WTF_MAKE_FAST_ALLOCATED;
+public: +public:
+ static RefPtr<ScreencastEncoder> create(String& errorString, const String& filePath, WebCore::IntSize); + static RefPtr<ScreencastEncoder> create(String& errorString, const String& filePath, WebCore::IntSize, Optional<double> scale);
+ +
+ class VPXCodec; + class VPXCodec;
+ ScreencastEncoder(std::unique_ptr<VPXCodec>&&, WebCore::IntSize); + ScreencastEncoder(std::unique_ptr<VPXCodec>&&, WebCore::IntSize, Optional<double> scale);
+ ~ScreencastEncoder(); + ~ScreencastEncoder();
+ +
+ void encodeFrame(cairo_surface_t*, WebCore::IntSize); + void encodeFrame(cairo_surface_t*, WebCore::IntSize);
@ -9612,6 +9630,7 @@ index 0000000000000000000000000000000000000000..01993e4925b6bea6741873e503f1fc3b
+ +
+ std::unique_ptr<VPXCodec> m_vpxCodec; + std::unique_ptr<VPXCodec> m_vpxCodec;
+ const WebCore::IntSize m_size; + const WebCore::IntSize m_size;
+ Optional<double> m_scale;
+ MonotonicTime m_lastFrameTimestamp; + MonotonicTime m_lastFrameTimestamp;
+ class VPXFrame; + class VPXFrame;
+ std::unique_ptr<VPXFrame> m_lastFrame; + std::unique_ptr<VPXFrame> m_lastFrame;