Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

The gstreamer plugin should resize when it's presented with frames to fill, not when caps are set

Browse source
This commit is contained in:
Alan Jeffrey 2019-11-25 15:03:58 -06:00
parent 49841b8ce9
commit 2356f3ea6b
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ports/gstplugin/servosrc.rs
View file

@ -485,11 +485,6 @@ impl BaseSrcImpl for ServoSrc {
fn set_caps(&self, _src: &BaseSrc, outcaps: &Caps) -> Result<(), LoggableError> { fn set_caps(&self, _src: &BaseSrc, outcaps: &Caps) -> Result<(), LoggableError> {
let info = VideoInfo::from_caps(outcaps) let info = VideoInfo::from_caps(outcaps)
.ok_or_else(|| gst_loggable_error!(CATEGORY, "Failed to get video info"))?; .ok_or_else(|| gst_loggable_error!(CATEGORY, "Failed to get video info"))?;
let size = Size2D::new(info.width(), info.height()).to_i32();
debug!("Setting servosrc buffer size to {}", size,);
self.sender
.send(ServoSrcMsg::Resize(size))
.map_err(|_| gst_loggable_error!(CATEGORY, "Failed to send video info"))?;
*self.info.lock().unwrap() = Some(info); *self.info.lock().unwrap() = Some(info);
Ok(()) Ok(())
} }
@ -534,6 +529,7 @@ impl BaseSrcImpl for ServoSrc {
})?; })?;
let height = frame.height() as i32; let height = frame.height() as i32;
let width = frame.width() as i32; let width = frame.width() as i32;
let size = Size2D::new(width, height);
let format = frame.format(); let format = frame.format();
debug!( debug!(
"Filling servosrc buffer {}x{} {:?} {:?}", "Filling servosrc buffer {}x{} {:?} {:?}",
@ -545,6 +541,13 @@ impl BaseSrcImpl for ServoSrc {
let mut gfx = gfx.borrow_mut(); let mut gfx = gfx.borrow_mut();
let gfx = &mut *gfx; let gfx = &mut *gfx;
if let Some(surface) = self.swap_chain.take_surface() { if let Some(surface) = self.swap_chain.take_surface() {
let surface_size = Size2D::from_untyped(gfx.device.surface_info(&surface).size);
if size != surface_size {
// If we're being asked to fill frames that are a different size than servo is providing,
// ask it to change size.
let _ = self.sender.send(ServoSrcMsg::Resize(size));
}
gfx.device.make_context_current(&gfx.context).unwrap(); gfx.device.make_context_current(&gfx.context).unwrap();
debug_assert_eq!( debug_assert_eq!(
( (