struct RV20SliceInfo {
ftype: Type,
+ seq: u32,
qscale: u8,
mb_x: usize,
mb_y: usize,
}
impl RV20SliceInfo {
- fn new(ftype: Type, qscale: u8, mb_x: usize, mb_y: usize, mb_pos: usize, w: usize, h: usize) -> Self {
- RV20SliceInfo { ftype: ftype, qscale: qscale, mb_x: mb_x, mb_y: mb_y, mb_pos: mb_pos, w: w, h: h }
+ fn new(ftype: Type, seq: u32, qscale: u8, mb_x: usize, mb_y: usize, mb_pos: usize, w: usize, h: usize) -> Self {
+ RV20SliceInfo { ftype: ftype, seq: seq, qscale: qscale, mb_x: mb_x, mb_y: mb_y, mb_pos: mb_pos, w: w, h: h }
}
}
#[allow(unused_variables)]
fn decode_block(&mut self, sstate: &SliceState, quant: u8, intra: bool, coded: bool, blk: &mut [i16; 64], plane_no: usize, acpred: ACPredMode) -> DecoderResult<()> {
- let mut br = &mut self.br;
+ let br = &mut self.br;
let mut idx = 0;
if !sstate.is_iframe && intra {
let mut dc = br.read(8)? as i16;
};
let rl_cb = if sstate.is_iframe { &self.tables.aic_rl_cb } else { &self.tables.rl_cb };
- let q_add = if quant == 0 { 0i16 } else { ((quant - 1) | 1) as i16 };
+ let q_add = if quant == 0 || sstate.is_iframe { 0i16 } else { ((quant - 1) | 1) as i16 };
let q = (quant * 2) as i16;
while idx < 64 {
let code = br.read_cb(rl_cb)?;
level = code.get_level();
last = code.is_last();
if br.read_bool()? { level = -level; }
- if (idx != 0) || !sstate.is_iframe {
- level = (level * q) + q_add;
- } else {
- level = level * (H263_DC_SCALES[quant as usize] as i16);
- }
+ level = (level * q) + q_add;
} else {
last = br.read_bool()?;
run = br.read(6)? as u8;
let top = br.read_s(6)? as i16;
level = (top << 5) | low;
}
- if (idx != 0) || !sstate.is_iframe {
- level = (level * q) + q_add;
- } else {
- level = level * (H263_DC_SCALES[quant as usize] as i16);
- }
+ level = (level * q) + q_add;
if level < -2048 { level = -2048; }
if level > 2047 { level = 2047; }
}
fn decode_mv(br: &mut BitReader, mv_cb: &Codebook<u8>) -> DecoderResult<MV> {
let xval = decode_mv_component(br, mv_cb)?;
let yval = decode_mv_component(br, mv_cb)?;
-//println!(" MV {},{} @ {}", xval, yval, br.tell());
Ok(MV::new(xval, yval))
}
#[allow(unused_variables)]
fn decode_pichdr(&mut self) -> DecoderResult<PicInfo> {
self.slice_no = 0;
-println!("decoding picture header size {}", if self.num_slices > 1 { self.slice_off[1] } else { ((self.br.tell() as u32) + (self.br.left() as u32))/8 });
let shdr = self.read_slice_header()?;
-println!("slice ends @ {}\n", self.br.tell());
// self.slice_no += 1;
validate!((shdr.mb_x == 0) && (shdr.mb_y == 0));
/* let mb_count;
}*/
let plusinfo = Some(PlusInfo::new(shdr.ftype == Type::I, false, false, false));
- let picinfo = PicInfo::new(shdr.w, shdr.h, shdr.ftype, false, false, shdr.qscale, 0, None, plusinfo);
+ let picinfo = PicInfo::new(shdr.w, shdr.h, shdr.ftype, MVMode::Long, false, false, shdr.qscale, shdr.seq as u16, None, plusinfo);
Ok(picinfo)
}
#[allow(unused_variables)]
fn decode_slice_header(&mut self, info: &PicInfo) -> DecoderResult<SliceInfo> {
-//println!("read slice {} header", self.slice_no);
let shdr = self.read_slice_header()?;
self.slice_no += 1;
let mb_count;
Ok(ret)
}
- fn decode_block_header(&mut self, info: &PicInfo, slice: &SliceInfo, sstate: &SliceState) -> DecoderResult<BlockInfo> {
- let mut br = &mut self.br;
+ fn decode_block_header(&mut self, info: &PicInfo, slice: &SliceInfo, _sstate: &SliceState) -> DecoderResult<BlockInfo> {
+ let br = &mut self.br;
let mut q = slice.get_quant();
match info.get_mode() {
Type::I => {
if pi.aic {
let acpp = br.read_bool()?;
acpred = ACPredMode::DC;
- println!(" acp {} @ {}", acpp as u8, br.tell());
if acpp {
acpred = if br.read_bool()? { ACPredMode::Hor } else { ACPredMode::Ver };
}
}
-println!(" @ {}", br.tell());
}
let cbpy = br.read_cb(&self.tables.cbpy_cb)?;
let cbp = (cbpy << 2) | (cbpc & 3);
let idx = br.read(2)? as usize;
q = ((q as i16) + (H263_DQUANT_TAB[idx] as i16)) as u8;
}
-println!(" MB {},{} CBP {:X} @ {}", sstate.mb_x, sstate.mb_y, cbp, br.tell());
let mut binfo = BlockInfo::new(Type::I, cbp, q);
binfo.set_acpred(acpred);
Ok(binfo)
let idx = br.read(2)? as usize;
q = ((q as i16) + (H263_DQUANT_TAB[idx] as i16)) as u8;
}
-println!(" MB {}.{} cbp = {:X}", sstate.mb_x, sstate.mb_y, cbp);
let mut binfo = BlockInfo::new(Type::P, cbp, q);
if !is_4x4 {
let mvec: [MV; 1] = [decode_mv(br, &self.tables.mv_cb)?];
}
Ok(binfo)
},
- _ => { // B
+ Type::B => { // B
let mut mbtype = br.read_cb(&self.tables.mbtype_b_cb)? as usize;
while mbtype == 14 { mbtype = br.read_cb(&self.tables.mbtype_b_cb)? as usize; }
let idx = br.read(2)? as usize;
q = ((q as i16) + (H263_DQUANT_TAB[idx] as i16)) as u8;
}
-println!(" MB B {}.{} cbp = {:X} @ {} ({} {})", sstate.mb_x, sstate.mb_y, cbp, br.tell(), mbtype, is_intra);
if is_intra {
let binfo = BlockInfo::new(Type::I, cbp, q);
}
Ok(binfo)
},
+ _ => { unreachable!(); },
}
}
fn read_slice_header(&mut self) -> DecoderResult<RV20SliceInfo> {
validate!(self.slice_no < self.num_slices);
- let mut br = &mut self.br;
+ let br = &mut self.br;
br.seek(self.slice_off[self.slice_no] * 8)?;
-//println!(" slice at off {}", br.tell());
let frm_type = br.read(2)?;
let ftype = match frm_type {
br.skip(1)?; // loop filter
}
let seq = if self.minor_ver <= 1 {
- br.read(8)? << 7
+ br.read(8)? << 8
} else {
- br.read(13)? << 2
+ br.read(13)? << 3
};
let w;
let h;
if (self.minor_ver <= 1) && (frm_type == 3) {
br.skip(5)?;
}
-println!("slice q {} mb {},{}", qscale, mb_x, mb_y);
- Ok(RV20SliceInfo::new(ftype, qscale, mb_x, mb_y, mb_pos, w, h))
+ Ok(RV20SliceInfo::new(ftype, seq, qscale, mb_x, mb_y, mb_pos, w, h))
}
}
RealVideo20Decoder{
info: Rc::new(DUMMY_CODEC_INFO),
- dec: H263BaseDecoder::new(false),
+ dec: H263BaseDecoder::new_b_frames(false),
tables: tables,
w: 0,
h: 0,
let maj_ver = ver >> 16;
let min_ver = (ver >> 8) & 0xFF;
let mic_ver = ver & 0xFF;
-println!("ver {:06X}", ver);
validate!(maj_ver == 2);
self.minor_ver = min_ver as u8;
let rprb = src[1] & 7;
fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
-println!(" decode frame size {}, {} slices", src.len(), src[0]+1);
let mut ibr = RealVideo20BR::new(&src, &self.tables, self.w, self.h, self.minor_ver, self.rpr);
let bufinfo = self.dec.parse_frame(&mut ibr, &self.bdsp)?;
use test::dec_video::test_file_decoding;
#[test]
fn test_rv20() {
- test_file_decoding("realmedia", "assets/RV/rv20_svt_atrc_640x352_realproducer_plus_8.51.rm", None, true, false, Some("rv20"));
+ test_file_decoding("realmedia", "assets/RV/rv20_svt_atrc_640x352_realproducer_plus_8.51.rm", /*None*/Some(3000), true, false, None/*Some("rv20")*/);
// test_file_decoding("realmedia", "assets/RV/rv20_cook_640x352_realproducer_plus_8.51.rm", /*None*/Some(1000), true, false, Some("rv20"));
}
}
projects / nihav.git / blobdiff