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-09-24 13:00:12 +00:00
Code Issues Projects Releases Wiki Activity

FIX: changed return bool to errorMessages

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

13
src/ndiaudiosrc.rs
View file

@ -152,7 +152,8 @@ impl ObjectSubclass for NdiAudioSrc {
gst::PadDirection::Src,
gst::PadPresence::Always,
&caps,
);
)
.unwrap();
klass.add_pad_template(src_pad_template);
klass.install_properties(&PROPERTIES);
@ -285,7 +286,7 @@ impl ObjectSubclass for NdiAudioSrc {
impl BaseSrcImpl for NdiAudioSrc {
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,
None => return Err(gst_loggable_error!(self.cat, "Failed to build `AudioInfo` from caps {}", caps)),
Some(info) => info,
};
@ -294,7 +295,7 @@ impl ObjectSubclass for NdiAudioSrc {
let mut state = self.state.lock().unwrap();
state.info = Some(info);
true
Ok(())
}
fn start(&self, element: &gst_base::BaseSrc) -> Result<(), gst::ErrorMessage> {
@ -308,7 +309,7 @@ impl ObjectSubclass for NdiAudioSrc {
&settings.stream_name.clone(),
);
settings.id_receiver != 0
Ok(())
}
fn stop(&self, element: &gst_base::BaseSrc) -> Result<(), gst::ErrorMessage> {
@ -318,7 +319,7 @@ impl ObjectSubclass for NdiAudioSrc {
stop_ndi(self.cat, element, settings.id_receiver);
// Commented because when adding ndi destroy stopped in this line
//*self.state.lock().unwrap() = Default::default();
true
Ok(())
}
fn query(&self, element: &gst_base::BaseSrc, query: &mut gst::QueryRef) -> bool {
@ -341,7 +342,7 @@ impl ObjectSubclass for NdiAudioSrc {
return false;
}
}
BaseSrcImpl::parent_query(self, element, query)
BaseSrcImplExt::parent_query(self, element, query)
}
fn fixate(&self, element: &gst_base::BaseSrc, caps: gst::Caps) -> gst::Caps {

15
src/ndivideosrc.rs
View file

@ -160,7 +160,7 @@ impl ObjectSubclass for NdiVideoSrc {
gst::PadDirection::Src,
gst::PadPresence::Always,
&caps,
);
).unwrap();
klass.add_pad_template(src_pad_template);
klass.install_properties(&PROPERTIES);
@ -295,7 +295,7 @@ impl ObjectSubclass for NdiVideoSrc {
impl BaseSrcImpl for NdiVideoSrc {
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,
None => return Err(gst_loggable_error!(self.cat, "Failed to build `VideoInfo` from caps {}", caps)),
Some(info) => info,
};
gst_debug!(self.cat, obj: element, "Configuring for caps {}", caps);
@ -303,7 +303,7 @@ impl ObjectSubclass for NdiVideoSrc {
let mut state = self.state.lock().unwrap();
state.info = Some(info);
let _ = element.post_message(&gst::Message::new_latency().src(Some(element)).build());
true
Ok(())
}
fn start(&self, element: &gst_base::BaseSrc) -> Result<(), gst::ErrorMessage> {
@ -316,17 +316,18 @@ impl ObjectSubclass for NdiVideoSrc {
&settings.stream_name.clone(),
);
settings.id_receiver != 0
// settings.id_receiver != 0
Ok(())
}
fn stop(&self, element: &gst_base::BaseSrc) -> Result<(), gst::ErrorMessage> {
*self.state.lock().unwrap() = Default::default();
*self.state.lock().unwrap() = Default::default();
let settings = self.settings.lock().unwrap();
stop_ndi(self.cat, element, settings.id_receiver);
// Commented because when adding ndi destroy stopped in this line
//*self.state.lock().unwrap() = Default::default();
true
Ok(())
}
fn query(&self, element: &gst_base::BaseSrc, query: &mut gst::QueryRef) -> bool {
@ -349,7 +350,7 @@ impl ObjectSubclass for NdiVideoSrc {
return false;
}
}
BaseSrcImpl::parent_query(self, element, query)
BaseSrcImplExt::parent_query(self, element, query)
}
fn fixate(&self, element: &gst_base::BaseSrc, caps: gst::Caps) -> gst::Caps {