X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-core%2Fsrc%2Fscale%2Fmod.rs;h=2192b187dfe14c1054baff8c412c1fb5889ea7af;hb=4abaf99e414dd4dd270e2703ee5e799a61aada88;hp=13762bd01e4d65e16536fa2740004930411fd57f;hpb=79ec1d51391cccce3c8ca2d4ea7e640cc78f0ee6;p=nihav.git diff --git a/nihav-core/src/scale/mod.rs b/nihav-core/src/scale/mod.rs index 13762bd..2192b18 100644 --- a/nihav-core/src/scale/mod.rs +++ b/nihav-core/src/scale/mod.rs @@ -1,15 +1,41 @@ +//! Image conversion functionality. + +//! # Examples +//! +//! Convert input image into YUV one and scale down two times. +//! ```no_run +//! use nihav_core::scale::*; +//! use nihav_core::formats::{RGB24_FORMAT, YUV420_FORMAT}; +//! use nihav_core::frame::{alloc_video_buffer, NAVideoInfo}; +//! +//! let mut in_pic = alloc_video_buffer(NAVideoInfo::new(640, 480, false, RGB24_FORMAT), 4).unwrap(); +//! let mut out_pic = alloc_video_buffer(NAVideoInfo::new(320, 240, false, YUV420_FORMAT), 4).unwrap(); +//! let in_fmt = get_scale_fmt_from_pic(&in_pic); +//! let out_fmt = get_scale_fmt_from_pic(&out_pic); +//! let mut scaler = NAScale::new(in_fmt, out_fmt).unwrap(); +//! scaler.convert(&in_pic, &mut out_pic).unwrap(); +//! ``` use crate::frame::*; mod kernel; mod colorcvt; mod repack; +#[allow(clippy::module_inception)] mod scale; +mod palette; + +pub use crate::scale::palette::{palettise_frame, QuantisationMode, PaletteSearchMode}; + +/// Image format information used by the converter. #[derive(Clone,Copy,PartialEq)] pub struct ScaleInfo { + /// Pixel format description. pub fmt: NAPixelFormaton, + /// Image width. pub width: usize, + /// Image height. pub height: usize, } @@ -19,16 +45,23 @@ impl std::fmt::Display for ScaleInfo { } } +/// A list specifying general image conversion errors. #[derive(Debug,Clone,Copy,PartialEq)] #[allow(dead_code)] pub enum ScaleError { + /// Input or output buffer contains no image data. NoFrame, + /// Allocation failed. AllocError, + /// Invalid argument. InvalidArgument, + /// Feature is not implemented. NotImplemented, + /// Internal implementation bug. Bug, } +/// A specialised `Result` type for image conversion operations. pub type ScaleResult = Result; /*trait Kernel { @@ -56,6 +89,7 @@ const KERNELS: &[KernelDesc] = &[ KernelDesc { name: "pack", create: repack::create_pack }, KernelDesc { name: "unpack", create: repack::create_unpack }, KernelDesc { name: "depal", create: repack::create_depal }, + KernelDesc { name: "palette", create: palette::create_palettise }, KernelDesc { name: "scale", create: scale::create_scale }, KernelDesc { name: "rgb_to_yuv", create: colorcvt::create_rgb2yuv }, KernelDesc { name: "yuv_to_rgb", create: colorcvt::create_yuv2rgb }, @@ -68,6 +102,7 @@ struct Stage { worker: Box, } +/// Converts input picture information into format used by scaler. pub fn get_scale_fmt_from_pic(pic: &NABufferType) -> ScaleInfo { let info = pic.get_video_info().unwrap(); ScaleInfo { fmt: info.get_format(), width: info.get_width(), height: info.get_height() } @@ -105,6 +140,7 @@ impl Stage { } } +/// Image format converter. pub struct NAScale { fmt_in: ScaleInfo, fmt_out: ScaleInfo, @@ -197,6 +233,7 @@ println!("convert {} -> {}", ifmt, ofmt); let needs_convert = inname != outname; let scale_before_cvt = is_better_fmt(&ifmt, &ofmt) && needs_convert && (ofmt.fmt.get_max_subsampling() == 0); + let needs_palettise = ofmt.fmt.palette; //todo stages for model and gamma conversion let mut stages: Option = None; @@ -234,22 +271,97 @@ println!("[adding scale]"); cur_fmt = new_stage.fmt_out; add_stage!(stages, new_stage); } -//todo flip if needed - if needs_pack { + if needs_pack && !needs_palettise { println!("[adding pack]"); let new_stage = Stage::new("pack", &cur_fmt, &ofmt)?; //cur_fmt = new_stage.fmt_out; add_stage!(stages, new_stage); } + if needs_palettise { +println!("[adding palettise]"); + let new_stage = Stage::new("palette", &cur_fmt, &ofmt)?; + //cur_fmt = new_stage.fmt_out; + add_stage!(stages, new_stage); + } if let Some(ref mut head) = stages { head.drop_last_tmp(); } - + Ok(stages) } +fn swap_plane(data: &mut [T], stride: usize, h: usize, line0: &mut [T], line1: &mut [T]) { + let mut doff0 = 0; + let mut doff1 = stride * (h - 1); + for _ in 0..h/2 { + line0.copy_from_slice(&data[doff0..][..stride]); + line1.copy_from_slice(&data[doff1..][..stride]); + (&mut data[doff1..][..stride]).copy_from_slice(line0); + (&mut data[doff0..][..stride]).copy_from_slice(line1); + doff0 += stride; + doff1 -= stride; + } +} + +/// Flips the picture contents. +pub fn flip_picture(pic: &mut NABufferType) -> ScaleResult<()> { + match pic { + NABufferType::Video(ref mut vb) => { + let ncomp = vb.get_num_components(); + for comp in 0..ncomp { + let off = vb.get_offset(comp); + let stride = vb.get_stride(comp); + let (_, h) = vb.get_dimensions(comp); + let data = vb.get_data_mut().unwrap(); + let mut line0 = vec![0; stride]; + let mut line1 = vec![0; stride]; + swap_plane(&mut data[off..], stride, h, line0.as_mut_slice(), line1.as_mut_slice()); + } + }, + NABufferType::Video16(ref mut vb) => { + let ncomp = vb.get_num_components(); + for comp in 0..ncomp { + let off = vb.get_offset(comp); + let stride = vb.get_stride(comp); + let (_, h) = vb.get_dimensions(comp); + let data = vb.get_data_mut().unwrap(); + let mut line0 = vec![0; stride]; + let mut line1 = vec![0; stride]; + swap_plane(&mut data[off..], stride, h, line0.as_mut_slice(), line1.as_mut_slice()); + } + }, + NABufferType::Video32(ref mut vb) => { + let ncomp = vb.get_num_components(); + for comp in 0..ncomp { + let off = vb.get_offset(comp); + let stride = vb.get_stride(comp); + let (_, h) = vb.get_dimensions(comp); + let data = vb.get_data_mut().unwrap(); + let mut line0 = vec![0; stride]; + let mut line1 = vec![0; stride]; + swap_plane(&mut data[off..], stride, h, line0.as_mut_slice(), line1.as_mut_slice()); + } + }, + NABufferType::VideoPacked(ref mut vb) => { + let ncomp = vb.get_num_components(); + for comp in 0..ncomp { + let off = vb.get_offset(comp); + let stride = vb.get_stride(comp); + let (_, h) = vb.get_dimensions(comp); + let data = vb.get_data_mut().unwrap(); + let mut line0 = vec![0; stride]; + let mut line1 = vec![0; stride]; + swap_plane(&mut data[off..], stride, h, line0.as_mut_slice(), line1.as_mut_slice()); + } + }, + _ => { return Err(ScaleError::InvalidArgument); }, + }; + Ok(()) +} + impl NAScale { + /// Constructs a new `NAScale` instance. pub fn new(fmt_in: ScaleInfo, fmt_out: ScaleInfo) -> ScaleResult { let pipeline; let just_convert = (fmt_in.width == fmt_out.width) && (fmt_in.height == fmt_out.height); @@ -260,9 +372,13 @@ impl NAScale { } Ok(Self { fmt_in, fmt_out, just_convert, pipeline }) } + /// Checks whether requested conversion operation is needed at all. pub fn needs_processing(&self) -> bool { self.pipeline.is_some() } + /// Returns the input image format. pub fn get_in_fmt(&self) -> ScaleInfo { self.fmt_in } + /// Returns the output image format. pub fn get_out_fmt(&self) -> ScaleInfo { self.fmt_out } + /// Performs the image format conversion. pub fn convert(&mut self, pic_in: &NABufferType, pic_out: &mut NABufferType) -> ScaleResult<()> { let in_info = pic_in.get_video_info(); let out_info = pic_out.get_video_info(); @@ -273,14 +389,19 @@ impl NAScale { (in_info.get_width() != out_info.get_width() || in_info.get_height() != out_info.get_height()) { return Err(ScaleError::InvalidArgument); } + let needs_flip = in_info.is_flipped() ^ out_info.is_flipped(); check_format(in_info, &self.fmt_in, self.just_convert)?; check_format(out_info, &self.fmt_out, self.just_convert)?; - if let Some(ref mut pipe) = self.pipeline { - pipe.process(pic_in, pic_out) - } else { - copy(pic_in, pic_out); - Ok(()) + let ret = if let Some(ref mut pipe) = self.pipeline { + pipe.process(pic_in, pic_out) + } else { + copy(pic_in, pic_out); + Ok(()) + }; + if ret.is_ok() && needs_flip { + flip_picture(pic_out)?; } + ret } } @@ -371,4 +492,23 @@ mod test { assert_eq!(odata[uoff], 154); assert_eq!(odata[voff], 103); } + #[test] + fn test_scale_and_convert_to_pal() { + let mut in_pic = alloc_video_buffer(NAVideoInfo::new(7, 3, false, YUV420_FORMAT), 3).unwrap(); + fill_pic(&mut in_pic, 142); + let mut out_pic = alloc_video_buffer(NAVideoInfo::new(4, 4, false, PAL8_FORMAT), 0).unwrap(); + fill_pic(&mut out_pic, 0); + let ifmt = get_scale_fmt_from_pic(&in_pic); + let ofmt = get_scale_fmt_from_pic(&out_pic); + let mut scaler = NAScale::new(ifmt, ofmt).unwrap(); + scaler.convert(&in_pic, &mut out_pic).unwrap(); + let obuf = out_pic.get_vbuf().unwrap(); + let dataoff = obuf.get_offset(0); + let paloff = obuf.get_offset(1); + let odata = obuf.get_data(); + assert_eq!(odata[dataoff], 0); + assert_eq!(odata[paloff], 157); + assert_eq!(odata[paloff + 1], 99); + assert_eq!(odata[paloff + 2], 170); + } }