use std::fmt;
-use std::ops::{Add, Sub};
+use std::ops::{Add, AddAssign, Sub, SubAssign};
use super::DecoderResult;
use frame::NAVideoBuffer;
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;
}
pub trait BlockDSP {
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)]
pub w: usize,
pub h: usize,
pub mode: Type,
+ pub mvmode: MVMode,
pub umv: bool,
pub apm: bool,
pub quant: u8,
pub pb: Option<PBInfo>,
- pub ts: u8,
+ pub ts: u16,
pub plusinfo: Option<PlusInfo>,
}
#[allow(dead_code)]
impl PicInfo {
- pub fn new(w: usize, h: usize, mode: Type,
umv: bool, apm: bool, quant: u8, ts: u8, pb: Option<PBInfo>, plusinfo: Option<PlusInfo>) -> Self {
+ pub fn new(w: usize, h: usize, mode: Type,
mvmode: MVMode, umv: bool, apm: bool, quant: u8, ts: u16, pb: Option<PBInfo>, plusinfo: Option<PlusInfo>) -> 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
}
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<PlusInfo> { 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)]
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;
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)]
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)]
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 {
+ None,
+ DC,
+ Ver,
+ Hor,
+}
+
#[allow(dead_code)]
impl BlockInfo {
pub fn new(mode: Type, cbp: u8, q: u8) -> Self {
mv2: [ZERO_MV, ZERO_MV],
num_mv2: 0,
fwd: false,
+ acpred: ACPredMode::None,
}
}
pub fn is_intra(&self) -> bool { self.intra }
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 }
+ pub fn get_acpred(&self) -> ACPredMode { self.acpred }
}
impl BBlockInfo {
};
new_mv
}
- fn scale(&self, trb: u8, trd: u8) -> Self {
+ fn scale(&self, trb: u16, trd: u16) -> Self {
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) -> Self {
+ 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 }
}
}
fn add(self, other: MV) -> MV { MV { x: self.x + other.x, y: self.y + other.y } }
}
+impl AddAssign for MV {
+ fn add_assign(&mut self, other: MV) { self.x += other.x; 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 SubAssign for MV {
+ fn sub_assign(&mut self, other: MV) { self.x -= other.x; self.y -= other.y; }
+}
+
impl fmt::Display for MV {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{},{}", self.x, self.y)
projects / nihav.git / blobdiff