Gstreamer plugin running in wayland with surfman 0.2 #25334

asajeffrey · 2019-12-18T20:07:59Z

Tidying up the gstreamer plugin. The plugin now:

uses surfman 0.2
runs in wayland (but can't render WebGL content yet)
gets its GL configuration from gstreamer
uses GLsync if needed

./mach build -d does not report any errors
./mach test-tidy does not report any errors
These changes fix #24843
These changes do not require tests because


        Miscellaneous gstreamer plugin fixes

highfive · 2019-12-18T20:08:06Z

Warning

These commits modify unsafe code. Please review it carefully!

asajeffrey · 2019-12-18T20:10:03Z

Oops, should have squashed before submitting the PR!

asajeffrey · 2019-12-18T20:11:39Z

r? @Manishearth


        Make wayland happier by sharing a Connection between servo and gstreamer


        Updated README

jdm · 2019-12-20T17:21:21Z

ports/gstplugin/Cargo.toml

@@ -31,9 +31,9 @@ libservo = {path = "../../components/servo"}
 servo-media = {git = "https://github.com/servo/media"}
 sparkle = "0.1"
 # NOTE: the sm-angle-default feature only enables angle on windows, not other platforms!


Remove this note now that it no longer applies?

jdm · 2019-12-20T17:21:21Z

ports/gstplugin/servowebsrc.rs

+        let sync_meta =
+            unsafe { gst_buffer_get_meta(gst_buffer.0, sync_meta_type) } as *mut GstGLSyncMeta;
+        if !sync_meta.is_null() {
+            unsafe { gst_gl_sync_meta_set_sync_point(sync_meta, gl_memory.mem.context) };


We should be able to use:

https://slomo.pages.freedesktop.org/rustdocs/gstreamer/gstreamer/buffer/struct.BufferRef.html#method.get_meta

https://slomo.pages.freedesktop.org/rustdocs/gstreamer/gstreamer_gl/struct.GLSyncMeta.html

https://slomo.pages.freedesktop.org/rustdocs/gstreamer/gstreamer_gl/struct.GLSyncMeta.html#method.set_sync_point


        Removed outdated comment


        Use gstreamer_gl metadata

asajeffrey

Fixed.

asajeffrey · 2019-12-20T18:14:38Z

ports/gstplugin/Cargo.toml

@@ -31,9 +31,9 @@ libservo = {path = "../../components/servo"}
 servo-media = {git = "https://github.com/servo/media"}
 sparkle = "0.1"
 # NOTE: the sm-angle-default feature only enables angle on windows, not other platforms!


asajeffrey · 2019-12-20T18:14:38Z

ports/gstplugin/servowebsrc.rs

+        let sync_meta =
+            unsafe { gst_buffer_get_meta(gst_buffer.0, sync_meta_type) } as *mut GstGLSyncMeta;
+        if !sync_meta.is_null() {
+            unsafe { gst_gl_sync_meta_set_sync_point(sync_meta, gl_memory.mem.context) };


jdm · 2019-12-20T18:16:38Z

@bors-servo r+

bors-servo · 2019-12-20T18:16:39Z

📌 Commit 14e0c6a has been approved by jdm

bors-servo · 2019-12-20T18:16:44Z

⌛ Testing commit 14e0c6a with merge b59003f...


        Auto merge of #25334 - asajeffrey:gstplugins-misc-tidying-up, r=jdm

Gstreamer plugin running in wayland with surfman 0.2  Tidying up the gstreamer plugin. The plugin now: * uses surfman 0.2 * runs in wayland (but can't render WebGL content yet) * gets its GL configuration from gstreamer * uses GLsync if needed ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #24843 - [X] These changes do not require tests because

bors-servo · 2019-12-20T19:04:25Z

💔 Test failed - status-taskcluster

jdm · 2019-12-20T19:21:02Z

Windows plugin build is broken:

error[E0412]: cannot find type `Device` in this scope
   --> ports\gstplugin\servowebsrc.rs:103:17
    |
103 | type Context = <Device as DeviceAPI>::Context;
    |                 ^^^^^^ not found in this scope
    |
help: possible candidates are found in other modules, you can import them into scope
    |
5   | use gstreamer::Device;
    |
5   | use surfman::Device;
    |
5   | use surfman::device::Device;
    |
5   | use surfman::platform::default::device::Device;
    |
      and 1 other candidate

error[E0412]: cannot find type `Device` in this scope
   --> ports\gstplugin\servowebsrc.rs:104:20
    |
104 | type Connection = <Device as DeviceAPI>::Connection;
    |                    ^^^^^^ not found in this scope
    |
help: possible candidates are found in other modules, you can import them into scope
    |
5   | use gstreamer::Device;
    |
5   | use surfman::Device;
    |
5   | use surfman::device::Device;
    |
5   | use surfman::platform::default::device::Device;
    |
      and 1 other candidate

error[E0412]: cannot find type `Device` in this scope
   --> ports\gstplugin\servowebsrc.rs:105:23
    |
105 | type NativeContext = <Device as DeviceAPI>::NativeContext;
    |                       ^^^^^^ not found in this scope
    |
help: possible candidates are found in other modules, you can import them into scope
    |
5   | use gstreamer::Device;
    |
5   | use surfman::Device;
    |
5   | use surfman::device::Device;
    |
5   | use surfman::platform::default::device::Device;
    |
      and 1 other candidate

error[E0412]: cannot find type `Device` in this scope
   --> ports\gstplugin\servowebsrc.rs:138:13
    |
138 |     device: Device,
    |             ^^^^^^ not found in this scope
    |
help: possible candidates are found in other modules, you can import them into scope
    |
5   | use gstreamer::Device;
    |
5   | use surfman::Device;
    |
5   | use surfman::device::Device;
    |
5   | use surfman::platform::default::device::Device;
    |
      and 1 other candidate

error[E0412]: cannot find type `Device` in this scope
   --> ports\gstplugin\servowebsrc.rs:140:27
    |
140 |     swap_chain: SwapChain<Device>,
    |                           ^^^^^^ not found in this scope
    |
help: possible candidates are found in other modules, you can import them into scope
    |
5   | use gstreamer::Device;
    |
5   | use surfman::Device;
    |
5   | use surfman::device::Device;
    |
5   | use surfman::platform::default::device::Device;
    |
      and 1 other candidate

error[E0412]: cannot find type `Device` in this scope
   --> ports\gstplugin\servowebsrc.rs:168:35
    |
168 |     GetSwapChain(Sender<SwapChain<Device>>),
    |                                   ^^^^^^ not found in this scope
    |
help: possible candidates are found in other modules, you can import them into scope
    |
5   | use gstreamer::Device;
    |
5   | use surfman::Device;
    |
5   | use surfman::device::Device;
    |
5   | use surfman::platform::default::device::Device;
    |
      and 1 other candidate

error[E0412]: cannot find type `Device` in this scope
   --> ports\gstplugin\servowebsrc.rs:182:27
    |
182 |     swap_chain: SwapChain<Device>,
    |                           ^^^^^^ not found in this scope
    |
help: possible candidates are found in other modules, you can import them into scope
    |
5   | use gstreamer::Device;
    |
5   | use surfman::Device;
    |
5   | use surfman::device::Device;
    |
5   | use surfman::platform::default::device::Device;
    |
      and 1 other candidate

error[E0412]: cannot find type `Device` in this scope
   --> ports\gstplugin\servowebsrc.rs:188:13
    |
188 |     device: Device,
    |             ^^^^^^ not found in this scope
    |
help: possible candidates are found in other modules, you can import them into scope
    |
5   | use gstreamer::Device;
    |
5   | use surfman::Device;
    |
5   | use surfman::device::Device;
    |
5   | use surfman::platform::default::device::Device;
    |
      and 1 other candidate

error[E0412]: cannot find type `Device` in this scope
   --> ports\gstplugin\servowebsrc.rs:292:27
    |
292 |     swap_chain: SwapChain<Device>,
    |                           ^^^^^^ not found in this scope
    |
help: possible candidates are found in other modules, you can import them into scope
    |
5   | use gstreamer::Device;
    |
5   | use surfman::Device;
    |
5   | use surfman::device::Device;
    |
5   | use surfman::platform::default::device::Device;
    |
      and 1 other candidate

error[E0282]: type annotations needed for `std::sync::Mutex<std::option::Option<T>>`
   --> ports\gstplugin\servowebsrc.rs:497:37
    |
497 |         let connection = Mutex::new(None);
    |             ----------              ^^^^ cannot infer type for `T`
    |             |
    |             consider giving `connection` the explicit type `std::sync::Mutex<std::option::Option<T>>`, where the type parameter `T` is specified

error: unused import: `surfman_chains_api::SwapChainAPI`
  --> ports\gstplugin\servowebsrc.rs:95:5
   |
95 | use surfman_chains_api::SwapChainAPI;
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `-D unused-imports` implied by `-D warnings`

error: aborting due to 11 previous errors


        Disable the gstreamer plugin build for windows

asajeffrey · 2019-12-20T19:37:52Z

@bors-servo r=jdm

bors-servo · 2019-12-20T19:37:55Z

📌 Commit b5943f5 has been approved by jdm

bors-servo · 2019-12-20T19:38:01Z

⌛ Testing commit b5943f5 with merge b638f56...


        Auto merge of #25334 - asajeffrey:gstplugins-misc-tidying-up, r=jdm

Gstreamer plugin running in wayland with surfman 0.2  Tidying up the gstreamer plugin. The plugin now: * uses surfman 0.2 * runs in wayland (but can't render WebGL content yet) * gets its GL configuration from gstreamer * uses GLsync if needed ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #24843 - [X] These changes do not require tests because

asajeffrey · 2019-12-20T19:38:44Z

Filed #25353, windows support will have to wait for me having a windows machine to test on.

bors-servo · 2019-12-20T20:45:51Z

💔 Test failed - status-taskcluster

jdm · 2019-12-20T21:09:13Z

@bors-servo retry

bors-servo · 2019-12-20T21:09:18Z

⌛ Testing commit b5943f5 with merge 62899c0...


        Auto merge of #25334 - asajeffrey:gstplugins-misc-tidying-up, r=jdm

Gstreamer plugin running in wayland with surfman 0.2  Tidying up the gstreamer plugin. The plugin now: * uses surfman 0.2 * runs in wayland (but can't render WebGL content yet) * gets its GL configuration from gstreamer * uses GLsync if needed ---  - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes fix #24843 - [X] These changes do not require tests because

bors-servo · 2019-12-20T21:19:12Z

☀️ Test successful - status-taskcluster
Approved by: jdm
Pushing 62899c0 to master...

Miscellaneous gstreamer plugin fixes

Loading status checks…

aca438a

highfive assigned SimonSapin Dec 18, 2019

highfive added the S-awaiting-review label Dec 18, 2019

asajeffrey force-pushed the asajeffrey:gstplugins-misc-tidying-up branch from 228858f to aca438a Dec 18, 2019

asajeffrey added the P-gst-plugin label Dec 18, 2019

highfive assigned Manishearth and unassigned SimonSapin Dec 18, 2019

asajeffrey added 2 commits Dec 19, 2019

Make wayland happier by sharing a Connection between servo and gstreamer

Loading status checks…

9f52997

Updated README

Loading status checks…

da3fdf8

asajeffrey changed the title ~~Gstplugins misc tidying up~~ Gstreamer plugin running in wayland with surfman 0.2 Dec 19, 2019

asajeffrey mentioned this pull request Dec 19, 2019

Gstreamer plugin space leak #25120

Closed

jdm requested changes Dec 20, 2019

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Dec 20, 2019

asajeffrey added 2 commits Dec 20, 2019

Removed outdated comment

03ec414

Use gstreamer_gl metadata

Loading status checks…

14e0c6a

highfive added S-awaiting-review and removed S-needs-code-changes labels Dec 20, 2019

asajeffrey reviewed Dec 20, 2019

View changes

highfive assigned jdm and unassigned Manishearth Dec 20, 2019

highfive added S-awaiting-merge and removed S-awaiting-review labels Dec 20, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Dec 20, 2019

Disable the gstreamer plugin build for windows

Loading status checks…

b5943f5

highfive added S-awaiting-review and removed S-tests-failed labels Dec 20, 2019

highfive added S-awaiting-merge and removed S-awaiting-review labels Dec 20, 2019

highfive added S-tests-failed and removed S-awaiting-merge labels Dec 20, 2019

highfive added S-awaiting-merge and removed S-tests-failed labels Dec 20, 2019

bors-servo merged commit b5943f5 into servo:master Dec 20, 2019
2 checks passed

2 checks passed

Community-TC (pull_request) TaskGroup: success
Details

homu Test successful
Details

highfive removed the S-awaiting-merge label Dec 20, 2019

servo / servo

Gstreamer plugin running in wayland with surfman 0.2 #25334

Gstreamer plugin running in wayland with surfman 0.2 #25334

asajeffrey commented Dec 18, 2019 •

edited

highfive commented Dec 18, 2019

asajeffrey commented Dec 18, 2019

asajeffrey commented Dec 18, 2019

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

asajeffrey left a comment

This comment has been minimized.

This comment has been minimized.

jdm commented Dec 20, 2019

bors-servo commented Dec 20, 2019

bors-servo commented Dec 20, 2019

bors-servo commented Dec 20, 2019

jdm commented Dec 20, 2019

asajeffrey commented Dec 20, 2019

bors-servo commented Dec 20, 2019

bors-servo commented Dec 20, 2019

asajeffrey commented Dec 20, 2019

bors-servo commented Dec 20, 2019

jdm commented Dec 20, 2019

bors-servo commented Dec 20, 2019

bors-servo commented Dec 20, 2019

servo / servo

Join GitHub today

Gstreamer plugin running in wayland with surfman 0.2 #25334

Gstreamer plugin running in wayland with surfman 0.2 #25334

Conversation

asajeffrey commented Dec 18, 2019 • edited

highfive commented Dec 18, 2019

asajeffrey commented Dec 18, 2019

asajeffrey commented Dec 18, 2019

This comment has been minimized.

jdm Dec 20, 2019

This comment has been minimized.

asajeffrey Dec 20, 2019

This comment has been minimized.

jdm Dec 20, 2019

This comment has been minimized.

asajeffrey Dec 20, 2019

asajeffrey left a comment

This comment has been minimized.

asajeffrey Dec 20, 2019

This comment has been minimized.

asajeffrey Dec 20, 2019

jdm commented Dec 20, 2019

bors-servo commented Dec 20, 2019

bors-servo commented Dec 20, 2019

bors-servo commented Dec 20, 2019

jdm commented Dec 20, 2019

asajeffrey commented Dec 20, 2019

bors-servo commented Dec 20, 2019

bors-servo commented Dec 20, 2019

asajeffrey commented Dec 20, 2019

bors-servo commented Dec 20, 2019

jdm commented Dec 20, 2019

bors-servo commented Dec 20, 2019

bors-servo commented Dec 20, 2019

asajeffrey commented Dec 18, 2019 •

edited