Enable video frames as OES textures

This patch parametrizes WR to handle OES textures if the incoming frame wraps one. It requires the update of servo-media package and the according WR parametrization.
servo · Sep 10, 2019 · c6df003 · c6df003
1 parent 6ed204d
commit c6df003
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
@@ -214,13 +214,19 @@ impl FrameRenderer for MediaFrameRenderer {
                 *height = frame.get_height();
 
                 let image_data = if frame.is_gl_texture() && self.player_id.is_some() {
+                    let texture_target = if frame.is_external_oes() {
+                        TextureTarget::External
+                    } else {
+                        TextureTarget::Default
+                    };
+
                     self.current_frame_holder
                         .get_or_insert_with(|| FrameHolder::new(frame.clone()))
                         .set(frame);
                     ImageData::External(ExternalImageData {
                         id: ExternalImageId(self.player_id.unwrap()),
                         channel_index: 0,
-                        image_type: ExternalImageType::TextureHandle(TextureTarget::Default),
+                        image_type: ExternalImageType::TextureHandle(texture_target),
                     })
                 } else {
                     ImageData::Raw(frame.get_data())
@@ -232,11 +238,17 @@ impl FrameRenderer for MediaFrameRenderer {
                 self.current_frame = Some((image_key, frame.get_width(), frame.get_height()));
 
                 let image_data = if frame.is_gl_texture() && self.player_id.is_some() {
+                    let texture_target = if frame.is_external_oes() {
+                        TextureTarget::External
+                    } else {
+                        TextureTarget::Default
+                    };
+
                     self.current_frame_holder = Some(FrameHolder::new(frame));
                     ImageData::External(ExternalImageData {
                         id: ExternalImageId(self.player_id.unwrap()),
                         channel_index: 0,
-                        image_type: ExternalImageType::TextureHandle(TextureTarget::Default),
+                        image_type: ExternalImageType::TextureHandle(texture_target),
                     })
                 } else {
                     ImageData::Raw(frame.get_data())