mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-12-11 20:56:29 +00:00
Moved connection to ndi logic from sources to a common function
This commit is contained in:
parent
2e9a0242af
commit
e5405a6657
3 changed files with 599 additions and 309 deletions
|
@ -21,21 +21,205 @@ extern crate num_traits;
|
|||
mod ndivideosrc;
|
||||
mod ndiaudiosrc;
|
||||
pub mod ndilib;
|
||||
pub mod a;
|
||||
|
||||
use std::ptr;
|
||||
use std::{thread, time};
|
||||
use std::time::{SystemTime, UNIX_EPOCH};
|
||||
use std::ffi::{CStr, CString};
|
||||
use ndilib::*;
|
||||
use gst_plugin::base_src::*;
|
||||
|
||||
|
||||
// Plugin entry point that should register all elements provided by this plugin,
|
||||
// and everything else that this plugin might provide (e.g. typefinders or device providers).
|
||||
fn plugin_init(plugin: &gst::Plugin) -> bool {
|
||||
ndivideosrc::register(plugin);
|
||||
ndiaudiosrc::register(plugin);
|
||||
// a::test(2);
|
||||
// println!("---------------------------------------");
|
||||
// let mut ndistruc = ndi1{
|
||||
// recv : 0
|
||||
// };
|
||||
true
|
||||
}
|
||||
|
||||
// Static plugin metdata that is directly stored in the plugin shared object and read by GStreamer
|
||||
// upon loading.
|
||||
// Plugin name, plugin description, plugin entry point function, version number of this plugin,
|
||||
// license of the plugin, source package name, binary package name, origin where it comes from
|
||||
// and the date/time of release.
|
||||
plugin_define!(
|
||||
|
||||
struct ndi1{
|
||||
recv: Option<NdiInstance>,
|
||||
start_pts: Option<u64>,
|
||||
}
|
||||
|
||||
static mut ndi2: ndi1 = ndi1{
|
||||
recv: None,
|
||||
start_pts: None,
|
||||
};
|
||||
|
||||
fn hue(element: &BaseSrc, ip: String, stream_name: String) -> bool{
|
||||
println!("---------------------------------------");
|
||||
unsafe {
|
||||
match ndi2.recv {
|
||||
None => {
|
||||
//gst_element_error!(element, gst::CoreError::Negotiation, ["Have no caps yet"]);
|
||||
//return true;
|
||||
}
|
||||
_ => return true,
|
||||
};
|
||||
//println!("{:?}", ndi2.recv);
|
||||
//ndi2.recv = i;
|
||||
//println!("{:?}", ndi2.recv);
|
||||
if !NDIlib_initialize() {
|
||||
//println!("Cannot run NDI: NDIlib_initialize error.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_initialize error"]);
|
||||
return false;
|
||||
}
|
||||
|
||||
let mut source: NDIlib_source_t = NDIlib_source_t{p_ndi_name: ptr::null(),
|
||||
p_ip_address: ptr::null()};
|
||||
|
||||
// print!("{:?}", settings.stream_name);
|
||||
// print!("{:?}", settings.ip);
|
||||
|
||||
//TODO default values
|
||||
let NDI_find_create_desc: NDIlib_find_create_t = Default::default();
|
||||
let pNDI_find = NDIlib_find_create_v2(&NDI_find_create_desc);
|
||||
let ip_ptr = CString::new(ip.clone()).unwrap();
|
||||
if (ip_ptr == CString::new("").unwrap()){
|
||||
if pNDI_find.is_null() {
|
||||
//println!("Cannot run NDI: NDIlib_find_create_v2 error.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_find_create_v2 error"]);
|
||||
return false;
|
||||
}
|
||||
|
||||
let mut total_sources: u32 = 0;
|
||||
let mut p_sources = ptr::null();
|
||||
//TODO Delete while. If not, will loop until a source it's available
|
||||
//while total_sources == 0 {
|
||||
// TODO Sleep 1s to wait for all sources
|
||||
thread::sleep(time::Duration::from_millis(2000));
|
||||
p_sources = NDIlib_find_get_current_sources(pNDI_find, &mut total_sources as *mut u32);
|
||||
//}
|
||||
|
||||
// We need at least one source
|
||||
if p_sources.is_null() {
|
||||
//println!("Error getting NDIlib_find_get_current_sources.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Error getting NDIlib_find_get_current_sources"]);
|
||||
return false;
|
||||
//::std::process::exit(1);
|
||||
}
|
||||
|
||||
let mut no_source: isize = -1;
|
||||
for i in 0..total_sources as isize{
|
||||
if CStr::from_ptr((*p_sources.offset(i)).p_ndi_name)
|
||||
.to_string_lossy()
|
||||
.into_owned() == stream_name{
|
||||
no_source = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if no_source == -1 {
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Stream name not found"]);
|
||||
return false;
|
||||
}
|
||||
println!(
|
||||
"Total_sources {}: Name '{}' Address '{}'",
|
||||
total_sources,
|
||||
CStr::from_ptr((*p_sources.offset(no_source)).p_ndi_name)
|
||||
.to_string_lossy()
|
||||
.into_owned(),
|
||||
CStr::from_ptr((*p_sources.offset(no_source)).p_ip_address)
|
||||
.to_string_lossy()
|
||||
.into_owned()
|
||||
);
|
||||
source = *p_sources.offset(no_source).clone();
|
||||
}
|
||||
else{
|
||||
source.p_ip_address = ip_ptr.as_ptr();
|
||||
println!(
|
||||
"Address '{}'",
|
||||
CStr::from_ptr(source.p_ip_address)
|
||||
.to_string_lossy()
|
||||
.into_owned()
|
||||
);
|
||||
}
|
||||
|
||||
// We now have at least one source, so we create a receiver to look at it.
|
||||
// We tell it that we prefer YCbCr video since it is more efficient for us. If the source has an alpha channel
|
||||
// it will still be provided in BGRA
|
||||
let p_ndi_name = CString::new("Galicaster NDI Receiver").unwrap();
|
||||
let NDI_recv_create_desc = NDIlib_recv_create_v3_t {
|
||||
source_to_connect_to: source,
|
||||
p_ndi_name: p_ndi_name.as_ptr(),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let pNDI_recv = NDIlib_recv_create_v3(&NDI_recv_create_desc);
|
||||
if pNDI_recv.is_null() {
|
||||
//println!("Cannot run NDI: NDIlib_recv_create_v3 error.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_recv_create_v3 error"]);
|
||||
return false;
|
||||
//::std::process::exit(1);
|
||||
}
|
||||
|
||||
// Destroy the NDI finder. We needed to have access to the pointers to p_sources[0]
|
||||
NDIlib_find_destroy(pNDI_find);
|
||||
|
||||
// We are now going to mark this source as being on program output for tally purposes (but not on preview)
|
||||
let tally_state: NDIlib_tally_t = Default::default();
|
||||
NDIlib_recv_set_tally(pNDI_recv, &tally_state);
|
||||
|
||||
// Enable Hardwqre Decompression support if this support has it. Please read the caveats in the documentation
|
||||
// regarding this. There are times in which it might reduce the performance although on small stream numbers
|
||||
// it almost always yields the same or better performance.
|
||||
let data = CString::new("<ndi_hwaccel enabled=\"true\"/>").unwrap();
|
||||
let enable_hw_accel = NDIlib_metadata_frame_t {
|
||||
length: data.to_bytes().len() as i32,
|
||||
timecode: 0,
|
||||
p_data: data.as_ptr(),
|
||||
};
|
||||
|
||||
NDIlib_recv_send_metadata(pNDI_recv, &enable_hw_accel);
|
||||
ndi2.recv = Some(NdiInstance{recv: pNDI_recv});
|
||||
let start = SystemTime::now();
|
||||
let since_the_epoch = start.duration_since(UNIX_EPOCH)
|
||||
.expect("Time went backwards");
|
||||
println!("{:?}", since_the_epoch);
|
||||
ndi2.start_pts = Some(since_the_epoch.as_secs() * 1000000000 +
|
||||
since_the_epoch.subsec_nanos() as u64);
|
||||
//TODO Another way to save NDI_recv variable
|
||||
// *state = State{
|
||||
// info: state.info.clone(),
|
||||
// recv: Some(NdiInstance{recv: pNDI_recv}),
|
||||
// };
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
fn stop_ndi() -> bool{
|
||||
unsafe{
|
||||
let recv = match ndi2.recv{
|
||||
None => {
|
||||
//TODO Update gst_element_error with one more descriptive
|
||||
//println!("pNDI_recv no encontrado");
|
||||
//gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
return true;
|
||||
}
|
||||
Some(ref recv) => recv.clone(),
|
||||
};
|
||||
let pNDI_recv = recv.recv;
|
||||
NDIlib_recv_destroy(pNDI_recv);
|
||||
ndi2.recv = None;
|
||||
//NDIlib_destroy();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
// Static plugin metdata that is directly stored in the plugin shared object and read by GStreamer
|
||||
// upon loading.
|
||||
// Plugin name, plugin description, plugin entry point function, version number of this plugin,
|
||||
// license of the plugin, source package name, binary package name, origin where it comes from
|
||||
// and the date/time of release.
|
||||
plugin_define!(
|
||||
b"ndi\0",
|
||||
b"NewTek NDI Plugin\0",
|
||||
plugin_init,
|
||||
|
@ -45,4 +229,4 @@ plugin_define!(
|
|||
b"ndi\0",
|
||||
b"https://gitlab.teltek.es/rubenrua/ndi-rs.git\0",
|
||||
b"2018-04-09\0"
|
||||
);
|
||||
);
|
||||
|
|
|
@ -26,6 +26,9 @@ use byte_slice_cast::FromByteSlice;
|
|||
use byte_slice_cast::AsSliceOf;
|
||||
|
||||
use ndilib::*;
|
||||
use hue;
|
||||
use ndi2;
|
||||
use stop_ndi;
|
||||
|
||||
// Property value storage
|
||||
#[derive(Debug, Clone)]
|
||||
|
@ -138,8 +141,8 @@ impl NdiAudioSrc {
|
|||
klass.set_metadata(
|
||||
"NewTek NDI Audio Source",
|
||||
"Source",
|
||||
"NewTek NDI video/audio source",
|
||||
"Ruben Gonzalez <rubenrua@teltek.es>",
|
||||
"NewTek NDI audio source",
|
||||
"Ruben Gonzalez <rubenrua@teltek.es>, Daniel Vilar <daniel.peiteado@teltek.es>",
|
||||
);
|
||||
|
||||
// On the src pad, we can produce F32/F64 with any sample rate
|
||||
|
@ -288,16 +291,21 @@ impl NdiAudioSrc {
|
|||
gst_debug!(ndisrc_struct.cat, obj: element, "Received audio frame: {:?}", video_frame);
|
||||
frame = true;
|
||||
//pts = ((video_frame.timestamp as u64) * 100) - state.start_pts.unwrap();
|
||||
// println!("{:?}", pts/1000000);
|
||||
*pts = ((audio_frame.timestamp as u64) * 100);
|
||||
//println!("{:?}", *pts/1000000);
|
||||
// println!("{:?}", audio_frame.timestamp);
|
||||
// println!("{:?}", audio_frame.timecode);
|
||||
// *pts = ((audio_frame.timestamp as u64) * 100);
|
||||
*pts = ((audio_frame.timecode as u64) * 100);
|
||||
if *pts2 == 0{
|
||||
*pts2 = (audio_frame.timestamp as u64) * 100;
|
||||
// *pts2 = (audio_frame.timestamp as u64) * 100;
|
||||
*pts2 = (audio_frame.timecode as u64) * 100;
|
||||
*pts = 0;
|
||||
}
|
||||
else{
|
||||
// println!("{:?}", video_frame.timecode * 100);
|
||||
// println!("{:?}", pts2.pts);
|
||||
*pts = (((audio_frame.timestamp as u64) * 100) - *pts2);
|
||||
// *pts = (((audio_frame.timestamp as u64) * 100) - *pts2);
|
||||
*pts = (((audio_frame.timecode as u64) * 100) - *pts2);
|
||||
//println!("{:?}", pts/1000000);
|
||||
}
|
||||
}
|
||||
|
@ -357,6 +365,7 @@ impl NdiAudioSrc {
|
|||
|
||||
// Called when starting, so we can initialize all stream-related state to its defaults
|
||||
fn start(&self, element: &BaseSrc) -> bool {
|
||||
println!("/*/*/*/*/*/*/*/*/*");
|
||||
// Reset state
|
||||
*self.state.lock().unwrap() = Default::default();
|
||||
self.unlock_stop(element);
|
||||
|
@ -368,151 +377,163 @@ impl NdiAudioSrc {
|
|||
|
||||
//let mut pNDI_recv = state.recv;
|
||||
unsafe {
|
||||
if !NDIlib_initialize() {
|
||||
//println!("Cannot run NDI: NDIlib_initialize error.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_initialize error"]);
|
||||
return false;
|
||||
}
|
||||
|
||||
let mut source: NDIlib_source_t = NDIlib_source_t{p_ndi_name: ptr::null(),
|
||||
p_ip_address: ptr::null()};
|
||||
|
||||
// print!("{:?}", settings.stream_name);
|
||||
// print!("{:?}", settings.ip);
|
||||
|
||||
//TODO default values
|
||||
let NDI_find_create_desc: NDIlib_find_create_t = Default::default();
|
||||
let pNDI_find = NDIlib_find_create_v2(&NDI_find_create_desc);
|
||||
let ip_ptr = CString::new(settings.ip.clone()).unwrap();
|
||||
if (ip_ptr == CString::new("").unwrap()){
|
||||
if pNDI_find.is_null() {
|
||||
//println!("Cannot run NDI: NDIlib_find_create_v2 error.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_find_create_v2 error"]);
|
||||
return false;
|
||||
}
|
||||
|
||||
let mut total_sources: u32 = 0;
|
||||
let mut p_sources = ptr::null();
|
||||
//TODO Delete while. If not, will loop until a source it's available
|
||||
//while total_sources == 0 {
|
||||
// TODO Sleep 1s to wait for all sources
|
||||
thread::sleep(time::Duration::from_millis(2000));
|
||||
p_sources = NDIlib_find_get_current_sources(pNDI_find, &mut total_sources as *mut u32);
|
||||
//}
|
||||
|
||||
// We need at least one source
|
||||
if p_sources.is_null() {
|
||||
//println!("Error getting NDIlib_find_get_current_sources.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Error getting NDIlib_find_get_current_sources"]);
|
||||
return false;
|
||||
//::std::process::exit(1);
|
||||
}
|
||||
|
||||
let mut no_source: isize = -1;
|
||||
for i in 0..total_sources as isize{
|
||||
if CStr::from_ptr((*p_sources.offset(i)).p_ndi_name)
|
||||
.to_string_lossy()
|
||||
.into_owned() == settings.stream_name{
|
||||
no_source = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if no_source == -1 {
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Stream name not found"]);
|
||||
return false;
|
||||
}
|
||||
println!(
|
||||
"Total_sources {}: Name '{}' Address '{}'",
|
||||
total_sources,
|
||||
CStr::from_ptr((*p_sources.offset(no_source)).p_ndi_name)
|
||||
.to_string_lossy()
|
||||
.into_owned(),
|
||||
CStr::from_ptr((*p_sources.offset(no_source)).p_ip_address)
|
||||
.to_string_lossy()
|
||||
.into_owned()
|
||||
);
|
||||
source = *p_sources.offset(no_source).clone();
|
||||
}
|
||||
else{
|
||||
source.p_ip_address = ip_ptr.as_ptr();
|
||||
println!(
|
||||
"Address '{}'",
|
||||
CStr::from_ptr(source.p_ip_address)
|
||||
.to_string_lossy()
|
||||
.into_owned()
|
||||
);
|
||||
}
|
||||
|
||||
// We now have at least one source, so we create a receiver to look at it.
|
||||
// We tell it that we prefer YCbCr video since it is more efficient for us. If the source has an alpha channel
|
||||
// it will still be provided in BGRA
|
||||
let p_ndi_name = CString::new("Galicaster NDI Receiver").unwrap();
|
||||
let NDI_recv_create_desc = NDIlib_recv_create_v3_t {
|
||||
source_to_connect_to: source,
|
||||
p_ndi_name: p_ndi_name.as_ptr(),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let pNDI_recv = NDIlib_recv_create_v3(&NDI_recv_create_desc);
|
||||
if pNDI_recv.is_null() {
|
||||
//println!("Cannot run NDI: NDIlib_recv_create_v3 error.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_recv_create_v3 error"]);
|
||||
return false;
|
||||
//::std::process::exit(1);
|
||||
}
|
||||
|
||||
// Destroy the NDI finder. We needed to have access to the pointers to p_sources[0]
|
||||
NDIlib_find_destroy(pNDI_find);
|
||||
|
||||
// We are now going to mark this source as being on program output for tally purposes (but not on preview)
|
||||
let tally_state: NDIlib_tally_t = Default::default();
|
||||
NDIlib_recv_set_tally(pNDI_recv, &tally_state);
|
||||
|
||||
// Enable Hardwqre Decompression support if this support has it. Please read the caveats in the documentation
|
||||
// regarding this. There are times in which it might reduce the performance although on small stream numbers
|
||||
// it almost always yields the same or better performance.
|
||||
let data = CString::new("<ndi_hwaccel enabled=\"true\"/>").unwrap();
|
||||
let enable_hw_accel = NDIlib_metadata_frame_t {
|
||||
length: data.to_bytes().len() as i32,
|
||||
timecode: 0,
|
||||
p_data: data.as_ptr(),
|
||||
};
|
||||
|
||||
NDIlib_recv_send_metadata(pNDI_recv, &enable_hw_accel);
|
||||
state.recv = Some(NdiInstance{recv: pNDI_recv});
|
||||
let start = SystemTime::now();
|
||||
let since_the_epoch = start.duration_since(UNIX_EPOCH)
|
||||
.expect("Time went backwards");
|
||||
println!("{:?}", since_the_epoch);
|
||||
state.start_pts = Some(since_the_epoch.as_secs() * 1000000000 +
|
||||
since_the_epoch.subsec_nanos() as u64);
|
||||
//TODO Another way to save NDI_recv variable
|
||||
// *state = State{
|
||||
// info: state.info.clone(),
|
||||
// recv: Some(NdiInstance{recv: pNDI_recv}),
|
||||
return hue(element, settings.ip.clone(), settings.stream_name.clone());
|
||||
// if !NDIlib_initialize() {
|
||||
// //println!("Cannot run NDI: NDIlib_initialize error.");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_initialize error"]);
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// let mut source: NDIlib_source_t = NDIlib_source_t{p_ndi_name: ptr::null(),
|
||||
// p_ip_address: ptr::null()};
|
||||
//
|
||||
// // print!("{:?}", settings.stream_name);
|
||||
// // print!("{:?}", settings.ip);
|
||||
//
|
||||
// //TODO default values
|
||||
// let NDI_find_create_desc: NDIlib_find_create_t = Default::default();
|
||||
// let pNDI_find = NDIlib_find_create_v2(&NDI_find_create_desc);
|
||||
// let ip_ptr = CString::new(settings.ip.clone()).unwrap();
|
||||
// if (ip_ptr == CString::new("").unwrap()){
|
||||
// if pNDI_find.is_null() {
|
||||
// //println!("Cannot run NDI: NDIlib_find_create_v2 error.");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_find_create_v2 error"]);
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// let mut total_sources: u32 = 0;
|
||||
// let mut p_sources = ptr::null();
|
||||
// //TODO Delete while. If not, will loop until a source it's available
|
||||
// //while total_sources == 0 {
|
||||
// // TODO Sleep 1s to wait for all sources
|
||||
// thread::sleep(time::Duration::from_millis(2000));
|
||||
// p_sources = NDIlib_find_get_current_sources(pNDI_find, &mut total_sources as *mut u32);
|
||||
// //}
|
||||
//
|
||||
// // We need at least one source
|
||||
// if p_sources.is_null() {
|
||||
// //println!("Error getting NDIlib_find_get_current_sources.");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Error getting NDIlib_find_get_current_sources"]);
|
||||
// return false;
|
||||
// //::std::process::exit(1);
|
||||
// }
|
||||
//
|
||||
// let mut no_source: isize = -1;
|
||||
// for i in 0..total_sources as isize{
|
||||
// if CStr::from_ptr((*p_sources.offset(i)).p_ndi_name)
|
||||
// .to_string_lossy()
|
||||
// .into_owned() == settings.stream_name{
|
||||
// no_source = i;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// if no_source == -1 {
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Stream name not found"]);
|
||||
// return false;
|
||||
// }
|
||||
// println!(
|
||||
// "Total_sources {}: Name '{}' Address '{}'",
|
||||
// total_sources,
|
||||
// CStr::from_ptr((*p_sources.offset(no_source)).p_ndi_name)
|
||||
// .to_string_lossy()
|
||||
// .into_owned(),
|
||||
// CStr::from_ptr((*p_sources.offset(no_source)).p_ip_address)
|
||||
// .to_string_lossy()
|
||||
// .into_owned()
|
||||
// );
|
||||
// source = *p_sources.offset(no_source).clone();
|
||||
// }
|
||||
// else{
|
||||
// source.p_ip_address = ip_ptr.as_ptr();
|
||||
// println!(
|
||||
// "Address '{}'",
|
||||
// CStr::from_ptr(source.p_ip_address)
|
||||
// .to_string_lossy()
|
||||
// .into_owned()
|
||||
// );
|
||||
// }
|
||||
//
|
||||
// // We now have at least one source, so we create a receiver to look at it.
|
||||
// // We tell it that we prefer YCbCr video since it is more efficient for us. If the source has an alpha channel
|
||||
// // it will still be provided in BGRA
|
||||
// let p_ndi_name = CString::new("Galicaster NDI Receiver").unwrap();
|
||||
// let NDI_recv_create_desc = NDIlib_recv_create_v3_t {
|
||||
// source_to_connect_to: source,
|
||||
// p_ndi_name: p_ndi_name.as_ptr(),
|
||||
// ..Default::default()
|
||||
// };
|
||||
//
|
||||
// let pNDI_recv = NDIlib_recv_create_v3(&NDI_recv_create_desc);
|
||||
// if pNDI_recv.is_null() {
|
||||
// //println!("Cannot run NDI: NDIlib_recv_create_v3 error.");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_recv_create_v3 error"]);
|
||||
// return false;
|
||||
// //::std::process::exit(1);
|
||||
// }
|
||||
//
|
||||
// // Destroy the NDI finder. We needed to have access to the pointers to p_sources[0]
|
||||
// NDIlib_find_destroy(pNDI_find);
|
||||
//
|
||||
// // We are now going to mark this source as being on program output for tally purposes (but not on preview)
|
||||
// let tally_state: NDIlib_tally_t = Default::default();
|
||||
// NDIlib_recv_set_tally(pNDI_recv, &tally_state);
|
||||
//
|
||||
// // Enable Hardwqre Decompression support if this support has it. Please read the caveats in the documentation
|
||||
// // regarding this. There are times in which it might reduce the performance although on small stream numbers
|
||||
// // it almost always yields the same or better performance.
|
||||
// let data = CString::new("<ndi_hwaccel enabled=\"true\"/>").unwrap();
|
||||
// let enable_hw_accel = NDIlib_metadata_frame_t {
|
||||
// length: data.to_bytes().len() as i32,
|
||||
// timecode: 0,
|
||||
// p_data: data.as_ptr(),
|
||||
// };
|
||||
//
|
||||
// NDIlib_recv_send_metadata(pNDI_recv, &enable_hw_accel);
|
||||
// state.recv = Some(NdiInstance{recv: pNDI_recv});
|
||||
// let start = SystemTime::now();
|
||||
// let since_the_epoch = start.duration_since(UNIX_EPOCH)
|
||||
// .expect("Time went backwards");
|
||||
// println!("{:?}", since_the_epoch);
|
||||
// state.start_pts = Some(since_the_epoch.as_secs() * 1000000000 +
|
||||
// since_the_epoch.subsec_nanos() as u64);
|
||||
// //TODO Another way to save NDI_recv variable
|
||||
// // *state = State{
|
||||
// // info: state.info.clone(),
|
||||
// // recv: Some(NdiInstance{recv: pNDI_recv}),
|
||||
// // };
|
||||
}
|
||||
|
||||
true
|
||||
//true
|
||||
}
|
||||
|
||||
// Called when shutting down the element so we can release all stream-related state
|
||||
fn stop(&self, element: &BaseSrc) -> bool {
|
||||
// Reset state
|
||||
let state = self.state.lock().unwrap();
|
||||
let recv = match state.recv{
|
||||
None => {
|
||||
//println!("pNDI_recv no encontrado");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
return true;
|
||||
}
|
||||
Some(ref recv) => recv.clone(),
|
||||
};
|
||||
let pNDI_recv = recv.recv;
|
||||
unsafe{
|
||||
NDIlib_recv_destroy(pNDI_recv);
|
||||
//NDIlib_destroy();
|
||||
}
|
||||
// let recv = match state.recv{
|
||||
// None => {
|
||||
// //println!("pNDI_recv no encontrado");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
// return true;
|
||||
// }
|
||||
// Some(ref recv) => recv.clone(),
|
||||
// };
|
||||
// let pNDI_recv = recv.recv;
|
||||
// unsafe{
|
||||
// let recv = match ndi2.recv{
|
||||
// None => {
|
||||
// //TODO Update gst_element_error with one more descriptive
|
||||
// //println!("pNDI_recv no encontrado");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
// return true;
|
||||
// }
|
||||
// Some(ref recv) => recv.clone(),
|
||||
// };
|
||||
// let pNDI_recv = recv.recv;
|
||||
// NDIlib_recv_destroy(pNDI_recv);
|
||||
// //NDIlib_destroy();
|
||||
// }
|
||||
stop_ndi();
|
||||
// Commented because when adding ndi destroy stopped in this line
|
||||
//*self.state.lock().unwrap() = Default::default();
|
||||
self.unlock(element);
|
||||
|
@ -524,12 +545,23 @@ impl NdiAudioSrc {
|
|||
fn fixate(&self, element: &BaseSrc, caps: gst::Caps) -> gst::Caps {
|
||||
//We need to set the correct caps resolution and framerate
|
||||
let state = self.state.lock().unwrap();
|
||||
let recv = match state.recv{
|
||||
// let recv = match state.recv{
|
||||
// None => {
|
||||
// //TODO Update gst_element_error with one more descriptive
|
||||
// //println!("pNDI_recv no encontrado");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
// //TODO if none not return anything
|
||||
// return caps;
|
||||
// }
|
||||
// Some(ref recv) => recv.clone(),
|
||||
// };
|
||||
// let pNDI_recv = recv.recv;
|
||||
unsafe{
|
||||
let recv = match ndi2.recv{
|
||||
None => {
|
||||
//TODO Update gst_element_error with one more descriptive
|
||||
//println!("pNDI_recv no encontrado");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
//TODO if none not return anything
|
||||
return caps;
|
||||
}
|
||||
Some(ref recv) => recv.clone(),
|
||||
|
@ -553,6 +585,7 @@ impl NdiAudioSrc {
|
|||
// called Caps::fixate() here
|
||||
element.parent_fixate(caps)
|
||||
}
|
||||
}
|
||||
|
||||
//Creates the audio buffers
|
||||
fn create(
|
||||
|
@ -578,7 +611,18 @@ impl NdiAudioSrc {
|
|||
};
|
||||
//let mut pNDI_recva = ptr::null();
|
||||
// {
|
||||
let recv = match state.recv{
|
||||
// let recv = match state.recv{
|
||||
// None => {
|
||||
// //TODO Update gst_element_error with one more descriptive
|
||||
// //println!("pNDI_recv no encontrado");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
// return Err(gst::FlowReturn::NotNegotiated);
|
||||
// }
|
||||
// Some(ref recv) => recv.clone(),
|
||||
// };
|
||||
// let pNDI_recv = recv.recv;
|
||||
unsafe{
|
||||
let recv = match ndi2.recv{
|
||||
None => {
|
||||
//TODO Update gst_element_error with one more descriptive
|
||||
//println!("pNDI_recv no encontrado");
|
||||
|
@ -588,9 +632,18 @@ impl NdiAudioSrc {
|
|||
Some(ref recv) => recv.clone(),
|
||||
};
|
||||
let pNDI_recv = recv.recv;
|
||||
|
||||
|
||||
// }
|
||||
|
||||
let start_pts = match state.start_pts {
|
||||
// let start_pts = match state.start_pts {
|
||||
// None => {
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Have no caps yet"]);
|
||||
// return Err(gst::FlowReturn::NotNegotiated);
|
||||
// }
|
||||
// Some(ref start_pts) => start_pts.clone(),
|
||||
// };
|
||||
let start_pts = match ndi2.start_pts {
|
||||
None => {
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Have no caps yet"]);
|
||||
return Err(gst::FlowReturn::NotNegotiated);
|
||||
|
@ -625,6 +678,7 @@ impl NdiAudioSrc {
|
|||
Ok(buffer)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
fn unlock(&self, element: &BaseSrc) -> bool {
|
||||
|
|
|
@ -21,6 +21,9 @@ use std::time::{SystemTime, UNIX_EPOCH};
|
|||
use std::ffi::{CStr, CString};
|
||||
|
||||
use ndilib::*;
|
||||
use hue;
|
||||
use ndi2;
|
||||
use stop_ndi;
|
||||
|
||||
// Property value storage
|
||||
#[derive(Debug, Clone)]
|
||||
|
@ -133,8 +136,8 @@ impl NdiVideoSrc {
|
|||
klass.set_metadata(
|
||||
"NewTek NDI Video Source",
|
||||
"Source",
|
||||
"NewTek NDI video/audio source",
|
||||
"Ruben Gonzalez <rubenrua@teltek.es>",
|
||||
"NewTek NDI video source",
|
||||
"Ruben Gonzalez <rubenrua@teltek.es>, Daniel Vilar <daniel.peiteado@teltek.es>",
|
||||
);
|
||||
|
||||
// On the src pad, we can produce F32/F64 with any sample rate
|
||||
|
@ -273,15 +276,20 @@ impl NdiVideoSrc {
|
|||
frame = true;
|
||||
//pts = ((video_frame.timestamp as u64) * 100) - state.start_pts.unwrap();
|
||||
// println!("{:?}", pts/1000000);
|
||||
*pts = ((video_frame.timestamp as u64) * 100);
|
||||
// println!("{:?}", video_frame.timestamp);
|
||||
// println!("{:?}", video_frame.timecode);
|
||||
//*pts = ((video_frame.timestamp as u64) * 100);
|
||||
*pts = ((video_frame.timecode as u64) * 100);
|
||||
if *pts2 == 0{
|
||||
*pts2 = (video_frame.timestamp as u64) * 100;
|
||||
// *pts2 = (video_frame.timestamp as u64) * 100;
|
||||
*pts2 = (video_frame.timecode as u64) * 100;
|
||||
*pts = 0;
|
||||
}
|
||||
else{
|
||||
// println!("{:?}", video_frame.timecode * 100);
|
||||
// println!("{:?}", pts2.pts);
|
||||
*pts = (((video_frame.timestamp as u64) * 100) - *pts2);
|
||||
//*pts = (((video_frame.timestamp as u64) * 100) - *pts2);
|
||||
*pts = (((video_frame.timecode as u64) * 100) - *pts2);
|
||||
//println!("{:?}", pts/1000000);
|
||||
}
|
||||
|
||||
|
@ -356,151 +364,162 @@ impl NdiVideoSrc {
|
|||
|
||||
//let mut pNDI_recv = state.recv;
|
||||
unsafe {
|
||||
if !NDIlib_initialize() {
|
||||
//println!("Cannot run NDI: NDIlib_initialize error.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_initialize error"]);
|
||||
return false;
|
||||
}
|
||||
|
||||
let mut source: NDIlib_source_t = NDIlib_source_t{p_ndi_name: ptr::null(),
|
||||
p_ip_address: ptr::null()};
|
||||
|
||||
// print!("{:?}", settings.stream_name);
|
||||
// print!("{:?}", settings.ip);
|
||||
|
||||
//TODO default values
|
||||
let NDI_find_create_desc: NDIlib_find_create_t = Default::default();
|
||||
let pNDI_find = NDIlib_find_create_v2(&NDI_find_create_desc);
|
||||
let ip_ptr = CString::new(settings.ip.clone()).unwrap();
|
||||
if (ip_ptr == CString::new("").unwrap()){
|
||||
if pNDI_find.is_null() {
|
||||
//println!("Cannot run NDI: NDIlib_find_create_v2 error.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_find_create_v2 error"]);
|
||||
return false;
|
||||
}
|
||||
|
||||
let mut total_sources: u32 = 0;
|
||||
let mut p_sources = ptr::null();
|
||||
//TODO Delete while. If not, will loop until a source it's available
|
||||
//while total_sources == 0 {
|
||||
// TODO Sleep 1s to wait for all sources
|
||||
thread::sleep(time::Duration::from_millis(2000));
|
||||
p_sources = NDIlib_find_get_current_sources(pNDI_find, &mut total_sources as *mut u32);
|
||||
//}
|
||||
|
||||
// We need at least one source
|
||||
if p_sources.is_null() {
|
||||
//println!("Error getting NDIlib_find_get_current_sources.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Error getting NDIlib_find_get_current_sources"]);
|
||||
return false;
|
||||
//::std::process::exit(1);
|
||||
}
|
||||
|
||||
let mut no_source: isize = -1;
|
||||
for i in 0..total_sources as isize{
|
||||
if CStr::from_ptr((*p_sources.offset(i)).p_ndi_name)
|
||||
.to_string_lossy()
|
||||
.into_owned() == settings.stream_name{
|
||||
no_source = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if no_source == -1 {
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Stream name not found"]);
|
||||
return false;
|
||||
}
|
||||
println!(
|
||||
"Total_sources {}: Name '{}' Address '{}'",
|
||||
total_sources,
|
||||
CStr::from_ptr((*p_sources.offset(no_source)).p_ndi_name)
|
||||
.to_string_lossy()
|
||||
.into_owned(),
|
||||
CStr::from_ptr((*p_sources.offset(no_source)).p_ip_address)
|
||||
.to_string_lossy()
|
||||
.into_owned()
|
||||
);
|
||||
source = *p_sources.offset(no_source).clone();
|
||||
}
|
||||
else{
|
||||
source.p_ip_address = ip_ptr.as_ptr();
|
||||
println!(
|
||||
"Address '{}'",
|
||||
CStr::from_ptr(source.p_ip_address)
|
||||
.to_string_lossy()
|
||||
.into_owned()
|
||||
);
|
||||
}
|
||||
|
||||
// We now have at least one source, so we create a receiver to look at it.
|
||||
// We tell it that we prefer YCbCr video since it is more efficient for us. If the source has an alpha channel
|
||||
// it will still be provided in BGRA
|
||||
let p_ndi_name = CString::new("Galicaster NDI Receiver").unwrap();
|
||||
let NDI_recv_create_desc = NDIlib_recv_create_v3_t {
|
||||
source_to_connect_to: source,
|
||||
p_ndi_name: p_ndi_name.as_ptr(),
|
||||
..Default::default()
|
||||
};
|
||||
|
||||
let pNDI_recv = NDIlib_recv_create_v3(&NDI_recv_create_desc);
|
||||
if pNDI_recv.is_null() {
|
||||
//println!("Cannot run NDI: NDIlib_recv_create_v3 error.");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_recv_create_v3 error"]);
|
||||
return false;
|
||||
//::std::process::exit(1);
|
||||
}
|
||||
|
||||
// Destroy the NDI finder. We needed to have access to the pointers to p_sources[0]
|
||||
NDIlib_find_destroy(pNDI_find);
|
||||
|
||||
// We are now going to mark this source as being on program output for tally purposes (but not on preview)
|
||||
let tally_state: NDIlib_tally_t = Default::default();
|
||||
NDIlib_recv_set_tally(pNDI_recv, &tally_state);
|
||||
|
||||
// Enable Hardwqre Decompression support if this support has it. Please read the caveats in the documentation
|
||||
// regarding this. There are times in which it might reduce the performance although on small stream numbers
|
||||
// it almost always yields the same or better performance.
|
||||
let data = CString::new("<ndi_hwaccel enabled=\"true\"/>").unwrap();
|
||||
let enable_hw_accel = NDIlib_metadata_frame_t {
|
||||
length: data.to_bytes().len() as i32,
|
||||
timecode: 0,
|
||||
p_data: data.as_ptr(),
|
||||
};
|
||||
|
||||
NDIlib_recv_send_metadata(pNDI_recv, &enable_hw_accel);
|
||||
state.recv = Some(NdiInstance{recv: pNDI_recv});
|
||||
let start = SystemTime::now();
|
||||
let since_the_epoch = start.duration_since(UNIX_EPOCH)
|
||||
.expect("Time went backwards");
|
||||
println!("{:?}", since_the_epoch);
|
||||
state.start_pts = Some(since_the_epoch.as_secs() * 1000000000 +
|
||||
since_the_epoch.subsec_nanos() as u64);
|
||||
//TODO Another way to save NDI_recv variable
|
||||
// *state = State{
|
||||
// info: state.info.clone(),
|
||||
// recv: Some(NdiInstance{recv: pNDI_recv}),
|
||||
return hue(element, settings.ip.clone(), settings.stream_name.clone());
|
||||
// if !NDIlib_initialize() {
|
||||
// //println!("Cannot run NDI: NDIlib_initialize error.");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_initialize error"]);
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// let mut source: NDIlib_source_t = NDIlib_source_t{p_ndi_name: ptr::null(),
|
||||
// p_ip_address: ptr::null()};
|
||||
//
|
||||
// // print!("{:?}", settings.stream_name);
|
||||
// // print!("{:?}", settings.ip);
|
||||
//
|
||||
// //TODO default values
|
||||
// let NDI_find_create_desc: NDIlib_find_create_t = Default::default();
|
||||
// let pNDI_find = NDIlib_find_create_v2(&NDI_find_create_desc);
|
||||
// let ip_ptr = CString::new(settings.ip.clone()).unwrap();
|
||||
// if (ip_ptr == CString::new("").unwrap()){
|
||||
// if pNDI_find.is_null() {
|
||||
// //println!("Cannot run NDI: NDIlib_find_create_v2 error.");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_find_create_v2 error"]);
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// let mut total_sources: u32 = 0;
|
||||
// let mut p_sources = ptr::null();
|
||||
// //TODO Delete while. If not, will loop until a source it's available
|
||||
// //while total_sources == 0 {
|
||||
// // TODO Sleep 1s to wait for all sources
|
||||
// thread::sleep(time::Duration::from_millis(2000));
|
||||
// p_sources = NDIlib_find_get_current_sources(pNDI_find, &mut total_sources as *mut u32);
|
||||
// //}
|
||||
//
|
||||
// // We need at least one source
|
||||
// if p_sources.is_null() {
|
||||
// //println!("Error getting NDIlib_find_get_current_sources.");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Error getting NDIlib_find_get_current_sources"]);
|
||||
// return false;
|
||||
// //::std::process::exit(1);
|
||||
// }
|
||||
//
|
||||
// let mut no_source: isize = -1;
|
||||
// for i in 0..total_sources as isize{
|
||||
// if CStr::from_ptr((*p_sources.offset(i)).p_ndi_name)
|
||||
// .to_string_lossy()
|
||||
// .into_owned() == settings.stream_name{
|
||||
// no_source = i;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// if no_source == -1 {
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Stream name not found"]);
|
||||
// return false;
|
||||
// }
|
||||
// println!(
|
||||
// "Total_sources {}: Name '{}' Address '{}'",
|
||||
// total_sources,
|
||||
// CStr::from_ptr((*p_sources.offset(no_source)).p_ndi_name)
|
||||
// .to_string_lossy()
|
||||
// .into_owned(),
|
||||
// CStr::from_ptr((*p_sources.offset(no_source)).p_ip_address)
|
||||
// .to_string_lossy()
|
||||
// .into_owned()
|
||||
// );
|
||||
// source = *p_sources.offset(no_source).clone();
|
||||
// }
|
||||
// else{
|
||||
// source.p_ip_address = ip_ptr.as_ptr();
|
||||
// println!(
|
||||
// "Address '{}'",
|
||||
// CStr::from_ptr(source.p_ip_address)
|
||||
// .to_string_lossy()
|
||||
// .into_owned()
|
||||
// );
|
||||
// }
|
||||
//
|
||||
// // We now have at least one source, so we create a receiver to look at it.
|
||||
// // We tell it that we prefer YCbCr video since it is more efficient for us. If the source has an alpha channel
|
||||
// // it will still be provided in BGRA
|
||||
// let p_ndi_name = CString::new("Galicaster NDI Receiver").unwrap();
|
||||
// let NDI_recv_create_desc = NDIlib_recv_create_v3_t {
|
||||
// source_to_connect_to: source,
|
||||
// p_ndi_name: p_ndi_name.as_ptr(),
|
||||
// ..Default::default()
|
||||
// };
|
||||
//
|
||||
// let pNDI_recv = NDIlib_recv_create_v3(&NDI_recv_create_desc);
|
||||
// if pNDI_recv.is_null() {
|
||||
// //println!("Cannot run NDI: NDIlib_recv_create_v3 error.");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Cannot run NDI: NDIlib_recv_create_v3 error"]);
|
||||
// return false;
|
||||
// //::std::process::exit(1);
|
||||
// }
|
||||
//
|
||||
// // Destroy the NDI finder. We needed to have access to the pointers to p_sources[0]
|
||||
// NDIlib_find_destroy(pNDI_find);
|
||||
//
|
||||
// // We are now going to mark this source as being on program output for tally purposes (but not on preview)
|
||||
// let tally_state: NDIlib_tally_t = Default::default();
|
||||
// NDIlib_recv_set_tally(pNDI_recv, &tally_state);
|
||||
//
|
||||
// // Enable Hardwqre Decompression support if this support has it. Please read the caveats in the documentation
|
||||
// // regarding this. There are times in which it might reduce the performance although on small stream numbers
|
||||
// // it almost always yields the same or better performance.
|
||||
// let data = CString::new("<ndi_hwaccel enabled=\"true\"/>").unwrap();
|
||||
// let enable_hw_accel = NDIlib_metadata_frame_t {
|
||||
// length: data.to_bytes().len() as i32,
|
||||
// timecode: 0,
|
||||
// p_data: data.as_ptr(),
|
||||
// };
|
||||
//
|
||||
// NDIlib_recv_send_metadata(pNDI_recv, &enable_hw_accel);
|
||||
// state.recv = Some(NdiInstance{recv: pNDI_recv});
|
||||
// let start = SystemTime::now();
|
||||
// let since_the_epoch = start.duration_since(UNIX_EPOCH)
|
||||
// .expect("Time went backwards");
|
||||
// println!("{:?}", since_the_epoch);
|
||||
// state.start_pts = Some(since_the_epoch.as_secs() * 1000000000 +
|
||||
// since_the_epoch.subsec_nanos() as u64);
|
||||
// //TODO Another way to save NDI_recv variable
|
||||
// // *state = State{
|
||||
// // info: state.info.clone(),
|
||||
// // recv: Some(NdiInstance{recv: pNDI_recv}),
|
||||
// // };
|
||||
}
|
||||
|
||||
true
|
||||
// true
|
||||
}
|
||||
|
||||
// Called when shutting down the element so we can release all stream-related state
|
||||
fn stop(&self, element: &BaseSrc) -> bool {
|
||||
// Reset state
|
||||
let state = self.state.lock().unwrap();
|
||||
let recv = match state.recv{
|
||||
None => {
|
||||
//println!("pNDI_recv no encontrado");
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
return true;
|
||||
}
|
||||
Some(ref recv) => recv.clone(),
|
||||
};
|
||||
let pNDI_recv = recv.recv;
|
||||
unsafe{
|
||||
NDIlib_recv_destroy(pNDI_recv);
|
||||
//NDIlib_destroy();
|
||||
}
|
||||
// let recv = match state.recv{
|
||||
// None => {
|
||||
// //println!("pNDI_recv no encontrado");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
// return true;
|
||||
// }
|
||||
// Some(ref recv) => recv.clone(),
|
||||
// };
|
||||
// let pNDI_recv = recv.recv;
|
||||
// unsafe{
|
||||
// let recv = match ndi2.recv{
|
||||
// None => {
|
||||
// //println!("pNDI_recv no encontrado");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
// return true;
|
||||
// }
|
||||
// Some(ref recv) => recv.clone(),
|
||||
// };
|
||||
// let pNDI_recv = recv.recv;
|
||||
// NDIlib_recv_destroy(pNDI_recv);
|
||||
// //NDIlib_destroy();
|
||||
// }
|
||||
stop_ndi();
|
||||
// Commented because when adding ndi destroy stopped in this line
|
||||
//*self.state.lock().unwrap() = Default::default();
|
||||
self.unlock(element);
|
||||
|
@ -512,7 +531,20 @@ impl NdiVideoSrc {
|
|||
fn fixate(&self, element: &BaseSrc, caps: gst::Caps) -> gst::Caps {
|
||||
//We need to set the correct caps resolution and framerate
|
||||
let state = self.state.lock().unwrap();
|
||||
let recv = match state.recv{
|
||||
// let recv = match state.recv{
|
||||
// None => {
|
||||
// //TODO Update gst_element_error with one more descriptive
|
||||
// //println!("pNDI_recv no encontrado");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
// //TODO if none not return anything
|
||||
// return caps;
|
||||
// }
|
||||
// Some(ref recv) => recv.clone(),
|
||||
// };
|
||||
//
|
||||
// let pNDI_recv = recv.recv;
|
||||
unsafe{
|
||||
let recv = match ndi2.recv{
|
||||
None => {
|
||||
//TODO Update gst_element_error with one more descriptive
|
||||
//println!("pNDI_recv no encontrado");
|
||||
|
@ -544,6 +576,7 @@ impl NdiVideoSrc {
|
|||
// called Caps::fixate() here
|
||||
element.parent_fixate(caps)
|
||||
}
|
||||
}
|
||||
|
||||
//Creates the audio buffers
|
||||
fn create(
|
||||
|
@ -569,7 +602,18 @@ impl NdiVideoSrc {
|
|||
};
|
||||
//let mut pNDI_recva = ptr::null();
|
||||
// {
|
||||
let recv = match state.recv{
|
||||
// let recv = match state.recv{
|
||||
// None => {
|
||||
// //TODO Update gst_element_error with one more descriptive
|
||||
// //println!("pNDI_recv no encontrado");
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["No encontramos ndi recv"]);
|
||||
// return Err(gst::FlowReturn::NotNegotiated);
|
||||
// }
|
||||
// Some(ref recv) => recv.clone(),
|
||||
// };
|
||||
// let pNDI_recv = recv.recv;
|
||||
unsafe{
|
||||
let recv = match ndi2.recv{
|
||||
None => {
|
||||
//TODO Update gst_element_error with one more descriptive
|
||||
//println!("pNDI_recv no encontrado");
|
||||
|
@ -581,7 +625,15 @@ impl NdiVideoSrc {
|
|||
let pNDI_recv = recv.recv;
|
||||
// }
|
||||
|
||||
let start_pts = match state.start_pts {
|
||||
// let start_pts = match state.start_pts {
|
||||
// None => {
|
||||
// gst_element_error!(element, gst::CoreError::Negotiation, ["Have no caps yet"]);
|
||||
// return Err(gst::FlowReturn::NotNegotiated);
|
||||
// }
|
||||
// Some(ref start_pts) => start_pts.clone(),
|
||||
// };
|
||||
|
||||
let start_pts = match ndi2.start_pts {
|
||||
None => {
|
||||
gst_element_error!(element, gst::CoreError::Negotiation, ["Have no caps yet"]);
|
||||
return Err(gst::FlowReturn::NotNegotiated);
|
||||
|
@ -705,7 +757,7 @@ impl NdiVideoSrc {
|
|||
Ok(buffer)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue