X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fframe.rs;h=77a5c1730768d3e76dfeede9409779199b46b6bd;hb=fba6f8e46fbe906f5c7b372becc14c4400533eeb;hp=066a0166ec1e005241955f4cdd4efadcc70597f8;hpb=5869fd634c6a174ef2c541ddad4b1a4e9ec26d29;p=nihav.git diff --git a/src/frame.rs b/src/frame.rs dissimilarity index 66% index 066a016..77a5c17 100644 --- a/src/frame.rs +++ b/src/frame.rs @@ -1,156 +1,96 @@ -use std::collections::HashMap; - -#[allow(dead_code)] -pub struct NASoniton { - bits: u8, - is_be: bool, - packed: bool, - planar: bool, - float: bool, -} - -#[allow(dead_code)] -pub const SND_U8_FORMAT: NASoniton = NASoniton { bits: 8, is_be: false, packed: false, planar: false, float: false }; -#[allow(dead_code)] -pub const SND_S16_FORMAT: NASoniton = NASoniton { bits: 16, is_be: false, packed: false, planar: false, float: false }; - -#[allow(dead_code)] -pub struct NAAudioInfo { - sample_rate: u32, - channels: u8, - format: NASoniton, - block_len: usize, -} - -impl NAAudioInfo { - pub fn new(sr: u32, ch: u8, fmt: NASoniton, bl: usize) -> Self { - NAAudioInfo { sample_rate: sr, channels: ch, format: fmt, block_len: bl } - } -} - -#[derive(Debug)] -pub enum ColorModel { - RGB, - YUV, - CMYK, - HSV, - LAB, -} - -#[allow(dead_code)] -pub struct NAPixelChromaton { - h_ss: u8, - v_ss: u8, - is_packed: bool, - depth: u8, - shift: u8, - comp_offs: u8, - next_elem: u8, -} - -#[allow(dead_code)] -pub struct NAPixelFormaton { - model: ColorModel, - components: u8, - comp_info: [Option; 5], - elem_size: u8, - has_alpha: bool, - is_palette: bool, -} - -macro_rules! chromaton { - ($hs: expr, $vs: expr, $pck: expr, $d: expr, $sh: expr, $co: expr, $ne: expr) => ({ - Some(NAPixelChromaton{ h_ss: $hs, v_ss: $vs, is_packed: $pck, depth: $d, shift: $sh, comp_offs: $co, next_elem: $ne }) - }); - (yuv8; $hs: expr, $vs: expr, $co: expr) => ({ - Some(NAPixelChromaton{ h_ss: $hs, v_ss: $vs, is_packed: false, depth: 8, shift: 0, comp_offs: $co, next_elem: 1 }) - }); - (pal8; $co: expr) => ({ - Some(NAPixelChromaton{ h_ss: 0, v_ss: 0, is_packed: true, depth: 8, shift: 0, comp_offs: $co, next_elem: 3 }) - }); -} - -#[allow(dead_code)] -pub const YUV420_FORMAT: NAPixelFormaton = NAPixelFormaton { model: ColorModel::YUV, components: 3, - comp_info: [ - chromaton!(0, 0, false, 8, 0, 0, 1), - chromaton!(yuv8; 1, 1, 1), - chromaton!(yuv8; 1, 1, 2), - None, None], - elem_size: 0, has_alpha: false, is_palette: false }; - -#[allow(dead_code)] -pub const PAL8_FORMAT: NAPixelFormaton = NAPixelFormaton { model: ColorModel::RGB, components: 3, - comp_info: [ - chromaton!(pal8; 0), - chromaton!(pal8; 1), - chromaton!(pal8; 2), - None, None], - elem_size: 1, has_alpha: false, is_palette: true }; - - -#[allow(dead_code)] -pub struct NAVideoInfo { - width: u32, - height: u32, - flipped: bool, - format: NAPixelFormaton, -} - -impl NAVideoInfo { - pub fn new(w: u32, h: u32, flip: bool, fmt: NAPixelFormaton) -> Self { - NAVideoInfo { width: w, height: h, flipped: flip, format: fmt } - } -} - -pub enum NACodecTypeInfo { - None, - Audio(NAAudioInfo), - Video(NAVideoInfo), -} - -#[allow(dead_code)] -pub struct NABuffer<'a> { - id: u64, - data: &'a mut [u8], -} - -#[allow(dead_code)] -pub struct NACodecInfo<'a> { - properties: NACodecTypeInfo, - extradata: Option<&'a[u8]>, -} - -impl<'a> NACodecInfo<'a> { - pub fn new(p: NACodecTypeInfo, edata: Option<&'a[u8]>) -> Self { - NACodecInfo { properties: p, extradata: edata } - } -} - -pub trait NABufferAllocator { - fn alloc_buf(info: &NACodecInfo) -> NABuffer<'static>; -} - -#[derive(Debug)] -pub enum NAValue<'a> { - None, - Int(i32), - Long(i64), - String(String), - Data(&'a [u8]), -} - -#[allow(dead_code)] -pub struct NAFrame<'a> { - pts: Option, - dts: Option, - duration: Option, - buffer: &'a mut NABuffer<'a>, - info: &'a NACodecInfo<'a>, - options: HashMap>, -} - -#[allow(dead_code)] -pub struct NACodecContext<'a> { - info: &'a NACodecInfo<'a>, -} +use std::collections::HashMap; +use std::rc::Rc; +use formats::*; + +#[allow(dead_code)] +#[derive(Clone,Copy)] +pub struct NAAudioInfo { + sample_rate: u32, + channels: u8, + format: NASoniton, + block_len: usize, +} + +impl NAAudioInfo { + pub fn new(sr: u32, ch: u8, fmt: NASoniton, bl: usize) -> Self { + NAAudioInfo { sample_rate: sr, channels: ch, format: fmt, block_len: bl } + } +} + +#[allow(dead_code)] +#[derive(Clone,Copy)] +pub struct NAVideoInfo { + width: u32, + height: u32, + flipped: bool, + format: NAPixelFormaton, +} + +impl NAVideoInfo { + pub fn new(w: u32, h: u32, flip: bool, fmt: NAPixelFormaton) -> Self { + NAVideoInfo { width: w, height: h, flipped: flip, format: fmt } + } +} + +#[derive(Clone,Copy)] +pub enum NACodecTypeInfo { + None, + Audio(NAAudioInfo), + Video(NAVideoInfo), +} + +#[allow(dead_code)] +pub struct NABuffer<'a> { + id: u64, + data: &'a mut [u8], +} + +#[allow(dead_code)] +#[derive(Clone)] +pub struct NACodecInfo { + properties: NACodecTypeInfo, + extradata: Option>>, +} + +impl NACodecInfo { + pub fn new(p: NACodecTypeInfo, edata: Option>) -> Self { + let extradata = match edata { + None => None, + Some(vec) => Some(Rc::new(vec)), + }; + NACodecInfo { properties: p, extradata: extradata } + } + pub fn get_properties(&self) -> NACodecTypeInfo { self.properties } + pub fn get_extradata(&self) -> Option>> { + if let Some(ref vec) = self.extradata { return Some(vec.clone()); } + None + } +} + +pub trait NABufferAllocator { + fn alloc_buf(info: &NACodecInfo) -> NABuffer<'static>; +} + +#[derive(Debug)] +pub enum NAValue<'a> { + None, + Int(i32), + Long(i64), + String(String), + Data(&'a [u8]), +} + +#[allow(dead_code)] +pub struct NAFrame<'a> { + pts: Option, + dts: Option, + duration: Option, + buffer: &'a mut NABuffer<'a>, + info: &'a NACodecInfo, + options: HashMap>, +} + +#[allow(dead_code)] +pub struct NACodecContext<'a> { + info: &'a NACodecInfo, +}