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-11-29 23:11:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #45 from sdroege/update-to-gstreamer-0.15

Browse source 
Update to gstreamer 0.15 and byte-slice-cast 0.3
This commit is contained in:
Alfonso Rodríguez Pereira 2019-12-23 16:24:30 +01:00 committed by GitHub
commit edcb10820d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Cargo.toml
View file

@ -8,14 +8,14 @@ description = "NewTek NDI Plugin"
edition = "2018" edition = "2018"
[dependencies] [dependencies]
glib = { version = "0.8.0", features = ["subclassing"] } glib = "0.9"
gobject-sys = "0.9" gobject-sys = "0.9"
gstreamer = { version = "0.14.4", features = ["subclassing", "v1_12"] } gstreamer = { version = "0.15", features = ["v1_12"] }
gstreamer-base = { version = "0.14.0", features = ["subclassing"] } gstreamer-base = "0.15"
gstreamer-audio = "0.14.0" gstreamer-audio = "0.15"
gstreamer-video = { version = "0.14.3", features = ["v1_12"] } gstreamer-video = { version = "0.15", features = ["v1_12"] }
lazy_static = "1.1.0" lazy_static = "1.1.0"
byte-slice-cast = "0.2.0" byte-slice-cast = "0.3.0"
[build-dependencies] [build-dependencies]
gst-plugin-version-helper = "0.1" gst-plugin-version-helper = "0.1"

16
src/ndiaudiosrc.rs
View file

@ -217,7 +217,7 @@ impl ObjectImpl for NdiAudioSrc {
match *prop { match *prop {
subclass::Property("ndi-name", ..) => { subclass::Property("ndi-name", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let ndi_name = value.get(); let ndi_name = value.get().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -229,7 +229,7 @@ impl ObjectImpl for NdiAudioSrc {
} }
subclass::Property("ip-address", ..) => { subclass::Property("ip-address", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let ip_address = value.get(); let ip_address = value.get().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -241,7 +241,7 @@ impl ObjectImpl for NdiAudioSrc {
} }
subclass::Property("receiver-ndi-name", ..) => { subclass::Property("receiver-ndi-name", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let receiver_ndi_name = value.get(); let receiver_ndi_name = value.get().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -254,7 +254,7 @@ impl ObjectImpl for NdiAudioSrc {
} }
subclass::Property("connect-timeout", ..) => { subclass::Property("connect-timeout", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let connect_timeout = value.get().unwrap(); let connect_timeout = value.get_some().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -266,7 +266,7 @@ impl ObjectImpl for NdiAudioSrc {
} }
subclass::Property("timeout", ..) => { subclass::Property("timeout", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let timeout = value.get().unwrap(); let timeout = value.get_some().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -278,7 +278,7 @@ impl ObjectImpl for NdiAudioSrc {
} }
subclass::Property("bandwidth", ..) => { subclass::Property("bandwidth", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let bandwidth = value.get().unwrap(); let bandwidth = value.get_some().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -290,7 +290,7 @@ impl ObjectImpl for NdiAudioSrc {
} }
subclass::Property("timestamp-mode", ..) => { subclass::Property("timestamp-mode", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let timestamp_mode = value.get().unwrap(); let timestamp_mode = value.get_some().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -518,7 +518,7 @@ impl BaseSrcImpl for NdiAudioSrc {
let mut state = self.state.lock().unwrap(); let mut state = self.state.lock().unwrap();
state.receiver = Some(recv); state.receiver = Some(recv);
if state.info.as_ref() != Some(&info) { if state.info.as_ref() != Some(&info) {
let caps = info.to_caps().ok_or_else(|| { let caps = info.to_caps().map_err(|_| {
gst_element_error!( gst_element_error!(
element, element,
gst::ResourceError::Settings, gst::ResourceError::Settings,

16
src/ndivideosrc.rs
View file

@ -252,7 +252,7 @@ impl ObjectImpl for NdiVideoSrc {
match *prop { match *prop {
subclass::Property("ndi-name", ..) => { subclass::Property("ndi-name", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let ndi_name = value.get(); let ndi_name = value.get().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -264,7 +264,7 @@ impl ObjectImpl for NdiVideoSrc {
} }
subclass::Property("ip-address", ..) => { subclass::Property("ip-address", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let ip_address = value.get(); let ip_address = value.get().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -276,7 +276,7 @@ impl ObjectImpl for NdiVideoSrc {
} }
subclass::Property("receiver-ndi-name", ..) => { subclass::Property("receiver-ndi-name", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let receiver_ndi_name = value.get(); let receiver_ndi_name = value.get().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -289,7 +289,7 @@ impl ObjectImpl for NdiVideoSrc {
} }
subclass::Property("connect-timeout", ..) => { subclass::Property("connect-timeout", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let connect_timeout = value.get().unwrap(); let connect_timeout = value.get_some().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -301,7 +301,7 @@ impl ObjectImpl for NdiVideoSrc {
} }
subclass::Property("timeout", ..) => { subclass::Property("timeout", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let timeout = value.get().unwrap(); let timeout = value.get_some().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -313,7 +313,7 @@ impl ObjectImpl for NdiVideoSrc {
} }
subclass::Property("bandwidth", ..) => { subclass::Property("bandwidth", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let bandwidth = value.get().unwrap(); let bandwidth = value.get_some().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -325,7 +325,7 @@ impl ObjectImpl for NdiVideoSrc {
} }
subclass::Property("timestamp-mode", ..) => { subclass::Property("timestamp-mode", ..) => {
let mut settings = self.settings.lock().unwrap(); let mut settings = self.settings.lock().unwrap();
let timestamp_mode = value.get().unwrap(); let timestamp_mode = value.get_some().unwrap();
gst_debug!( gst_debug!(
self.cat, self.cat,
obj: basesrc, obj: basesrc,
@ -557,7 +557,7 @@ impl BaseSrcImpl for NdiVideoSrc {
let mut state = self.state.lock().unwrap(); let mut state = self.state.lock().unwrap();
state.receiver = Some(recv); state.receiver = Some(recv);
if state.info.as_ref() != Some(&info) { if state.info.as_ref() != Some(&info) {
let caps = info.to_caps().ok_or_else(|| { let caps = info.to_caps().map_err(|_| {
gst_element_error!( gst_element_error!(
element, element,
gst::ResourceError::Settings, gst::ResourceError::Settings,

6
src/receiver.rs
View file

@ -1292,7 +1292,7 @@ impl Receiver<VideoReceiver> {
builder = builder.field_order(gst_video::VideoFieldOrder::TopFieldFirst); builder = builder.field_order(gst_video::VideoFieldOrder::TopFieldFirst);
} }
builder.build().ok_or_else(|| { builder.build().map_err(|_| {
gst_element_error!( gst_element_error!(
element, element,
gst::StreamError::Format, gst::StreamError::Format,
@ -1341,7 +1341,7 @@ impl Receiver<VideoReceiver> {
builder = builder.field_order(gst_video::VideoFieldOrder::TopFieldFirst); builder = builder.field_order(gst_video::VideoFieldOrder::TopFieldFirst);
} }
builder.build().ok_or_else(|| { builder.build().map_err(|_| {
gst_element_error!( gst_element_error!(
element, element,
gst::StreamError::Format, gst::StreamError::Format,
@ -1666,7 +1666,7 @@ impl Receiver<AudioReceiver> {
audio_frame.no_channels() as u32, audio_frame.no_channels() as u32,
); );
builder.build().ok_or_else(|| { builder.build().map_err(|_| {
gst_element_error!( gst_element_error!(
element, element,
gst::StreamError::Format, gst::StreamError::Format,