net: Actually create an PTP clock instead of NTP clock

This commit is contained in:
Christian Meissl 2018-11-15 16:19:54 +01:00 committed by Sebastian Dröge
parent e7f32334c5
commit 533e4af669

View file

@ -14,36 +14,21 @@ use glib::translate::*;
use gst; use gst;
impl PtpClock { impl PtpClock {
pub fn new<'a, P: Into<Option<&'a str>>>( pub fn new<'a, P: Into<Option<&'a str>>>(name: P, domain: u32) -> PtpClock {
name: P,
remote_address: &str,
remote_port: i32,
base_time: gst::ClockTime,
) -> PtpClock {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
let name = name.into(); let name = name.into();
let name = name.to_glib_none(); let name = name.to_glib_none();
let (major, minor, _, _) = gst::version(); let (major, minor, _, _) = gst::version();
if (major, minor) > (1, 12) { if (major, minor) > (1, 12) {
unsafe { unsafe {
gst::Clock::from_glib_full(ffi::gst_ntp_clock_new( gst::Clock::from_glib_full(ffi::gst_ptp_clock_new(name.0, domain))
name.0, .downcast_unchecked()
remote_address.to_glib_none().0,
remote_port,
base_time.to_glib(),
))
.downcast_unchecked()
} }
} else { } else {
// Workaround for bad floating reference handling in 1.12. This issue was fixed for 1.13 // Workaround for bad floating reference handling in 1.12. This issue was fixed for 1.13
unsafe { unsafe {
gst::Clock::from_glib_none(ffi::gst_ntp_clock_new( gst::Clock::from_glib_none(ffi::gst_ptp_clock_new(name.0, domain))
name.0, .downcast_unchecked()
remote_address.to_glib_none().0,
remote_port,
base_time.to_glib(),
))
.downcast_unchecked()
} }
} }
} }