mirror of
https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git
synced 2024-06-30 03:50:34 +00:00
Indent and clean warnings
This commit is contained in:
parent
07a8b8a274
commit
3b4ae6c00e
|
@ -26,7 +26,6 @@ mod ndivideosrc;
|
||||||
mod ndiaudiosrc;
|
mod ndiaudiosrc;
|
||||||
pub mod ndilib;
|
pub mod ndilib;
|
||||||
|
|
||||||
use std::ptr;
|
|
||||||
use std::{thread, time};
|
use std::{thread, time};
|
||||||
//use std::time::{SystemTime, UNIX_EPOCH};
|
//use std::time::{SystemTime, UNIX_EPOCH};
|
||||||
use std::ffi::{CStr, CString};
|
use std::ffi::{CStr, CString};
|
||||||
|
@ -46,16 +45,6 @@ fn plugin_init(plugin: &gst::Plugin) -> bool {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
struct Ndi{
|
|
||||||
recv: Option<NdiInstance>,
|
|
||||||
start_pts: u64,
|
|
||||||
}
|
|
||||||
|
|
||||||
static mut ndi_struct: Ndi = Ndi{
|
|
||||||
recv: None,
|
|
||||||
start_pts: 0,
|
|
||||||
};
|
|
||||||
|
|
||||||
struct ndi_receiver_info{
|
struct ndi_receiver_info{
|
||||||
stream_name: String,
|
stream_name: String,
|
||||||
ip: String,
|
ip: String,
|
||||||
|
@ -67,7 +56,7 @@ struct ndi_receiver_info{
|
||||||
|
|
||||||
lazy_static! {
|
lazy_static! {
|
||||||
static ref hashmap_receivers: Mutex<HashMap<i8, ndi_receiver_info>> = {
|
static ref hashmap_receivers: Mutex<HashMap<i8, ndi_receiver_info>> = {
|
||||||
let mut m = HashMap::new();
|
let m = HashMap::new();
|
||||||
Mutex::new(m)
|
Mutex::new(m)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@ -84,7 +73,7 @@ fn connect_ndi(cat: gst::DebugCategory , element: &BaseSrc, ip: String, stream
|
||||||
id_receiver += 1;
|
id_receiver += 1;
|
||||||
|
|
||||||
//FIXME Search for another way to know if the source is an audio or a video source
|
//FIXME Search for another way to know if the source is an audio or a video source
|
||||||
if (element.get_name().contains("audiosrc")){
|
if element.get_name().contains("audiosrc"){
|
||||||
audio = true;
|
audio = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -93,12 +82,12 @@ fn connect_ndi(cat: gst::DebugCategory , element: &BaseSrc, ip: String, stream
|
||||||
}
|
}
|
||||||
|
|
||||||
for val in receivers.values_mut(){
|
for val in receivers.values_mut(){
|
||||||
if (val.ip == ip || val.stream_name == stream_name){
|
if val.ip == ip || val.stream_name == stream_name{
|
||||||
if ((val.audio && val.video) || (val.audio && audio) || (val.video && video)){
|
if (val.audio && val.video) || (val.audio && audio) || (val.video && video){
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (video){
|
if video {
|
||||||
val.video = video;
|
val.video = video;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
@ -116,13 +105,10 @@ fn connect_ndi(cat: gst::DebugCategory , element: &BaseSrc, ip: String, stream
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut source: NDIlib_source_t = NDIlib_source_t{p_ndi_name: ptr::null(),
|
|
||||||
p_ip_address: ptr::null()};
|
|
||||||
|
|
||||||
//TODO default values
|
//TODO default values
|
||||||
let NDI_find_create_desc: NDIlib_find_create_t = Default::default();
|
let NDI_find_create_desc: NDIlib_find_create_t = Default::default();
|
||||||
let pNDI_find = NDIlib_find_create_v2(&NDI_find_create_desc);
|
let pNDI_find = NDIlib_find_create_v2(&NDI_find_create_desc);
|
||||||
let ip_ptr = CString::new(ip.clone()).unwrap();
|
//let ip_ptr = CString::new(ip.clone()).unwrap();
|
||||||
if pNDI_find.is_null() {
|
if pNDI_find.is_null() {
|
||||||
gst_element_error!(element, gst::CoreError::Negotiation, ["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;
|
// return false;
|
||||||
|
@ -145,8 +131,8 @@ fn connect_ndi(cat: gst::DebugCategory , element: &BaseSrc, ip: String, stream
|
||||||
|
|
||||||
let mut no_source: isize = -1;
|
let mut no_source: isize = -1;
|
||||||
for i in 0..total_sources as isize{
|
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 ||
|
if CStr::from_ptr((*p_sources.offset(i)).p_ndi_name).to_string_lossy().into_owned() == stream_name ||
|
||||||
CStr::from_ptr((*p_sources.offset(i)).p_ip_address).to_string_lossy().into_owned() == ip){
|
CStr::from_ptr((*p_sources.offset(i)).p_ip_address).to_string_lossy().into_owned() == ip{
|
||||||
no_source = i;
|
no_source = i;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -165,7 +151,7 @@ fn connect_ndi(cat: gst::DebugCategory , element: &BaseSrc, ip: String, stream
|
||||||
.to_string_lossy()
|
.to_string_lossy()
|
||||||
.into_owned());
|
.into_owned());
|
||||||
|
|
||||||
source = *p_sources.offset(no_source).clone();
|
let source = *p_sources.offset(no_source).clone();
|
||||||
|
|
||||||
let source_ip = CStr::from_ptr(source.p_ip_address).to_string_lossy().into_owned();
|
let source_ip = CStr::from_ptr(source.p_ip_address).to_string_lossy().into_owned();
|
||||||
let source_name = CStr::from_ptr(source.p_ndi_name).to_string_lossy().into_owned();
|
let source_name = CStr::from_ptr(source.p_ndi_name).to_string_lossy().into_owned();
|
||||||
|
@ -228,7 +214,7 @@ fn stop_ndi(cat: gst::DebugCategory , element: &BaseSrc, id: i8) -> bool{
|
||||||
{
|
{
|
||||||
let val = receivers.get_mut(&id).unwrap();
|
let val = receivers.get_mut(&id).unwrap();
|
||||||
if val.video && val.audio{
|
if val.video && val.audio{
|
||||||
if (element.get_name().contains("audiosrc")){
|
if element.get_name().contains("audiosrc"){
|
||||||
val.audio = false;
|
val.audio = false;
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
|
|
|
@ -18,7 +18,6 @@ use std::ptr;
|
||||||
|
|
||||||
use ndilib::*;
|
use ndilib::*;
|
||||||
use connect_ndi;
|
use connect_ndi;
|
||||||
// use ndi_struct;
|
|
||||||
use stop_ndi;
|
use stop_ndi;
|
||||||
|
|
||||||
use hashmap_receivers;
|
use hashmap_receivers;
|
||||||
|
@ -302,7 +301,7 @@ impl NdiAudioSrc {
|
||||||
//let settings = *self.settings.lock().unwrap();
|
//let settings = *self.settings.lock().unwrap();
|
||||||
let state = self.state.lock().unwrap();
|
let state = self.state.lock().unwrap();
|
||||||
|
|
||||||
if let Some(ref info) = state.info {
|
if let Some(ref _info) = state.info {
|
||||||
// let latency = gst::SECOND
|
// let latency = gst::SECOND
|
||||||
// .mul_div_floor(settings.samples_per_buffer as u64, info.rate() as u64)
|
// .mul_div_floor(settings.samples_per_buffer as u64, info.rate() as u64)
|
||||||
// .unwrap();
|
// .unwrap();
|
||||||
|
@ -311,10 +310,9 @@ impl NdiAudioSrc {
|
||||||
// .mul_div_floor(1 as u64, 30 as u64)
|
// .mul_div_floor(1 as u64, 30 as u64)
|
||||||
// .unwrap();
|
// .unwrap();
|
||||||
// gst_debug!(self.cat, obj: element, "Returning latency {}", latency);
|
// gst_debug!(self.cat, obj: element, "Returning latency {}", latency);
|
||||||
println!("/*/a*f/a*sd/f*ad/sf*ad/sf*ad/sf");
|
|
||||||
let max = latency * 1843200;
|
let max = latency * 1843200;
|
||||||
println!("{:?}", latency);
|
// println!("{:?}", latency);
|
||||||
println!("{:?}",max);
|
// println!("{:?}",max);
|
||||||
q.set(true, latency, max);
|
q.set(true, latency, max);
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
|
@ -344,7 +342,6 @@ impl NdiAudioSrc {
|
||||||
frame_type = NDIlib_recv_capture_v2(pNDI_recv, ptr::null(), &audio_frame, ptr::null(), 1000);
|
frame_type = NDIlib_recv_capture_v2(pNDI_recv, ptr::null(), &audio_frame, ptr::null(), 1000);
|
||||||
}
|
}
|
||||||
|
|
||||||
//ndi_struct.start_pts = audio_frame.timecode as u64;
|
|
||||||
timestamp_data.pts = audio_frame.timecode as u64;
|
timestamp_data.pts = audio_frame.timecode as u64;
|
||||||
|
|
||||||
let mut caps = gst::Caps::truncate(caps);
|
let mut caps = gst::Caps::truncate(caps);
|
||||||
|
@ -387,14 +384,7 @@ impl NdiAudioSrc {
|
||||||
unsafe{
|
unsafe{
|
||||||
let receivers = hashmap_receivers.lock().unwrap();
|
let receivers = hashmap_receivers.lock().unwrap();
|
||||||
|
|
||||||
let mut id = &_settings.stream_name;
|
|
||||||
|
|
||||||
if (&_settings.ip != ""){
|
|
||||||
id = &_settings.ip;
|
|
||||||
}
|
|
||||||
|
|
||||||
let recv = &receivers.get(&_settings.id_receiver).unwrap().ndi_instance;
|
let recv = &receivers.get(&_settings.id_receiver).unwrap().ndi_instance;
|
||||||
|
|
||||||
let pNDI_recv = recv.recv;
|
let pNDI_recv = recv.recv;
|
||||||
|
|
||||||
let pts: u64;
|
let pts: u64;
|
||||||
|
@ -402,7 +392,6 @@ impl NdiAudioSrc {
|
||||||
NDIlib_recv_capture_v2(pNDI_recv, ptr::null(), &audio_frame, ptr::null(), 1000,);
|
NDIlib_recv_capture_v2(pNDI_recv, ptr::null(), &audio_frame, ptr::null(), 1000,);
|
||||||
|
|
||||||
pts = (audio_frame.timecode as u64) - timestamp_data.pts;
|
pts = (audio_frame.timecode as u64) - timestamp_data.pts;
|
||||||
//pts = (audio_frame.timecode as u64) - ndi_struct.start_pts;
|
|
||||||
|
|
||||||
let buff_size = ((audio_frame.channel_stride_in_bytes)) as usize;
|
let buff_size = ((audio_frame.channel_stride_in_bytes)) as usize;
|
||||||
let mut buffer = gst::Buffer::with_size(buff_size).unwrap();
|
let mut buffer = gst::Buffer::with_size(buff_size).unwrap();
|
||||||
|
|
|
@ -19,7 +19,6 @@ use std::ptr;
|
||||||
|
|
||||||
use ndilib::*;
|
use ndilib::*;
|
||||||
use connect_ndi;
|
use connect_ndi;
|
||||||
// use ndi_struct;
|
|
||||||
use stop_ndi;
|
use stop_ndi;
|
||||||
|
|
||||||
use hashmap_receivers;
|
use hashmap_receivers;
|
||||||
|
@ -309,7 +308,7 @@ impl NdiVideoSrc {
|
||||||
//let settings = *self.settings.lock().unwrap();
|
//let settings = *self.settings.lock().unwrap();
|
||||||
let state = self.state.lock().unwrap();
|
let state = self.state.lock().unwrap();
|
||||||
|
|
||||||
if let Some(ref info) = state.info {
|
if let Some(ref _info) = state.info {
|
||||||
// let latency = gst::SECOND
|
// let latency = gst::SECOND
|
||||||
// .mul_div_floor(settings.samples_per_buffer as u64, info.rate() as u64)
|
// .mul_div_floor(settings.samples_per_buffer as u64, info.rate() as u64)
|
||||||
// .unwrap();
|
// .unwrap();
|
||||||
|
@ -318,10 +317,9 @@ impl NdiVideoSrc {
|
||||||
// .mul_div_floor(1 as u64, 30 as u64)
|
// .mul_div_floor(1 as u64, 30 as u64)
|
||||||
// .unwrap();
|
// .unwrap();
|
||||||
// gst_debug!(self.cat, obj: element, "Returning latency {}", latency);
|
// gst_debug!(self.cat, obj: element, "Returning latency {}", latency);
|
||||||
println!("/*/a*f/a*sd/f*ad/sf*ad/sf*ad/sf");
|
|
||||||
let max = latency * 1843200;
|
let max = latency * 1843200;
|
||||||
println!("{:?}", latency);
|
// println!("{:?}", latency);
|
||||||
println!("{:?}",max);
|
// println!("{:?}",max);
|
||||||
q.set(true, latency, max);
|
q.set(true, latency, max);
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
|
@ -353,7 +351,6 @@ impl NdiVideoSrc {
|
||||||
|
|
||||||
//TODO Check that this is working
|
//TODO Check that this is working
|
||||||
timestamp_data.pts = video_frame.timecode as u64;
|
timestamp_data.pts = video_frame.timecode as u64;
|
||||||
//ndi_struct.start_pts = video_frame.timecode as u64;
|
|
||||||
|
|
||||||
let mut caps = gst::Caps::truncate(caps);
|
let mut caps = gst::Caps::truncate(caps);
|
||||||
{
|
{
|
||||||
|
@ -403,7 +400,6 @@ impl NdiVideoSrc {
|
||||||
NDIlib_recv_capture_v2(pNDI_recv, &video_frame, ptr::null(), ptr::null(), 1000,);
|
NDIlib_recv_capture_v2(pNDI_recv, &video_frame, ptr::null(), ptr::null(), 1000,);
|
||||||
|
|
||||||
pts = (video_frame.timecode as u64) - timestamp_data.pts;
|
pts = (video_frame.timecode as u64) - timestamp_data.pts;
|
||||||
//pts = (video_frame.timecode as u64) - ndi_struct.start_pts;
|
|
||||||
|
|
||||||
let buff_size = (video_frame.yres * video_frame.line_stride_in_bytes) as usize;
|
let buff_size = (video_frame.yres * video_frame.line_stride_in_bytes) as usize;
|
||||||
//println!("{:?}", buff_size);
|
//println!("{:?}", buff_size);
|
||||||
|
|
Loading…
Reference in a new issue