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-11-26 21:41:03 +00:00
Code Issues Projects Releases Wiki Activity

lewton: Don't copy decoded samples if no channel reordering is needed

Browse source
This commit is contained in:
Sebastian Dröge 2020-01-30 10:43:39 +02:00 committed by Sebastian Dröge
parent 87f2c3b025
commit a43ad8f2dd
1 changed files with 42 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -418,33 +418,32 @@ impl LewtonDec {
return element.finish_frame(None, 1);
}
let mut outbuf = element
.allocate_output_buffer(sample_count as usize * audio_info.bpf() as usize)
.map_err(|_| {
gst_element_error!(
element,
gst::StreamError::Decode,
["Failed to allocate output buffer"]
);
gst::FlowError::Error
})?;
let outbuf = if let Some(ref reorder_map) = state.reorder_map {
let mut outbuf = element
.allocate_output_buffer(sample_count as usize * audio_info.bpf() as usize)
.map_err(|_| {
gst_element_error!(
element,
gst::StreamError::Decode,
["Failed to allocate output buffer"]
);
gst::FlowError::Error
})?;
{
// And copy the decoded data into our output buffer while reordering the channels to the
// GStreamer channel order
let outbuf = outbuf.get_mut().unwrap();
let mut outmap = outbuf.map_writable().map_err(|_| {
gst_element_error!(
element,
gst::StreamError::Decode,
["Failed to map output buffer writable"]
);
gst::FlowError::Error
})?;
// And copy the decoded data into our output buffer, if needed
// while reordering the channels to the GStreamer channel order
{
let outbuf = outbuf.get_mut().unwrap();
let mut outmap = outbuf.map_writable().map_err(|_| {
gst_element_error!(
element,
gst::StreamError::Decode,
["Failed to map output buffer writable"]
);
gst::FlowError::Error
})?;
let outdata = outmap.as_mut_slice_of::<f32>().unwrap();
let channels = audio_info.channels() as usize;
if let Some(ref reorder_map) = state.reorder_map {
let outdata = outmap.as_mut_slice_of::<f32>().unwrap();
let channels = audio_info.channels() as usize;
assert!(reorder_map.len() >= channels);
assert!(reorder_map[..channels].iter().all(|c| *c < channels));
@ -456,10 +455,24 @@ impl LewtonDec {
output[reorder_map[c]] = *s;
}
}
} else {
outdata.copy_from_slice(&decoded.samples);
}
}
outbuf
} else {
struct CastVec(Vec<f32>);
impl AsRef<[u8]> for CastVec {
fn as_ref(&self) -> &[u8] {
self.0.as_byte_slice()
}
}
impl AsMut<[u8]> for CastVec {
fn as_mut(&mut self) -> &mut [u8] {
self.0.as_mut_byte_slice()
}
}
gst::Buffer::from_mut_slice(CastVec(decoded.samples))
};
element.finish_frame(Some(outbuf), 1)
}