X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv20.rs;h=66413b2438178170cb2403659d55c4e04d2f2f78;hb=e07387c7f125550a41faf36a509b252cf71d7f9a;hp=527c23e754a622259ebe53ccac6f8797c1bdb329;hpb=01613464323864a655c994820d3c43df1954e3b2;p=nihav.git diff --git a/nihav-realmedia/src/codecs/rv20.rs b/nihav-realmedia/src/codecs/rv20.rs index 527c23e..66413b2 100644 --- a/nihav-realmedia/src/codecs/rv20.rs +++ b/nihav-realmedia/src/codecs/rv20.rs @@ -68,7 +68,7 @@ struct RV20SliceInfo { 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: ftype, seq: seq, qscale: qscale, mb_x: mb_x, mb_y: mb_y, mb_pos: mb_pos, w: w, h: h } + RV20SliceInfo { ftype, seq, qscale, mb_x, mb_y, mb_pos, w, h } } } @@ -98,17 +98,17 @@ impl<'a> RealVideo20BR<'a> { } RealVideo20BR { br: BitReader::new(&src[soff..], src.len() - soff, BitReaderMode::BE), - tables: tables, + tables, num_slices: nslices, slice_no: 0, slice_off: slice_offs, w: width, h: height, - mb_w: mb_w, - mb_h: mb_h, + mb_w, + mb_h, mb_pos_bits: mbpb, - minor_ver: minor_ver, - rpr: rpr, + minor_ver, + rpr, } } @@ -432,20 +432,20 @@ impl RealVideo20Decoder { let mv_cb = Codebook::new(&mut coderead, CodebookMode::MSB).unwrap(); 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, + intra_mcbpc_cb, + inter_mcbpc_cb, + mbtype_b_cb, + cbpy_cb, + cbpc_b_cb, + rl_cb, + aic_rl_cb, + mv_cb, }; RealVideo20Decoder{ info: NACodecInfoRef::default(), dec: H263BaseDecoder::new_b_frames(false), - tables: tables, + tables, w: 0, h: 0, minor_ver: 0, @@ -516,7 +516,7 @@ const H263_MBB: &[MBB; 7] = &[ MBB{ blocks: 65536, bits: 14 }, ]; -pub fn get_decoder() -> Box { +pub fn get_decoder() -> Box { Box::new(RealVideo20Decoder::new()) }