Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

get_image_pixels() implementation for video element #24233

Merged
merged 3 commits into from Oct 5, 2019
Merged
Changes from 1 commit
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Next

Always hold current frame

Regardless if it contains raw data or a gl texture.

It is required to hold current frame because it can be used for
webgl's get_image_pixels
  • Loading branch information
ceyusa committed Oct 4, 2019
commit bc07154e05f5666b3a8c0e7d1e4a92bd395423a3
@@ -193,12 +193,12 @@ impl FrameRenderer for MediaFrameRenderer {
ImageData::Raw(frame.get_data()),
&webrender_api::DirtyRect::All,
);
} else if self.player_id.is_some() {
self.current_frame_holder
.get_or_insert_with(|| FrameHolder::new(frame.clone()))
.set(frame);
}

self.current_frame_holder
.get_or_insert_with(|| FrameHolder::new(frame.clone()))
.set(frame);

if let Some(old_image_key) = self.old_frame.take() {
txn.delete_image(old_image_key);
}
@@ -220,9 +220,6 @@ impl FrameRenderer for MediaFrameRenderer {
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,
@@ -231,6 +228,11 @@ impl FrameRenderer for MediaFrameRenderer {
} else {
ImageData::Raw(frame.get_data())
};

self.current_frame_holder
.get_or_insert_with(|| FrameHolder::new(frame.clone()))
.set(frame);

txn.add_image(new_image_key, descriptor, image_data, None);
},
None => {
@@ -244,7 +246,6 @@ impl FrameRenderer for MediaFrameRenderer {
TextureTarget::Default
};

self.current_frame_holder = Some(FrameHolder::new(frame));
ImageData::External(ExternalImageData {
id: ExternalImageId(self.player_id.unwrap()),
channel_index: 0,
@@ -253,6 +254,9 @@ impl FrameRenderer for MediaFrameRenderer {
} else {
ImageData::Raw(frame.get_data())
};

self.current_frame_holder = Some(FrameHolder::new(frame));

txn.add_image(image_key, descriptor, image_data, None);
},
}
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.