mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-11-26 11:31:06 +00:00
Code Issues Projects Releases Wiki Activity

video: Remove gst_video_format_info_get_tile_sizes() bindings and bind new VideoTileInfo API

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1158>
This commit is contained in:
Sebastian Dröge 2022-11-21 13:01:38 +02:00
parent 698a67b0f8
commit be71147904
1 changed files with 63 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
gstreamer-video/src/video_format_info.rs
View file

@ -89,10 +89,12 @@ impl VideoFormatInfo {
unsafe { from_glib(self.0.tile_mode) }
}
#[cfg_attr(feature = "v1_22", deprecated = "Since 1.22")]
pub fn tile_ws(&self) -> u32 {
self.0.tile_ws
}
#[cfg_attr(feature = "v1_22", deprecated = "Since 1.22")]
pub fn tile_hs(&self) -> u32 {
self.0.tile_hs
}
@ -322,6 +324,8 @@ impl VideoFormatInfo {
#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))]
#[doc(alias = "gst_video_format_info_extrapolate_stride")]
pub fn extrapolate_stride(&self, plane: u32, stride: u32) -> u32 {
assert!(plane < self.n_planes());
unsafe {
ffi::gst_video_format_info_extrapolate_stride(
self.to_glib_none().0,
@ -333,20 +337,10 @@ impl VideoFormatInfo {
#[cfg(any(feature = "v1_22", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))]
#[doc(alias = "gst_video_format_info_get_tile_sizes")]
pub fn tile_sizes(&self, plane: u32) -> (u32, (u32, u32)) {
unsafe {
let mut out_ws = std::mem::MaybeUninit::uninit();
let mut out_hs = std::mem::MaybeUninit::uninit();
let size = ffi::gst_video_format_info_get_tile_sizes(
self.to_glib_none().0,
plane,
out_ws.as_mut_ptr(),
out_hs.as_mut_ptr(),
);
pub fn tile_info(&self, plane: u32) -> &VideoTileInfo {
assert!(plane < self.n_planes());
(size, (out_ws.assume_init(), out_hs.assume_init()))
}
unsafe { &*(&self.0.tile_info[plane as usize] as *const _ as *const VideoTileInfo) }
}
}
@ -451,9 +445,11 @@ impl Ord for VideoFormatInfo {
}
impl fmt::Debug for VideoFormatInfo {
#[allow(deprecated)]
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.debug_struct("VideoFormatInfo")
.field("format", &self.format())
let mut fmt = f.debug_struct("VideoFormatInfo");
fmt.field("format", &self.format())
.field("name", &self.name())
.field("description", &self.description())
.field("flags", &self.flags())
@ -471,8 +467,19 @@ impl fmt::Debug for VideoFormatInfo {
.field("pack-lines", &self.pack_lines())
.field("tile-mode", &self.tile_mode())
.field("tile-ws", &self.tile_ws())
.field("tile-hs", &self.tile_hs())
.finish()
.field("tile-hs", &self.tile_hs());
#[cfg(any(feature = "v1_22", feature = "dox"))]
{
fmt.field(
"tile-info",
&(0..self.n_planes())
.into_iter()
.map(|plane| self.tile_info(plane)),
);
}
fmt.finish()
}
}
@ -533,6 +540,45 @@ impl glib::translate::FromGlibPtrNone<*const ffi::GstVideoFormatInfo> for VideoF
}
}
#[cfg(any(feature = "v1_22", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))]
#[repr(transparent)]
#[doc(alias = "GstVideoTileInfo")]
pub struct VideoTileInfo(ffi::GstVideoTileInfo);
#[cfg(any(feature = "v1_22", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))]
impl fmt::Debug for VideoTileInfo {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
f.debug_struct("VideoTileInfo")
.field("width", &self.width())
.field("height", &self.height())
.field("stride", &self.stride())
.field("size", &self.size())
.finish()
}
}
#[cfg(any(feature = "v1_22", feature = "dox"))]
#[cfg_attr(feature = "dox", doc(cfg(feature = "v1_22")))]
impl VideoTileInfo {
pub fn width(&self) -> u32 {
self.0.width
}
pub fn height(&self) -> u32 {
self.0.height
}
pub fn stride(&self) -> u32 {
self.0.stride
}
pub fn size(&self) -> u32 {
self.0.size
}
}
#[cfg(test)]
mod tests {
use super::*;