mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-06-02 21:39:23 +00:00
Code Issues Projects Releases Wiki Activity

lewton: Use gst_audio_decoder_error!() macro instead of the hard gst_element_error_macro!()

Browse source 
This allows for some decoding errors to happen.
This commit is contained in:
Sebastian Dröge 2019-09-15 11:47:27 +03:00
parent f2264b8a1e
commit 3af5552e10
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
gst-plugin-lewton/src/lewtondec.rs
View file

@ -11,9 +11,9 @@ use glib::subclass;
use glib::subclass::prelude::*;
use gst;
use gst::subclass::prelude::*;
use gst_audio;
use gst_audio::prelude::*;
use gst_audio::subclass::prelude::*;
use gstreamer_audio as gst_audio;
use atomic_refcell::AtomicRefCell;
@ -401,21 +401,25 @@ impl LewtonDec {
let audio_info = state.audio_info.as_ref().unwrap();
// Decode the input packet
let decoded = lewton::audio::read_audio_packet_generic::<
let decoded = match lewton::audio::read_audio_packet_generic::<
lewton::samples::InterleavedSamples<f32>,
>(&headerset.0, &headerset.2, indata, &mut state.pwr)
.map_err(|err| {
gst_element_error!(
element,
gst::StreamError::Decode,
["Failed to decode packet: {:?}", err]
);
gst::FlowError::Error
})?;
{
Ok(decoded) => decoded,
Err(err) => {
return gst_audio_decoder_error!(
element,
1,
gst::StreamError::Decode,
["Failed to decode packet: {:?}", err]
);
}
};
if decoded.channel_count != audio_info.channels() as usize {
gst_element_error!(
return gst_audio_decoder_error!(
element,
1,
gst::StreamError::Decode,
[
"Channel count mismatch (got {}, expected {})",
@ -423,7 +427,6 @@ impl LewtonDec {
audio_info.channels()
]
);
return Err(gst::FlowError::Error);
}
let sample_count = decoded.samples.len() / audio_info.channels() as usize;

2
gst-plugin-lewton/src/lib.rs
View file

@ -12,6 +12,8 @@
extern crate glib;
#[macro_use]
extern crate gstreamer as gst;
#[macro_use]
extern crate gstreamer_audio as gst_audio;
mod lewtondec;