X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fcodecs%2Fh263%2Fmod.rs;h=28eb44f2f572b453b9d0b6ec8db3af443d5d4237;hb=0c3b4923dbb4b965b9e759a40fbbe003323a259b;hp=a0d21b21597bb81e12f21af23d8281e41b4e8819;hpb=be91b1c382e773807fa17615934355667403e0f9;p=nihav.git diff --git a/src/codecs/h263/mod.rs b/src/codecs/h263/mod.rs index a0d21b2..28eb44f 100644 --- a/src/codecs/h263/mod.rs +++ b/src/codecs/h263/mod.rs @@ -16,18 +16,25 @@ pub mod rv20; pub trait BlockDecoder { fn decode_pichdr(&mut self) -> DecoderResult; - fn decode_slice_header(&mut self, pinfo: &PicInfo) -> DecoderResult; - fn decode_block_header(&mut self, pinfo: &PicInfo, sinfo: &Slice) -> DecoderResult; - fn decode_block_intra(&mut self, info: &BlockInfo, quant: u8, no: usize, coded: bool, blk: &mut [i16; 64]) -> DecoderResult<()>; - fn decode_block_inter(&mut self, info: &BlockInfo, quant: u8, no: usize, coded: bool, blk: &mut [i16; 64]) -> DecoderResult<()>; + fn decode_slice_header(&mut self, pinfo: &PicInfo) -> DecoderResult; + fn decode_block_header(&mut self, pinfo: &PicInfo, sinfo: &SliceInfo, sstate: &SliceState) -> DecoderResult; + fn decode_block_intra(&mut self, info: &BlockInfo, sstate: &SliceState, quant: u8, no: usize, coded: bool, blk: &mut [i16; 64]) -> DecoderResult<()>; + fn decode_block_inter(&mut self, info: &BlockInfo, sstate: &SliceState, quant: u8, no: usize, coded: bool, blk: &mut [i16; 64]) -> DecoderResult<()>; fn is_slice_end(&mut self) -> bool; + fn is_gob(&mut self) -> bool; +} - fn filter_row(&mut self, buf: &mut NAVideoBuffer, mb_y: usize, mb_w: usize, cbpi: &CBPInfo); +pub trait BlockDSP { + fn idct(&self, blk: &mut [i16; 64]); + fn copy_blocks(&self, dst: &mut NAVideoBuffer, src: &NAVideoBuffer, xpos: usize, ypos: usize, w: usize, h: usize, mv: MV); + fn avg_blocks(&self, dst: &mut NAVideoBuffer, src: &NAVideoBuffer, xpos: usize, ypos: usize, w: usize, h: usize, mv: MV); + fn filter_row(&self, buf: &mut NAVideoBuffer, mb_y: usize, mb_w: usize, cbpi: &CBPInfo); } +#[allow(dead_code)] #[derive(Debug,Clone,Copy,PartialEq)] pub enum Type { - I, P, Skip, Special + I, P, PB, Skip, B, Special } #[allow(dead_code)] @@ -48,64 +55,114 @@ impl PBInfo { #[allow(dead_code)] #[derive(Debug,Clone,Copy)] pub struct PicInfo { - w: usize, - h: usize, - mode: Type, - quant: u8, - apm: bool, - mvmode: MVMode, - pb: Option, - ts: u8, - deblock: bool, + pub w: usize, + pub h: usize, + pub mode: Type, + pub umv: bool, + pub apm: bool, + pub quant: u8, + pub pb: Option, + pub ts: u8, + pub plusinfo: Option, } #[allow(dead_code)] impl PicInfo { - pub fn new(w: usize, h: usize, mode: Type, quant: u8, apm: bool, mvmode: MVMode, ts: u8, pb: Option, deblock: bool) -> Self { - PicInfo{ w: w, h: h, mode: mode, quant: quant, apm: apm, mvmode: mvmode, ts: ts, pb: pb, deblock: deblock } + pub fn new(w: usize, h: usize, mode: Type, umv: bool, apm: bool, quant: u8, ts: u8, pb: Option, plusinfo: Option) -> Self { + PicInfo { + w: w, h: h, mode: mode, + umv: umv, apm: apm, quant: quant, + pb: pb, ts: ts, plusinfo: plusinfo + } } pub fn get_width(&self) -> usize { self.w } pub fn get_height(&self) -> usize { self.h } pub fn get_mode(&self) -> Type { self.mode } pub fn get_quant(&self) -> u8 { self.quant } pub fn get_apm(&self) -> bool { self.apm } - pub fn get_mvmode(&self) -> MVMode { self.mvmode } pub fn is_pb(&self) -> bool { self.pb.is_some() } pub fn get_ts(&self) -> u8 { self.ts } pub fn get_pbinfo(&self) -> PBInfo { self.pb.unwrap() } + pub fn get_plusifo(&self) -> Option { self.plusinfo } + pub fn get_mvmode(&self) -> MVMode { + if self.umv { MVMode::UMV } + else if self.apm { MVMode::Long } + else { MVMode::Old } + } +} + +#[allow(dead_code)] +#[derive(Debug,Clone,Copy)] +pub struct PlusInfo { + pub aic: bool, + pub deblock: bool, + pub aiv_mode: bool, + pub mq_mode: bool, +} + +impl PlusInfo { + pub fn new(aic: bool, deblock: bool, aiv_mode: bool, mq_mode: bool) -> Self { + PlusInfo { aic: aic, deblock: deblock, aiv_mode: aiv_mode, mq_mode: mq_mode } + } +} + +#[allow(dead_code)] +#[derive(Debug,Clone,Copy)] +pub struct SliceInfo { + pub mb_x: usize, + pub mb_y: usize, + pub mb_end: usize, + pub quant: u8, } +#[allow(dead_code)] #[derive(Debug,Clone,Copy)] -pub struct Slice { - mb_x: usize, - mb_y: usize, - quant: u8, +pub struct SliceState { + pub is_iframe: bool, + pub mb_x: usize, + pub mb_y: usize, } -impl Slice { - pub fn new(mb_x: usize, mb_y: usize, quant: u8) -> Self { - Slice{ mb_x: mb_x, mb_y: mb_y, quant: quant } +const SLICE_NO_END: usize = 99999999; + +impl SliceInfo { + pub fn new(mb_x: usize, mb_y: usize, mb_end: usize, quant: u8) -> Self { + SliceInfo{ mb_x: mb_x, mb_y: mb_y, mb_end: mb_end, quant: quant } + } + pub fn new_gob(mb_x: usize, mb_y: usize, quant: u8) -> Self { + SliceInfo{ mb_x: mb_x, mb_y: mb_y, mb_end: SLICE_NO_END, quant: quant } } pub fn get_default_slice(pinfo: &PicInfo) -> Self { - Slice{ mb_x: 0, mb_y: 0, quant: pinfo.get_quant() } + SliceInfo{ mb_x: 0, mb_y: 0, mb_end: SLICE_NO_END, quant: pinfo.get_quant() } } pub fn get_quant(&self) -> u8 { self.quant } + pub fn is_at_end(&self, mb_pos: usize) -> bool { self.mb_end == mb_pos } + pub fn needs_check(&self) -> bool { self.mb_end == SLICE_NO_END } +} + +impl SliceState { + pub fn new(is_iframe: bool) -> Self { + SliceState { is_iframe: is_iframe, mb_x: 0, mb_y: 0 } + } + pub fn next_mb(&mut self) { self.mb_x += 1; } + pub fn new_row(&mut self) { self.mb_x = 0; self.mb_y += 1; } } #[derive(Debug,Clone,Copy)] pub struct BlockInfo { - intra: bool, - skip: bool, - mode: Type, - cbp: u8, - q: u8, - mv: [MV; 4], - num_mv: usize, - bpart: bool, - b_cbp: u8, - mv2: [MV; 2], - num_mv2: usize, - fwd: bool, + pub intra: bool, + pub skip: bool, + pub mode: Type, + pub cbp: u8, + pub q: u8, + pub mv: [MV; 4], + pub num_mv: usize, + pub bpart: bool, + pub b_cbp: u8, + pub mv2: [MV; 2], + pub num_mv2: usize, + pub fwd: bool, + pub acpred: ACPredMode, } #[allow(dead_code)] @@ -117,6 +174,15 @@ pub struct BBlockInfo { fwd: bool, } +#[allow(dead_code)] +#[derive(Debug,Clone,Copy,PartialEq)] +pub enum ACPredMode { + None, + DC, + Ver, + Hor, +} + #[allow(dead_code)] impl BlockInfo { pub fn new(mode: Type, cbp: u8, q: u8) -> Self { @@ -133,6 +199,7 @@ impl BlockInfo { mv2: [ZERO_MV, ZERO_MV], num_mv2: 0, fwd: false, + acpred: ACPredMode::None, } } pub fn is_intra(&self) -> bool { self.intra } @@ -166,6 +233,8 @@ impl BlockInfo { self.mv2 = mv_arr; } pub fn is_b_fwd(&self) -> bool { self.fwd } + pub fn set_acpred(&mut self, acpred: ACPredMode) { self.acpred = acpred } + pub fn get_acpred(&self) -> ACPredMode { self.acpred } } impl BBlockInfo {