mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-06-23 00:20:34 +00:00
Code Issues Projects Releases Wiki Activity

WIP: changed return type for status_change, start, stop, change_caps,...

Browse source
This commit is contained in:
o-reo 2019-02-28 10:55:01 +01:00
parent 127dbca2f5
commit c1f0b8e941
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ndiaudiosrc.rs
View file

@ -46,7 +46,7 @@ impl Default for Settings {
}
static PROPERTIES: [subclass::Property; 3] = [
subclass::Property("stream-name", || {
subclass::Property("stream-name", |_| {
glib::ParamSpec::string(
"stream-name",
"Sream Name",
@ -55,7 +55,7 @@ subclass::Property("stream-name", || {
glib::ParamFlags::READWRITE,
)
}),
subclass::Property("ip", || {
subclass::Property("ip", |_| {
glib::ParamSpec::string(
"ip",
"Stream IP",
@ -64,7 +64,7 @@ subclass::Property("ip", || {
glib::ParamFlags::READWRITE,
)
}),
subclass::Property("loss-threshold", || {
subclass::Property("loss-threshold", |_| {
glib::ParamSpec::uint(
"loss-threshold",
"Loss threshold",
@ -246,7 +246,7 @@ impl ObjectSubclass for NdiAudioSrc {
&self,
element: &gst::Element,
transition: gst::StateChange,
) -> gst::StateChangeReturn {
) -> Result<gst::StateChangeSuccess, gst::StateChangeError> {
if transition == gst::StateChange::PausedToPlaying {
let mut receivers = hashmap_receivers.lock().unwrap();
let settings = self.settings.lock().unwrap();
@ -283,7 +283,7 @@ impl ObjectSubclass for NdiAudioSrc {
}
impl BaseSrcImpl for NdiAudioSrc {
fn set_caps(&self, element: &gst_base::BaseSrc, caps: &gst::CapsRef) -> bool {
fn set_caps(&self, element: &gst_base::BaseSrc, caps: &gst::CapsRef) -> Result<(), gst::LoggableError> {
let info = match gst_audio::AudioInfo::from_caps(caps) {
None => return false,
Some(info) => info,
@ -297,7 +297,7 @@ impl ObjectSubclass for NdiAudioSrc {
true
}
fn start(&self, element: &gst_base::BaseSrc) -> bool {
fn start(&self, element: &gst_base::BaseSrc) -> Result<(), gst::ErrorMessage> {
*self.state.lock().unwrap() = Default::default();
let mut settings = self.settings.lock().unwrap();
@ -311,7 +311,7 @@ impl ObjectSubclass for NdiAudioSrc {
settings.id_receiver != 0
}
fn stop(&self, element: &gst_base::BaseSrc) -> bool {
fn stop(&self, element: &gst_base::BaseSrc) -> Result<(), gst::ErrorMessage> {
*self.state.lock().unwrap() = Default::default();
let settings = self.settings.lock().unwrap();
@ -431,7 +431,7 @@ impl ObjectSubclass for NdiAudioSrc {
let buffer = gst::Buffer::with_size(0).unwrap();
return Ok(buffer)
}
if time >= (audio_frame.timestamp as u64) {
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 {

14
src/ndivideosrc.rs
View file

@ -47,7 +47,7 @@ impl Default for Settings {
}
static PROPERTIES: [subclass::Property; 3] = [
subclass::Property("stream-name", || {
subclass::Property("stream-name", |_| {
glib::ParamSpec::string(
"stream-name",
"Stream Name",
@ -56,7 +56,7 @@ subclass::Property("stream-name", || {
glib::ParamFlags::READWRITE,
)
}),
subclass::Property("ip", || {
subclass::Property("ip", |_| {
glib::ParamSpec::string(
"ip",
"Stream IP",
@ -65,7 +65,7 @@ subclass::Property("ip", || {
glib::ParamFlags::READWRITE,
)
}),
subclass::Property("loss-threshold", || {
subclass::Property("loss-threshold", |_| {
glib::ParamSpec::uint(
"loss-threshold",
"Loss threshold",
@ -256,7 +256,7 @@ impl ObjectSubclass for NdiVideoSrc {
&self,
element: &gst::Element,
transition: gst::StateChange,
) -> gst::StateChangeReturn {
) -> Result<gst::StateChangeSuccess, gst::StateChangeError> {
if transition == gst::StateChange::PausedToPlaying {
let mut receivers = hashmap_receivers.lock().unwrap();
let settings = self.settings.lock().unwrap();
@ -293,7 +293,7 @@ impl ObjectSubclass for NdiVideoSrc {
}
impl BaseSrcImpl for NdiVideoSrc {
fn set_caps(&self, element: &gst_base::BaseSrc, caps: &gst::CapsRef) -> bool {
fn set_caps(&self, element: &gst_base::BaseSrc, caps: &gst::CapsRef) -> Result<(), gst::LoggableError> {
let info = match gst_video::VideoInfo::from_caps(caps) {
None => return false,
Some(info) => info,
@ -306,7 +306,7 @@ impl ObjectSubclass for NdiVideoSrc {
true
}
fn start(&self, element: &gst_base::BaseSrc) -> bool {
fn start(&self, element: &gst_base::BaseSrc) -> Result<(), gst::ErrorMessage> {
*self.state.lock().unwrap() = Default::default();
let mut settings = self.settings.lock().unwrap();
settings.id_receiver = connect_ndi(
@ -319,7 +319,7 @@ impl ObjectSubclass for NdiVideoSrc {
settings.id_receiver != 0
}
fn stop(&self, element: &gst_base::BaseSrc) -> bool {
fn stop(&self, element: &gst_base::BaseSrc) -> Result<(), gst::ErrorMessage> {
*self.state.lock().unwrap() = Default::default();
let settings = self.settings.lock().unwrap();