mb_pos: usize,
w: usize,
h: usize,
+ loop_filter: bool,
}
#[derive(Default)]
struct RV20BlockDSP {}
impl RV20SliceInfo {
- fn new(ftype: Type, seq: u32, qscale: u8, mb_x: usize, mb_y: usize, mb_pos: usize, w: usize, h: usize) -> Self {
- RV20SliceInfo { ftype, seq, qscale, mb_x, mb_y, mb_pos, w, h }
+ fn new(ftype: Type, seq: u32, qscale: u8, mb_x: usize, mb_y: usize, mb_pos: usize, w: usize, h: usize, loop_filter: bool) -> Self {
+ RV20SliceInfo { ftype, seq, qscale, mb_x, mb_y, mb_pos, w, h, loop_filter }
}
}
mb_count = self.mb_w * self.mb_h;
}*/
- let plusinfo = Some(PlusInfo::new(shdr.ftype == Type::I, false, false, false));
+ let plusinfo = Some(PlusInfo::new(shdr.ftype == Type::I, shdr.loop_filter, false, false));
let picinfo = PicInfo::new(shdr.w, shdr.h, shdr.ftype, MVMode::Long, false, false, shdr.qscale, shdr.seq as u16, None, plusinfo);
Ok(picinfo)
}
validate!(marker == 0);
let qscale = br.read(5)? as u8;
validate!(qscale > 0);
+ let loop_filter;
if self.minor_ver >= 2 {
- br.skip(1)?; // loop filter
+ loop_filter = br.read_bool()?;
+ } else {
+ loop_filter = false;
}
let seq = if self.minor_ver <= 1 {
br.read(8)? << 8
br.skip(5)?;
}
- Ok(RV20SliceInfo::new(ftype, seq, qscale, mb_x, mb_y, mb_pos, w, h))
+ Ok(RV20SliceInfo::new(ftype, seq, qscale, mb_x, mb_y, mb_pos, w, h, loop_filter))
}
}
}
}
+impl NAOptionHandler for RealVideo20Decoder {
+ fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+ fn set_options(&mut self, _options: &[NAOption]) { }
+ fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
struct MBB { blocks: usize, bits: u8 }
const H263_MBB: &[MBB; 7] = &[
MBB{ blocks: 47, bits: 6 },
[0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f],
[0x319d142d, 0x607a7c28, 0x526a2794, 0xa6e7864f],
[0xa2008d4c, 0xf4684b3a, 0xecd0526c, 0xf0742a77],
- [0xafe0df5b, 0x29cd2418, 0x29a265c7, 0x9b4f2218],
+ [0x5eef6cfd, 0x4eb49f19, 0x4d760b7a, 0x741ccd0c],
[0x0e0529df, 0xf1cc3f03, 0x03986b0d, 0xd2033c08],
- [0x4662b5ab, 0xaca5ca35, 0x4d089fb2, 0xc6a3df1e],
+ [0xdb9aa091, 0xf2c6345c, 0xde9deae8, 0x71f51a67],
[0x22c978cf, 0x6887a9ba, 0xe74c9316, 0x8cbdd29b],
- [0x12d8b88f, 0x59ebe632, 0xbcfaa336, 0xadbdd9ad],
- [0x0d99c67b, 0x3231302f, 0x3612b0d0, 0x38b5414d],
- [0x2f65b75e, 0x1239d563, 0x832ce096, 0x568a9bc2]]));
+ [0x7c83c784, 0x15b20881, 0x74798f24, 0x2096573c],
+ [0x84a68aed, 0x4cfcefb1, 0x78d1b66b, 0x21b1860a],
+ [0x78ed094a, 0x8df72434, 0x58bcd64d, 0x8d725dfd]]));
}
}