X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fcodecs%2Fh263%2Frv20.rs;h=3298fab3aaafe38912b73cac63e395b758704fd9;hb=5a3ac1b7ad4ea52f43b0464ecedffdad9db643fe;hp=643b550aa481e58e349b859dc3c3584c5bac3fc9;hpb=7c37f176d137984aba6778adb241d195f986b60d;p=nihav.git diff --git a/src/codecs/h263/rv20.rs b/src/codecs/h263/rv20.rs index 643b550..3298fab 100644 --- a/src/codecs/h263/rv20.rs +++ b/src/codecs/h263/rv20.rs @@ -11,7 +11,9 @@ use super::data::*; struct Tables { intra_mcbpc_cb: Codebook, inter_mcbpc_cb: Codebook, + mbtype_b_cb: Codebook, cbpy_cb: Codebook, + cbpc_b_cb: Codebook, rl_cb: Codebook, aic_rl_cb: Codebook, mv_cb: Codebook, @@ -53,6 +55,7 @@ struct RealVideo20BR<'a> { struct RV20SliceInfo { ftype: Type, + seq: u32, qscale: u8, mb_x: usize, mb_y: usize, @@ -62,8 +65,8 @@ struct RV20SliceInfo { } 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 } } } @@ -109,10 +112,10 @@ impl<'a> RealVideo20BR<'a> { #[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).unwrap() as i16; + let mut dc = br.read(8)? as i16; if dc == 255 { dc = 128; } blk[0] = dc << 3; idx = 1; @@ -128,7 +131,7 @@ impl<'a> RealVideo20BR<'a> { let q_add = if quant == 0 { 0i16 } else { ((quant - 1) | 1) as i16 }; let q = (quant * 2) as i16; while idx < 64 { - let code = br.read_cb(rl_cb).unwrap(); + let code = br.read_cb(rl_cb)?; let run; let mut level; let last; @@ -136,26 +139,18 @@ impl<'a> RealVideo20BR<'a> { run = code.get_run(); level = code.get_level(); last = code.is_last(); - if br.read_bool().unwrap() { level = -level; } - if (idx != 0) || !sstate.is_iframe { - level = (level * q) + q_add; - } else { - level = level * (H263_DC_SCALES[quant as usize] as i16); - } + if br.read_bool()? { level = -level; } + level = (level * q) + q_add; } else { - last = br.read_bool().unwrap(); - run = br.read(6).unwrap() as u8; - level = br.read_s(8).unwrap() as i16; + last = br.read_bool()?; + run = br.read(6)? as u8; + level = br.read_s(8)? as i16; if level == -128 { - let low = br.read(5).unwrap() as i16; - let top = br.read_s(6).unwrap() as i16; + let low = br.read(5)? as i16; + 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; } } @@ -171,9 +166,9 @@ impl<'a> RealVideo20BR<'a> { } fn decode_mv_component(br: &mut BitReader, mv_cb: &Codebook) -> DecoderResult { - let code = br.read_cb(mv_cb).unwrap() as i16; + let code = br.read_cb(mv_cb)? as i16; if code == 0 { return Ok(0) } - if !br.read_bool().unwrap() { + if !br.read_bool()? { Ok(code) } else { Ok(-code) @@ -181,8 +176,8 @@ fn decode_mv_component(br: &mut BitReader, mv_cb: &Codebook) -> DecoderResul } fn decode_mv(br: &mut BitReader, mv_cb: &Codebook) -> DecoderResult { - let xval = decode_mv_component(br, mv_cb).unwrap(); - let yval = decode_mv_component(br, mv_cb).unwrap(); + 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)) } @@ -193,14 +188,14 @@ impl<'a> BlockDecoder for RealVideo20BR<'a> { fn decode_pichdr(&mut self) -> DecoderResult { 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().unwrap(); + 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; if self.slice_no < self.num_slices { let pos = self.br.tell(); - let shdr2 = self.read_slice_header().unwrap(); + let shdr2 = self.read_slice_header()?; self.br.seek(pos as u32)?; mb_count = shdr2.mb_pos - shdr.mb_pos; } else { @@ -208,19 +203,19 @@ println!("slice ends @ {}\n", self.br.tell()); }*/ 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 { //println!("read slice {} header", self.slice_no); - let shdr = self.read_slice_header().unwrap(); + let shdr = self.read_slice_header()?; self.slice_no += 1; let mb_count; if self.slice_no < self.num_slices { let pos = self.br.tell(); - let shdr2 = self.read_slice_header().unwrap(); + let shdr2 = self.read_slice_header()?; mb_count = shdr2.mb_pos - shdr.mb_pos; self.br.seek(pos as u32)?; } else { @@ -232,29 +227,29 @@ println!("slice ends @ {}\n", self.br.tell()); } fn decode_block_header(&mut self, info: &PicInfo, slice: &SliceInfo, sstate: &SliceState) -> DecoderResult { - let mut br = &mut self.br; + let br = &mut self.br; let mut q = slice.get_quant(); match info.get_mode() { Type::I => { - let mut cbpc = br.read_cb(&self.tables.intra_mcbpc_cb).unwrap(); - while cbpc == 8 { cbpc = br.read_cb(&self.tables.intra_mcbpc_cb).unwrap(); } + let mut cbpc = br.read_cb(&self.tables.intra_mcbpc_cb)?; + while cbpc == 8 { cbpc = br.read_cb(&self.tables.intra_mcbpc_cb)?; } let mut acpred = ACPredMode::None; if let Some(ref pi) = info.plusinfo { if pi.aic { let acpp = br.read_bool()?; acpred = ACPredMode::DC; - println!(" acp {} @ {}", acpp as u8, br.tell()); +//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).unwrap(); + let cbpy = br.read_cb(&self.tables.cbpy_cb)?; let cbp = (cbpy << 2) | (cbpc & 3); let dquant = (cbpc & 4) != 0; if dquant { - let idx = br.read(2).unwrap() as usize; + 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()); @@ -263,51 +258,90 @@ println!(" MB {},{} CBP {:X} @ {}", sstate.mb_x, sstate.mb_y, cbp, br.tell()); Ok(binfo) }, Type::P => { - if br.read_bool().unwrap() { + if br.read_bool()? { return Ok(BlockInfo::new(Type::Skip, 0, info.get_quant())); } - let mut cbpc = br.read_cb(&self.tables.inter_mcbpc_cb).unwrap(); - while cbpc == 20 { cbpc = br.read_cb(&self.tables.inter_mcbpc_cb).unwrap(); } + let mut cbpc = br.read_cb(&self.tables.inter_mcbpc_cb)?; + while cbpc == 20 { cbpc = br.read_cb(&self.tables.inter_mcbpc_cb)?; } let is_intra = (cbpc & 0x04) != 0; let dquant = (cbpc & 0x08) != 0; let is_4x4 = (cbpc & 0x10) != 0; if is_intra { - let cbpy = br.read_cb(&self.tables.cbpy_cb).unwrap(); + let cbpy = br.read_cb(&self.tables.cbpy_cb)?; let cbp = (cbpy << 2) | (cbpc & 3); if dquant { - let idx = br.read(2).unwrap() as usize; + let idx = br.read(2)? as usize; q = ((q as i16) + (H263_DQUANT_TAB[idx] as i16)) as u8; } let binfo = BlockInfo::new(Type::I, cbp, q); return Ok(binfo); } - let mut cbpy = br.read_cb(&self.tables.cbpy_cb).unwrap(); + let mut cbpy = br.read_cb(&self.tables.cbpy_cb)?; // if /* !aiv && */(cbpc & 3) != 3 { cbpy ^= 0xF; // } let cbp = (cbpy << 2) | (cbpc & 3); if dquant { - let idx = br.read(2).unwrap() as usize; + 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).unwrap()]; + let mvec: [MV; 1] = [decode_mv(br, &self.tables.mv_cb)?]; binfo.set_mv(&mvec); } else { let mvec: [MV; 4] = [ - decode_mv(br, &self.tables.mv_cb).unwrap(), - decode_mv(br, &self.tables.mv_cb).unwrap(), - decode_mv(br, &self.tables.mv_cb).unwrap(), - decode_mv(br, &self.tables.mv_cb).unwrap() + decode_mv(br, &self.tables.mv_cb)?, + decode_mv(br, &self.tables.mv_cb)?, + decode_mv(br, &self.tables.mv_cb)?, + decode_mv(br, &self.tables.mv_cb)? ]; binfo.set_mv(&mvec); } Ok(binfo) }, - _ => { println!("wrong info mode"); Err(DecoderError::InvalidData) }, + 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 is_coded = (H263_MBTYPE_B_CAPS[mbtype] & H263_MBB_CAP_CODED) != 0; + let is_intra = (H263_MBTYPE_B_CAPS[mbtype] & H263_MBB_CAP_INTRA) != 0; + let dquant = (H263_MBTYPE_B_CAPS[mbtype] & H263_MBB_CAP_DQUANT) != 0; + let is_fwd = (H263_MBTYPE_B_CAPS[mbtype] & H263_MBB_CAP_FORWARD) != 0; + let is_bwd = (H263_MBTYPE_B_CAPS[mbtype] & H263_MBB_CAP_BACKWARD) != 0; + + let cbp = if is_coded { + let cbpc = br.read_cb(&self.tables.cbpc_b_cb)?; + let mut cbpy = br.read_cb(&self.tables.cbpy_cb)?; + if !is_intra { cbpy ^= 0xF; } + (cbpy << 2) | (cbpc & 3) + } else { 0 }; + + if dquant { + 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); + return Ok(binfo); + } + + let mut binfo = BlockInfo::new(Type::B, cbp, q); + if is_fwd { + let mvec: [MV; 1] = [decode_mv(br, &self.tables.mv_cb)?]; + binfo.set_mv(&mvec); + } + if is_bwd { + let mvec: [MV; 1] = [decode_mv(br, &self.tables.mv_cb)?]; + binfo.set_b_mv(&mvec); + } + Ok(binfo) + }, + _ => { unreachable!(); }, } } @@ -321,8 +355,6 @@ println!(" MB {}.{} cbp = {:X}", sstate.mb_x, sstate.mb_y, cbp); } fn is_slice_end(&mut self) -> bool { false } - - fn is_gob(&mut self) -> bool { false } } impl<'a> RealVideo20BR<'a> { @@ -330,33 +362,33 @@ impl<'a> RealVideo20BR<'a> { fn read_slice_header(&mut self) -> DecoderResult { validate!(self.slice_no < self.num_slices); - let mut br = &mut self.br; - br.seek(self.slice_off[self.slice_no] * 8).unwrap(); + 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).unwrap(); + let frm_type = br.read(2)?; let ftype = match frm_type { 0 | 1 => { Type::I }, 2 => { Type::P }, - _ => { Type::Skip }, + _ => { Type::B }, }; - let marker = br.read(1).unwrap(); + let marker = br.read(1)?; validate!(marker == 0); - let qscale = br.read(5).unwrap() as u8; + let qscale = br.read(5)? as u8; validate!(qscale > 0); if self.minor_ver >= 2 { - br.skip(1).unwrap(); // loop filter + br.skip(1)?; // loop filter } let seq = if self.minor_ver <= 1 { - br.read(8).unwrap() << 7 + br.read(8)? << 8 } else { - br.read(13).unwrap() << 2 + br.read(13)? << 3 }; let w; let h; if self.rpr.present { - let rpr = br.read(self.rpr.bits).unwrap() as usize; + let rpr = br.read(self.rpr.bits)? as usize; if rpr == 0 { w = self.w; h = self.h; @@ -370,18 +402,18 @@ impl<'a> RealVideo20BR<'a> { h = self.h; } - let mb_pos = br.read(self.mb_pos_bits).unwrap() as usize; + let mb_pos = br.read(self.mb_pos_bits)? as usize; let mb_x = mb_pos % self.mb_w; let mb_y = mb_pos / self.mb_w; - br.skip(1).unwrap(); // no rounding + br.skip(1)?; // no rounding if (self.minor_ver <= 1) && (frm_type == 3) { - br.skip(5).unwrap(); + 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)) } } @@ -391,8 +423,12 @@ impl RealVideo20Decoder { let intra_mcbpc_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); let mut coderead = H263ShortCodeReader::new(H263_INTER_MCBPC); let inter_mcbpc_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); + let mut coderead = H263ShortCodeReader::new(H263_MBTYPE_B); + let mbtype_b_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); let mut coderead = H263ShortCodeReader::new(H263_CBPY); let cbpy_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); + let mut coderead = H263ShortCodeReader::new(H263_CBPC_B); + let cbpc_b_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); let mut coderead = H263RLCodeReader::new(H263_RL_CODES); let rl_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); let mut coderead = H263RLCodeReader::new(H263_RL_CODES_AIC); @@ -403,7 +439,9 @@ impl RealVideo20Decoder { let tables = Tables { intra_mcbpc_cb: intra_mcbpc_cb, inter_mcbpc_cb: inter_mcbpc_cb, + mbtype_b_cb: mbtype_b_cb, cbpy_cb: cbpy_cb, + cbpc_b_cb: cbpc_b_cb, rl_cb: rl_cb, aic_rl_cb: aic_rl_cb, mv_cb: mv_cb, @@ -411,7 +449,7 @@ impl RealVideo20Decoder { RealVideo20Decoder{ info: Rc::new(DUMMY_CODEC_INFO), - dec: H263BaseDecoder::new(), + dec: H263BaseDecoder::new_b_frames(false), tables: tables, w: 0, h: 0, @@ -465,11 +503,11 @@ println!("ver {:06X}", ver); 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).unwrap(); + let bufinfo = self.dec.parse_frame(&mut ibr, &self.bdsp)?; let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo); frm.set_keyframe(self.dec.is_intra()); - frm.set_frame_type(if self.dec.is_intra() { FrameType::I } else { FrameType::P }); + frm.set_frame_type(self.dec.get_frame_type()); Ok(Rc::new(RefCell::new(frm))) } } @@ -494,7 +532,7 @@ mod test { 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(7000), true, false, Some("rv20")); // test_file_decoding("realmedia", "assets/RV/rv20_cook_640x352_realproducer_plus_8.51.rm", /*None*/Some(1000), true, false, Some("rv20")); } }