chris/iced_video_player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19 from mtkennerly/bugfix/stop-pipeline-on-error

Browse source 
Stop pipeline on error
This commit is contained in:
jazzfool 2024-12-05 20:57:30 +11:00 • committed by GitHub
commit d5e28bf017
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/video.rs
View file

@ -240,24 +240,33 @@ impl Video {
static NEXT_ID: AtomicU64 = AtomicU64::new(0); static NEXT_ID: AtomicU64 = AtomicU64::new(0);
let id = NEXT_ID.fetch_add(1, Ordering::SeqCst); let id = NEXT_ID.fetch_add(1, Ordering::SeqCst);
// We need to ensure we stop the pipeline if we hit an error,
// or else there may be audio left playing in the background.
macro_rules! cleanup {
($expr:expr) => {
$expr.map_err(|e| {
let _ = pipeline.set_state(gst::State::Null);
e
})
};
}
let pad = video_sink.pads().first().cloned().unwrap(); let pad = video_sink.pads().first().cloned().unwrap();
pipeline.set_state(gst::State::Playing)?; cleanup!(pipeline.set_state(gst::State::Playing))?;
// wait for up to 5 seconds until the decoder gets the source capabilities // wait for up to 5 seconds until the decoder gets the source capabilities
pipeline.state(gst::ClockTime::from_seconds(5)).0?; cleanup!(pipeline.state(gst::ClockTime::from_seconds(5)).0)?;
// extract resolution and framerate // extract resolution and framerate
// TODO(jazzfool): maybe we want to extract some other information too? // TODO(jazzfool): maybe we want to extract some other information too?
let caps = pad.current_caps().ok_or(Error::Caps)?; let caps = cleanup!(pad.current_caps().ok_or(Error::Caps))?;
let s = caps.structure(0).ok_or(Error::Caps)?; let s = cleanup!(caps.structure(0).ok_or(Error::Caps))?;
let width = s.get::<i32>("width").map_err(|_| Error::Caps)?; let width = cleanup!(s.get::<i32>("width").map_err(|_| Error::Caps))?;
let height = s.get::<i32>("height").map_err(|_| Error::Caps)?; let height = cleanup!(s.get::<i32>("height").map_err(|_| Error::Caps))?;
// resolution should be mod4 // resolution should be mod4
let width = ((width + 4 - 1) / 4) * 4; let width = ((width + 4 - 1) / 4) * 4;
let framerate = s let framerate = cleanup!(s.get::<gst::Fraction>("framerate").map_err(|_| Error::Caps))?;
.get::<gst::Fraction>("framerate")
.map_err(|_| Error::Caps)?;
let framerate = framerate.numer() as f64 / framerate.denom() as f64; let framerate = framerate.numer() as f64 / framerate.denom() as f64;
if framerate.is_nan() if framerate.is_nan()
@ -265,6 +274,7 @@ impl Video {
|| framerate < 0.0 || framerate < 0.0
|| framerate.abs() < f64::EPSILON || framerate.abs() < f64::EPSILON
{ {
let _ = pipeline.set_state(gst::State::Null);
return Err(Error::Framerate(framerate)); return Err(Error::Framerate(framerate));
} }