X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fcodecs%2Fh263%2Fmod.rs;h=50eed7d7102dffb9a501ddc05c87e0b299843ad1;hb=1a151e53b591a45fb7f009e480d7abb5e03f0cfe;hp=c5d63fc0b70017e64c7a0fc7ea09b07933847b0f;hpb=42a593529b69f5b4cac9e2e7fd8b4863c57e3caf;p=nihav.git diff --git a/src/codecs/h263/mod.rs b/src/codecs/h263/mod.rs index c5d63fc..50eed7d 100644 --- a/src/codecs/h263/mod.rs +++ b/src/codecs/h263/mod.rs @@ -1,6 +1,4 @@ -use std::fmt; -use std::ops::{Add, Sub}; -use super::DecoderResult; +use super::{DecoderResult, MV, ZERO_MV}; use frame::NAVideoBuffer; pub mod code; @@ -36,19 +34,30 @@ pub enum Type { I, P, PB, Skip, B, Special } +impl Type { + pub fn is_ref(&self) -> bool { + match *self { + Type::I | Type::P | Type::PB => true, + _ => false, + } + } +} + #[allow(dead_code)] #[derive(Debug,Clone,Copy)] pub struct PBInfo { trb: u8, dbquant: u8, + improved: bool, } impl PBInfo { - pub fn new(trb: u8, dbquant: u8) -> Self { - PBInfo{ trb: trb, dbquant: dbquant } + pub fn new(trb: u8, dbquant: u8, improved: bool) -> Self { + PBInfo{ trb: trb, dbquant: dbquant, improved: improved } } pub fn get_trb(&self) -> u8 { self.trb } pub fn get_dbquant(&self) -> u8 { self.dbquant } + pub fn is_improved(&self) -> bool { self.improved } } #[allow(dead_code)] @@ -57,19 +66,20 @@ pub struct PicInfo { pub w: usize, pub h: usize, pub mode: Type, + pub mvmode: MVMode, pub umv: bool, pub apm: bool, pub quant: u8, pub pb: Option, - pub ts: u8, + pub ts: u16, pub plusinfo: Option, } #[allow(dead_code)] impl PicInfo { - pub fn new(w: usize, h: usize, mode: Type, umv: bool, apm: bool, quant: u8, ts: u8, pb: Option, plusinfo: Option) -> Self { + pub fn new(w: usize, h: usize, mode: Type, mvmode: MVMode, umv: bool, apm: bool, quant: u8, ts: u16, pb: Option, plusinfo: Option) -> Self { PicInfo { - w: w, h: h, mode: mode, + w: w, h: h, mode: mode, mvmode: mvmode, umv: umv, apm: apm, quant: quant, pb: pb, ts: ts, plusinfo: plusinfo } @@ -80,14 +90,17 @@ impl PicInfo { pub fn get_quant(&self) -> u8 { self.quant } pub fn get_apm(&self) -> bool { self.apm } pub fn is_pb(&self) -> bool { self.pb.is_some() } - pub fn get_ts(&self) -> u8 { self.ts } + pub fn is_ipb(&self) -> bool { + if let Some(ref pbi) = self.pb { + pbi.is_improved() + } else { + false + } + } + pub fn get_ts(&self) -> u16 { 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 } - } + pub fn get_mvmode(&self) -> MVMode { self.mvmode } } #[allow(dead_code)] @@ -120,6 +133,10 @@ pub struct SliceState { pub is_iframe: bool, pub mb_x: usize, pub mb_y: usize, + pub first_line: bool, + pub first_mb: bool, + pub slice_mb_x: usize, + pub slice_mb_y: usize, } const SLICE_NO_END: usize = 99999999; @@ -141,10 +158,30 @@ impl SliceInfo { impl SliceState { pub fn new(is_iframe: bool) -> Self { - SliceState { is_iframe: is_iframe, mb_x: 0, mb_y: 0 } + SliceState { + is_iframe: is_iframe, mb_x: 0, mb_y: 0, first_line: true, first_mb: true, + slice_mb_x: 0, slice_mb_y: 0 + } + } + pub fn next_mb(&mut self) { + self.mb_x += 1; self.first_mb = false; + if self.mb_x >= self.slice_mb_x && self.mb_y > self.slice_mb_y { + self.first_line = false; + } + } + pub fn new_row(&mut self) { + self.mb_x = 0; self.mb_y += 1; + if self.mb_x >= self.slice_mb_x && self.mb_y > self.slice_mb_y { + self.first_line = false; + } + self.first_mb = true; + } + pub fn reset_slice(&mut self, smb_x: usize, smb_y: usize) { + self.slice_mb_x = smb_x; + self.slice_mb_y = smb_y; + self.first_line = true; + self.first_mb = true; } - 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)] @@ -173,6 +210,14 @@ pub struct BBlockInfo { fwd: bool, } +#[allow(non_camel_case_types)] +#[derive(Debug,Clone,Copy)] +pub enum BlockMVInfo { + Intra, + Inter_1MV(MV), + Inter_4MV([MV; 4]), +} + #[allow(dead_code)] #[derive(Debug,Clone,Copy,PartialEq)] pub enum ACPredMode { @@ -229,7 +274,8 @@ impl BlockInfo { if mvs.len() > 0 { self.skip = false; } let mut mv_arr: [MV; 2] = [ZERO_MV, ZERO_MV]; for i in 0..mvs.len() { mv_arr[i] = mvs[i]; } - self.mv2 = mv_arr; + self.mv2 = mv_arr; + self.num_mv2 = mvs.len(); } pub fn is_b_fwd(&self) -> bool { self.fwd } pub fn set_acpred(&mut self, acpred: ACPredMode) { self.acpred = acpred } @@ -255,46 +301,14 @@ pub enum MVMode { UMV, } -#[derive(Debug,Clone,Copy)] -pub struct MV { - x: i16, - y: i16, +pub trait H263MVTrait { + fn add_umv(pred_mv: MV, add: MV, mvmode: MVMode) -> MV; + fn scale(&self, trb: u16, trd: u16) -> MV; + fn b_sub(pvec: MV, fwdvec: MV, bvec: MV, trb: u16, trd: u16) -> MV; } -impl MV { - pub fn new(x: i16, y: i16) -> Self { MV{ x: x, y: y } } - pub fn pred(a: MV, b: MV, c: MV) -> Self { - let x; - if a.x < b.x { - if b.x < c.x { - x = b.x; - } else { - if a.x < c.x { x = c.x; } else { x = a.x; } - } - } else { - if b.x < c.x { - if a.x < c.x { x = a.x; } else { x = c.x; } - } else { - x = b.x; - } - } - let y; - if a.y < b.y { - if b.y < c.y { - y = b.y; - } else { - if a.y < c.y { y = c.y; } else { y = a.y; } - } - } else { - if b.y < c.y { - if a.y < c.y { y = a.y; } else { y = c.y; } - } else { - y = b.y; - } - } - MV { x: x, y: y } - } - fn add_umv(pred_mv: MV, add: MV, mvmode: MVMode) -> Self { +impl H263MVTrait for MV { + fn add_umv(pred_mv: MV, add: MV, mvmode: MVMode) -> MV { let mut new_mv = pred_mv + add; match mvmode { MVMode::Old => { @@ -318,39 +332,21 @@ impl MV { }; new_mv } - fn scale(&self, trb: u8, trd: u8) -> Self { + fn scale(&self, trb: u16, trd: u16) -> MV { if (trd == 0) || (trb == 0) { ZERO_MV } else { - MV { x: (self.x * (trb as i16)) / (trd as i16), y: (self.y * (trb as i16)) / (trd as i16) } + MV { x: (((self.x as i32) * (trb as i32)) / (trd as i32)) as i16, y: (((self.y as i32) * (trb as i32)) / (trd as i32)) as i16 } } } - fn b_sub(pvec: MV, fwdvec: MV, bvec: MV, trb: u8, trd: u8) -> Self { - let bscale = (trb as i16) - (trd as i16); - let x = if bvec.x != 0 { fwdvec.x - pvec.x } else if trd != 0 { bscale * pvec.x / (trd as i16) } else { 0 }; - let y = if bvec.y != 0 { fwdvec.y - pvec.y } else if trd != 0 { bscale * pvec.y / (trd as i16) } else { 0 }; + fn b_sub(pvec: MV, fwdvec: MV, bvec: MV, trb: u16, trd: u16) -> MV { + let bscale = (trb as i32) - (trd as i32); + let x = if bvec.x != 0 { fwdvec.x - pvec.x } else if trd != 0 { (bscale * (pvec.x as i32) / (trd as i32)) as i16 } else { 0 }; + let y = if bvec.y != 0 { fwdvec.y - pvec.y } else if trd != 0 { (bscale * (pvec.y as i32) / (trd as i32)) as i16 } else { 0 }; MV { x: x, y: y } } } -pub const ZERO_MV: MV = MV { x: 0, y: 0 }; - -impl Add for MV { - type Output = MV; - fn add(self, other: MV) -> MV { MV { x: self.x + other.x, y: self.y + other.y } } -} - -impl Sub for MV { - type Output = MV; - fn sub(self, other: MV) -> MV { MV { x: self.x - other.x, y: self.y - other.y } } -} - -impl fmt::Display for MV { - fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { - write!(f, "{},{}", self.x, self.y) - } -} - #[allow(dead_code)] pub struct CBPInfo { cbp: Vec,