From d418278dbad78ec8511314933e31f42854f67fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 15 Sep 2019 10:18:42 +0300 Subject: [PATCH] audio/video: Add decoder base class error macros --- gstreamer-audio/Cargo.toml | 1 + gstreamer-audio/src/audio_decoder.rs | 128 +++++++++++++++++++++++++++ gstreamer-video/src/video_decoder.rs | 127 ++++++++++++++++++++++++++ 3 files changed, 256 insertions(+) diff --git a/gstreamer-audio/Cargo.toml b/gstreamer-audio/Cargo.toml index 77abcb02f..6dcfbb934 100644 --- a/gstreamer-audio/Cargo.toml +++ b/gstreamer-audio/Cargo.toml @@ -13,6 +13,7 @@ keywords = ["gstreamer", "multimedia", "audio", "video", "gnome"] build = "build.rs" [dependencies] +libc = "0.2" bitflags = "1.0" glib-sys = { version = "0.9" } gobject-sys = { version = "0.9" } diff --git a/gstreamer-audio/src/audio_decoder.rs b/gstreamer-audio/src/audio_decoder.rs index 672ad13be..429200e10 100644 --- a/gstreamer-audio/src/audio_decoder.rs +++ b/gstreamer-audio/src/audio_decoder.rs @@ -15,6 +15,20 @@ use std::ptr; use AudioDecoder; use AudioInfo; +extern "C" { + fn _gst_audio_decoder_error( + dec: *mut gst_audio_sys::GstAudioDecoder, + weight: i32, + domain: glib_sys::GQuark, + code: i32, + txt: *mut libc::c_char, + debug: *mut libc::c_char, + file: *const libc::c_char, + function: *const libc::c_char, + line: i32, + ) -> gst_sys::GstFlowReturn; +} + pub trait AudioDecoderExtManual: 'static { fn finish_frame( &self, @@ -36,6 +50,18 @@ pub trait AudioDecoderExtManual: 'static { fn set_output_format(&self, info: &AudioInfo) -> Result<(), gst::FlowError>; fn get_allocator(&self) -> (gst::Allocator, gst::AllocationParams); + + #[allow(clippy::too_many_arguments)] + fn error( + &self, + weight: i32, + code: T, + message: Option<&str>, + debug: Option<&str>, + file: &str, + function: &str, + line: u32, + ) -> Result; } impl> AudioDecoderExtManual for O { @@ -122,4 +148,106 @@ impl> AudioDecoderExtManual for O { (from_glib_full(allocator), params.into()) } } + + fn error( + &self, + weight: i32, + code: T, + message: Option<&str>, + debug: Option<&str>, + file: &str, + function: &str, + line: u32, + ) -> Result { + let ret: gst::FlowReturn = unsafe { + from_glib(_gst_audio_decoder_error( + self.as_ref().to_glib_none().0, + weight, + T::domain().to_glib(), + code.code(), + message.to_glib_full(), + debug.to_glib_full(), + file.to_glib_none().0, + function.to_glib_none().0, + line as i32, + )) + }; + ret.into_result() + } } + +#[macro_export] +macro_rules! gst_audio_decoder_error( + ($obj:expr, $weight:expr, $err:expr, ($msg:expr), [$debug:expr]) => { { + use $crate::AudioDecoderExtManual; + $obj.error( + $weight, + $err, + Some($msg), + Some($debug), + file!(), + module_path!(), + line!(), + ) + }}; + ($obj:expr, $weight:expr, $err:expr, ($msg:expr)) => { { + use $crate::AudioDecoderExtManual; + $obj.error( + $weight, + $err, + Some($msg), + None, + file!(), + module_path!(), + line!(), + ) + }}; + ($obj:expr, $weight:expr, $err:expr, [$debug:expr]) => { { + use $crate::AudioDecoderExtManual; + $obj.error( + $weight, + $err, + None, + Some($debug), + file!(), + module_path!(), + line!(), + ) + }}; + ($obj:expr, $weight:expr, $err:expr, ($($msg:tt)*), [$($debug:tt)*]) => { { + use $crate::AudioDecoderExtManual; + $obj.error( + $weight, + $err, + Some(&format!($($msg)*)), + Some(&format!($($debug)*)), + file!(), + module_path!(), + line!(), + ) + }}; + ($obj:expr, $weight:expr, $err:expr, ($($msg:tt)*)) => { { + use $crate::AudioDecoderExtManual; + $obj.error( + $weight, + $err, + Some(&format!($($msg)*)), + None, + file!(), + module_path!(), + line!(), + ) + }}; + ($obj:expr, $weight:expr, $err:expr, [$($debug:tt)*]) => { { + use $crate::AudioDecoderExtManual; + $obj.error( + $weight, + $err, + None, + Some(&format!($($debug)*)), + file!(), + module_path!(), + line!(), + ) + }}; +); diff --git a/gstreamer-video/src/video_decoder.rs b/gstreamer-video/src/video_decoder.rs index 82d277b65..e02dfd5ed 100644 --- a/gstreamer-video/src/video_decoder.rs +++ b/gstreamer-video/src/video_decoder.rs @@ -21,6 +21,20 @@ use VideoFormat; #[cfg(any(feature = "v1_16", feature = "dox"))] use VideoInterlaceMode; +extern "C" { + fn _gst_video_decoder_error( + dec: *mut gst_video_sys::GstVideoDecoder, + weight: i32, + domain: glib_sys::GQuark, + code: i32, + txt: *mut libc::c_char, + debug: *mut libc::c_char, + file: *const libc::c_char, + function: *const libc::c_char, + line: i32, + ) -> gst_sys::GstFlowReturn; +} + pub trait VideoDecoderExtManual: 'static { #[cfg(any(feature = "v1_12", feature = "dox"))] fn allocate_output_frame( @@ -65,6 +79,18 @@ pub trait VideoDecoderExtManual: 'static { &'a self, output_state: VideoCodecState<'a, InNegotiation<'a>>, ) -> Result<(), gst::FlowError>; + + #[allow(clippy::too_many_arguments)] + fn error( + &self, + weight: i32, + code: T, + message: Option<&str>, + debug: Option<&str>, + file: &str, + function: &str, + line: u32, + ) -> Result; } impl> VideoDecoderExtManual for O { @@ -297,6 +323,31 @@ impl> VideoDecoderExtManual for O { Err(gst::FlowError::NotNegotiated) } } + fn error( + &self, + weight: i32, + code: T, + message: Option<&str>, + debug: Option<&str>, + file: &str, + function: &str, + line: u32, + ) -> Result { + let ret: gst::FlowReturn = unsafe { + from_glib(_gst_video_decoder_error( + self.as_ref().to_glib_none().0, + weight, + T::domain().to_glib(), + code.code(), + message.to_glib_full(), + debug.to_glib_full(), + file.to_glib_none().0, + function.to_glib_none().0, + line as i32, + )) + }; + ret.into_result() + } } impl HasStreamLock for VideoDecoder { @@ -310,3 +361,79 @@ impl HasStreamLock for VideoDecoder { decoder_sys as *const gst_sys::GstElement } } + +#[macro_export] +macro_rules! gst_video_decoder_error( + ($obj:expr, $weight:expr, $err:expr, ($msg:expr), [$debug:expr]) => { { + use $crate::VideoDecoderExtManual; + $obj.error( + $weight, + $err, + Some($msg), + Some($debug), + file!(), + module_path!(), + line!(), + ) + }}; + ($obj:expr, $weight:expr, $err:expr, ($msg:expr)) => { { + use $crate::VideoDecoderExtManual; + $obj.error( + $weight, + $err, + Some($msg), + None, + file!(), + module_path!(), + line!(), + ) + }}; + ($obj:expr, $weight:expr, $err:expr, [$debug:expr]) => { { + use $crate::VideoDecoderExtManual; + $obj.error( + $weight, + $err, + None, + Some($debug), + file!(), + module_path!(), + line!(), + ) + }}; + ($obj:expr, $weight:expr, $err:expr, ($($msg:tt)*), [$($debug:tt)*]) => { { + use $crate::VideoDecoderExtManual; + $obj.error( + $weight, + $err, + Some(&format!($($msg)*)), + Some(&format!($($debug)*)), + file!(), + module_path!(), + line!(), + ) + }}; + ($obj:expr, $weight:expr, $err:expr, ($($msg:tt)*)) => { { + use $crate::VideoDecoderExtManual; + $obj.error( + $weight, + $err, + Some(&format!($($msg)*)), + None, + file!(), + module_path!(), + line!(), + ) + }}; + ($obj:expr, $weight:expr, $err:expr, [$($debug:tt)*]) => { { + use $crate::VideoDecoderExtManual; + $obj.error( + $weight, + $err, + None, + Some(&format!($($debug)*)), + file!(), + module_path!(), + line!(), + ) + }}; +);