rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

gstreamer-video/video_info: Change functions from returning Option to Result

Browse source 
Partial work for:
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/issues/216
This commit is contained in:
Tony Jinwoo Ahn 2019-12-15 08:36:56 +00:00 committed by Sebastian Dröge
parent c563fb6f44
commit 3e3c5205db
2 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
examples/src/bin/glupload.rs
View file

@ -499,7 +499,7 @@ impl App {
let _info = sample let _info = sample
.get_caps() .get_caps()
.and_then(|caps| gst_video::VideoInfo::from_caps(caps)) .and_then(|caps| gst_video::VideoInfo::from_caps(caps).ok())
.ok_or_else(|| { .ok_or_else(|| {
gst_element_error!( gst_element_error!(
appsink, appsink,
@ -652,7 +652,7 @@ fn main_loop(mut app: App) -> Result<glutin::WindowedContext<glutin::PossiblyCur
let buffer = sample.get_buffer_owned().unwrap(); let buffer = sample.get_buffer_owned().unwrap();
let info = sample let info = sample
.get_caps() .get_caps()
.and_then(|caps| gst_video::VideoInfo::from_caps(caps)) .and_then(|caps| gst_video::VideoInfo::from_caps(caps).ok())
.unwrap(); .unwrap();
{ {

28
gstreamer-video/src/video_info.rs
View file

@ -263,7 +263,7 @@ pub struct VideoInfoBuilder<'a> {
} }
impl<'a> VideoInfoBuilder<'a> { impl<'a> VideoInfoBuilder<'a> {
pub fn build(self) -> Option<VideoInfo> { pub fn build(self) -> Result<VideoInfo, glib::error::BoolError> {
unsafe { unsafe {
let mut info = mem::MaybeUninit::uninit(); let mut info = mem::MaybeUninit::uninit();
@ -306,13 +306,13 @@ impl<'a> VideoInfoBuilder<'a> {
}; };
if !res { if !res {
return None; return Err(glib_bool_error!("Failed to build VideoInfo"));
} }
let mut info = info.assume_init(); let mut info = info.assume_init();
if info.finfo.is_null() || info.width <= 0 || info.height <= 0 { if info.finfo.is_null() || info.width <= 0 || info.height <= 0 {
return None; return Err(glib_bool_error!("Failed to build VideoInfo"));
} }
if let Some(flags) = self.flags { if let Some(flags) = self.flags {
@ -347,7 +347,7 @@ impl<'a> VideoInfoBuilder<'a> {
if let Some(offset) = self.offset { if let Some(offset) = self.offset {
if offset.len() != ((*info.finfo).n_planes as usize) { if offset.len() != ((*info.finfo).n_planes as usize) {
return None; return Err(glib_bool_error!("Failed to build VideoInfo"));
} }
let n_planes = (*info.finfo).n_planes as usize; let n_planes = (*info.finfo).n_planes as usize;
@ -356,7 +356,7 @@ impl<'a> VideoInfoBuilder<'a> {
if let Some(stride) = self.stride { if let Some(stride) = self.stride {
if stride.len() != ((*info.finfo).n_planes as usize) { if stride.len() != ((*info.finfo).n_planes as usize) {
return None; return Err(glib_bool_error!("Failed to build VideoInfo"));
} }
let n_planes = (*info.finfo).n_planes as usize; let n_planes = (*info.finfo).n_planes as usize;
@ -381,7 +381,7 @@ impl<'a> VideoInfoBuilder<'a> {
} }
} }
Some(VideoInfo(info)) Ok(VideoInfo(info))
} }
} }
@ -526,7 +526,7 @@ impl VideoInfo {
} }
} }
pub fn from_caps(caps: &gst::CapsRef) -> Option<Self> { pub fn from_caps(caps: &gst::CapsRef) -> Result<Self, glib::error::BoolError> {
skip_assert_initialized!(); skip_assert_initialized!();
unsafe { unsafe {
@ -535,18 +535,22 @@ impl VideoInfo {
info.as_mut_ptr(), info.as_mut_ptr(),
caps.as_ptr(), caps.as_ptr(),
)) { )) {
Some(VideoInfo(info.assume_init())) Ok(VideoInfo(info.assume_init()))
} else { } else {
None Err(glib_bool_error!("Failed to create VideoInfo from caps"))
} }
} }
} }
pub fn to_caps(&self) -> Option<gst::Caps> { pub fn to_caps(&self) -> Result<gst::Caps, glib::error::BoolError> {
unsafe { unsafe {
from_glib_full(gst_video_sys::gst_video_info_to_caps( let result = from_glib_full(gst_video_sys::gst_video_info_to_caps(
&self.0 as *const _ as *mut _, &self.0 as *const _ as *mut _,
)) ));
match result {
Some(c) => Ok(c),
None => Err(glib_bool_error!("Failed to create caps from VideoInfo")),
}
} }
} }