mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-12-01 14:01:32 +00:00
Code Issues Projects Releases Wiki Activity

0.11: Fix memory issue building a Sample with an info Structure

Browse source 
This is a workaround to get the fix from PR #113 on branch 0.11 without
breaking the API.
This commit is contained in:
François Laignel 2018-06-12 00:02:04 +02:00 committed by Sebastian Dröge
parent f9d7c57905
commit d20bceb68f
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gstreamer/src/sample.rs
View file

@ -40,13 +40,13 @@ impl GstRc<SampleRef> {
) -> Self {
assert_initialized_main_thread!();
unsafe {
let info = info.map(|i| i.as_ptr()).unwrap_or(ptr::null());
let info = info.map(|i| ffi::gst_structure_copy(i.as_ptr())).unwrap_or(ptr::null_mut());
from_glib_full(ffi::gst_sample_new(
buffer.to_glib_none().0,
caps.to_glib_none().0,
mut_override(segment.to_glib_none().0),
mut_override(info),
info,
))
}
}
@ -122,3 +122,28 @@ impl fmt::Debug for SampleRef {
unsafe impl Sync for SampleRef {}
unsafe impl Send for SampleRef {}
#[cfg(test)]
mod tests {
#[test]
fn test_sample_new_with_info() {
use GenericFormattedValue;
use Sample;
use Structure;
::init().unwrap();
let info = Structure::builder("sample.info")
.field("f3", &123i32)
.build();
let sample = Sample::new::<GenericFormattedValue>(
None,
None,
None,
Some(info.as_ref()),
);
assert!(sample.get_info().is_some());
}
}