mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-01-15 05:35:30 +00:00
Code Issues Projects Releases Wiki Activity

FIX: Fixed NDI frames memory leaks

Browse source
This commit is contained in:
o-reo 2019-03-01 11:24:54 +01:00
parent a407346053
commit 761d7ae7ef
3 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/ndiaudiosrc.rs
View file

@ -258,24 +258,18 @@ impl ObjectSubclass for NdiAudioSrc {
let audio_frame: NDIlib_audio_frame_v2_t = Default::default(); let audio_frame: NDIlib_audio_frame_v2_t = Default::default();
let mut frame_type: NDIlib_frame_type_e = NDIlib_frame_type_e::NDIlib_frame_type_none;
unsafe { unsafe {
while frame_type != NDIlib_frame_type_e::NDIlib_frame_type_audio { while NDIlib_recv_capture_v2(pNDI_recv, ptr::null(), &audio_frame, ptr::null(), 1000) != NDIlib_frame_type_e::NDIlib_frame_type_audio {
frame_type = NDIlib_recv_capture_v2( NDIlib_recv_free_audio_v2(pNDI_recv, &audio_frame);
pNDI_recv,
ptr::null(),
&audio_frame,
ptr::null(),
1000,
);
gst_debug!(self.cat, obj: element, "NDI audio frame received: {:?}", audio_frame);
} }
gst_debug!(self.cat, obj: element, "NDI audio frame received: {:?}", audio_frame);
if receiver.initial_timestamp <= audio_frame.timestamp as u64 if receiver.initial_timestamp <= audio_frame.timestamp as u64
|| receiver.initial_timestamp == 0 || receiver.initial_timestamp == 0
{ {
receiver.initial_timestamp = audio_frame.timestamp as u64; receiver.initial_timestamp = audio_frame.timestamp as u64;
} }
NDIlib_recv_free_audio_v2(pNDI_recv, &audio_frame);
gst_debug!(self.cat, obj: element, "Setting initial timestamp to {}", receiver.initial_timestamp); gst_debug!(self.cat, obj: element, "Setting initial timestamp to {}", receiver.initial_timestamp);
} }
} }
@ -362,12 +356,9 @@ impl ObjectSubclass for NdiAudioSrc {
let audio_frame: NDIlib_audio_frame_v2_t = Default::default(); let audio_frame: NDIlib_audio_frame_v2_t = Default::default();
let mut frame_type: NDIlib_frame_type_e = NDIlib_frame_type_e::NDIlib_frame_type_none; unsafe {
while frame_type != NDIlib_frame_type_e::NDIlib_frame_type_audio { while NDIlib_recv_capture_v2(pNDI_recv, ptr::null(), &audio_frame, ptr::null(), 1000) != NDIlib_frame_type_e::NDIlib_frame_type_audio {
unsafe { NDIlib_recv_free_audio_v2(pNDI_recv, &audio_frame);
frame_type =
NDIlib_recv_capture_v2(pNDI_recv, ptr::null(), &audio_frame, ptr::null(), 1000);
gst_debug!(self.cat, obj: element, "NDI audio frame received: {:?}", audio_frame);
} }
} }
@ -386,6 +377,10 @@ impl ObjectSubclass for NdiAudioSrc {
} }
let _ = element.post_message(&gst::Message::new_latency().src(Some(element)).build()); let _ = element.post_message(&gst::Message::new_latency().src(Some(element)).build());
unsafe {
NDIlib_recv_free_audio_v2(pNDI_recv, &audio_frame);
}
self.parent_fixate(element, caps) self.parent_fixate(element, caps)
} }
@ -426,6 +421,7 @@ impl ObjectSubclass for NdiAudioSrc {
if (frame_type == NDIlib_frame_type_e::NDIlib_frame_type_none && _settings.loss_threshold != 0) if (frame_type == NDIlib_frame_type_e::NDIlib_frame_type_none && _settings.loss_threshold != 0)
|| frame_type == NDIlib_frame_type_e::NDIlib_frame_type_error || frame_type == NDIlib_frame_type_e::NDIlib_frame_type_error
{ {
NDIlib_recv_free_audio_v2(pNDI_recv, &audio_frame);
if count_frame_none < _settings.loss_threshold{ if count_frame_none < _settings.loss_threshold{
count_frame_none += 1; count_frame_none += 1;
continue; continue;
@ -434,12 +430,14 @@ impl ObjectSubclass for NdiAudioSrc {
return Err(gst::FlowError::CustomError); return Err(gst::FlowError::CustomError);
} }
else if frame_type == NDIlib_frame_type_e::NDIlib_frame_type_none && _settings.loss_threshold == 0{ else if frame_type == NDIlib_frame_type_e::NDIlib_frame_type_none && _settings.loss_threshold == 0{
NDIlib_recv_free_audio_v2(pNDI_recv, &audio_frame);
gst_debug!(self.cat, obj: element, "No audio frame received, sending empty buffer"); gst_debug!(self.cat, obj: element, "No audio frame received, sending empty buffer");
let buffer = gst::Buffer::with_size(0).unwrap(); let buffer = gst::Buffer::with_size(0).unwrap();
return Ok(buffer) return Ok(buffer)
} }
if time >= (audio_frame.timestamp as u64) { if time >= (audio_frame.timestamp as u64) {
NDIlib_recv_free_audio_v2(pNDI_recv, &audio_frame);
gst_debug!(self.cat, obj: element, "Frame timestamp ({:?}) is lower than received in the first frame from NDI ({:?}), so skiping...", (audio_frame.timestamp as u64), time); gst_debug!(self.cat, obj: element, "Frame timestamp ({:?}) is lower than received in the first frame from NDI ({:?}), so skiping...", (audio_frame.timestamp as u64), time);
} else { } else {
skip_frame = false; skip_frame = false;
@ -481,6 +479,7 @@ impl ObjectSubclass for NdiAudioSrc {
dst.reference_level = 0; dst.reference_level = 0;
dst.p_data = buffer.map_writable().unwrap().as_mut_slice_of::<i16>().unwrap().as_mut_ptr(); dst.p_data = buffer.map_writable().unwrap().as_mut_slice_of::<i16>().unwrap().as_mut_ptr();
NDIlib_util_audio_to_interleaved_16s_v2(&audio_frame, &mut dst); NDIlib_util_audio_to_interleaved_16s_v2(&audio_frame, &mut dst);
NDIlib_recv_free_audio_v2(pNDI_recv, &audio_frame);
} }
gst_log!(self.cat, obj: element, "Produced buffer {:?}", buffer); gst_log!(self.cat, obj: element, "Produced buffer {:?}", buffer);

8
src/ndisys.rs
View file

@ -33,6 +33,14 @@ extern "C" {
p_metadata: *const NDIlib_metadata_frame_t, p_metadata: *const NDIlib_metadata_frame_t,
timeout_in_ms: u32, timeout_in_ms: u32,
) -> NDIlib_frame_type_e; ) -> NDIlib_frame_type_e;
pub fn NDIlib_recv_free_video_v2(
p_instance: NDIlib_recv_instance_t,
p_video_data: *const NDIlib_video_frame_v2_t
);
pub fn NDIlib_recv_free_audio_v2(
p_instance: NDIlib_recv_instance_t,
p_audio_data: *const NDIlib_audio_frame_v2_t
);
} }
pub type NDIlib_find_instance_t = *mut ::std::os::raw::c_void; pub type NDIlib_find_instance_t = *mut ::std::os::raw::c_void;

32
src/ndivideosrc.rs
View file

@ -267,24 +267,18 @@ impl ObjectSubclass for NdiVideoSrc {
let video_frame: NDIlib_video_frame_v2_t = Default::default(); let video_frame: NDIlib_video_frame_v2_t = Default::default();
let mut frame_type: NDIlib_frame_type_e = NDIlib_frame_type_e::NDIlib_frame_type_none;
unsafe { unsafe {
while frame_type != NDIlib_frame_type_e::NDIlib_frame_type_video { while NDIlib_recv_capture_v2(pNDI_recv, &video_frame, ptr::null(), ptr::null(), 1000) != NDIlib_frame_type_e::NDIlib_frame_type_video {
frame_type = NDIlib_recv_capture_v2( NDIlib_recv_free_video_v2(pNDI_recv, &video_frame);
pNDI_recv,
&video_frame,
ptr::null(),
ptr::null(),
1000,
);
gst_debug!(self.cat, obj: element, "NDI video frame received: {:?}", video_frame);
} }
gst_debug!(self.cat, obj: element, "NDI video frame received: {:?}", video_frame);
if receiver.initial_timestamp <= video_frame.timestamp as u64 if receiver.initial_timestamp <= video_frame.timestamp as u64
|| receiver.initial_timestamp == 0 || receiver.initial_timestamp == 0
{ {
receiver.initial_timestamp = video_frame.timestamp as u64; receiver.initial_timestamp = video_frame.timestamp as u64;
} }
NDIlib_recv_free_video_v2(pNDI_recv, &video_frame);
gst_debug!(self.cat, obj: element, "Setting initial timestamp to {}", receiver.initial_timestamp); gst_debug!(self.cat, obj: element, "Setting initial timestamp to {}", receiver.initial_timestamp);
} }
} }
@ -369,15 +363,11 @@ impl ObjectSubclass for NdiVideoSrc {
let video_frame: NDIlib_video_frame_v2_t = Default::default(); let video_frame: NDIlib_video_frame_v2_t = Default::default();
let mut frame_type: NDIlib_frame_type_e = NDIlib_frame_type_e::NDIlib_frame_type_none; unsafe {
while frame_type != NDIlib_frame_type_e::NDIlib_frame_type_video { while NDIlib_recv_capture_v2(pNDI_recv, &video_frame, ptr::null(), ptr::null(), 1000) != NDIlib_frame_type_e::NDIlib_frame_type_video {
unsafe { NDIlib_recv_free_video_v2(pNDI_recv, &video_frame);
frame_type =
NDIlib_recv_capture_v2(pNDI_recv, &video_frame, ptr::null(), ptr::null(), 1000);
gst_debug!(self.cat, obj: element, "NDI video frame received: {:?}", video_frame);
} }
} }
settings.latency = gst::SECOND.mul_div_floor( settings.latency = gst::SECOND.mul_div_floor(
video_frame.frame_rate_D as u64, video_frame.frame_rate_D as u64,
video_frame.frame_rate_N as u64, video_frame.frame_rate_N as u64,
@ -394,7 +384,9 @@ impl ObjectSubclass for NdiVideoSrc {
Fraction::new(video_frame.frame_rate_N, video_frame.frame_rate_D), Fraction::new(video_frame.frame_rate_N, video_frame.frame_rate_D),
); );
} }
unsafe {
NDIlib_recv_free_video_v2(pNDI_recv, &video_frame);
}
let _ = element.post_message(&gst::Message::new_latency().src(Some(element)).build()); let _ = element.post_message(&gst::Message::new_latency().src(Some(element)).build());
self.parent_fixate(element, caps) self.parent_fixate(element, caps)
} }
@ -436,6 +428,7 @@ impl ObjectSubclass for NdiVideoSrc {
if (frame_type == NDIlib_frame_type_e::NDIlib_frame_type_none && _settings.loss_threshold != 0) if (frame_type == NDIlib_frame_type_e::NDIlib_frame_type_none && _settings.loss_threshold != 0)
|| frame_type == NDIlib_frame_type_e::NDIlib_frame_type_error || frame_type == NDIlib_frame_type_e::NDIlib_frame_type_error
{ {
NDIlib_recv_free_video_v2(pNDI_recv, &video_frame);
if count_frame_none < _settings.loss_threshold{ if count_frame_none < _settings.loss_threshold{
count_frame_none += 1; count_frame_none += 1;
continue; continue;
@ -444,12 +437,14 @@ impl ObjectSubclass for NdiVideoSrc {
return Err(gst::FlowError::CustomError); return Err(gst::FlowError::CustomError);
} }
else if frame_type == NDIlib_frame_type_e::NDIlib_frame_type_none && _settings.loss_threshold == 0{ else if frame_type == NDIlib_frame_type_e::NDIlib_frame_type_none && _settings.loss_threshold == 0{
NDIlib_recv_free_video_v2(pNDI_recv, &video_frame);
gst_debug!(self.cat, obj: element, "No video frame received, sending empty buffer"); gst_debug!(self.cat, obj: element, "No video frame received, sending empty buffer");
let buffer = gst::Buffer::with_size(0).unwrap(); let buffer = gst::Buffer::with_size(0).unwrap();
return Ok(buffer) return Ok(buffer)
} }
if time >= (video_frame.timestamp as u64) { if time >= (video_frame.timestamp as u64) {
NDIlib_recv_free_video_v2(pNDI_recv, &video_frame);
gst_debug!(self.cat, obj: element, "Frame timestamp ({:?}) is lower than received in the first frame from NDI ({:?}), so skiping...", (video_frame.timestamp as u64), time); gst_debug!(self.cat, obj: element, "Frame timestamp ({:?}) is lower than received in the first frame from NDI ({:?}), so skiping...", (video_frame.timestamp as u64), time);
} else { } else {
skip_frame = false; skip_frame = false;
@ -486,6 +481,7 @@ impl ObjectSubclass for NdiVideoSrc {
timestamp_data.offset += 1; timestamp_data.offset += 1;
buffer.set_offset_end(timestamp_data.offset); buffer.set_offset_end(timestamp_data.offset);
buffer.copy_from_slice(0, &vec).unwrap(); buffer.copy_from_slice(0, &vec).unwrap();
// NDIlib_recv_free_video_v2(pNDI_recv, &video_frame);
} }
gst_log!(self.cat, obj: element, "Produced buffer {:?}", buffer); gst_log!(self.cat, obj: element, "Produced buffer {:?}", buffer);