From 7b6e074c65b00ec9f68ed47ca1d63ad6951e2a15 Mon Sep 17 00:00:00 2001 From: Kostya Shishkov Date: Sun, 3 Dec 2017 17:54:53 +0100 Subject: [PATCH] h263: decoder should use BlockDSP interface --- src/codecs/h263/decoder.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/codecs/h263/decoder.rs b/src/codecs/h263/decoder.rs index 4f2dbe9..cba6ef9 100644 --- a/src/codecs/h263/decoder.rs +++ b/src/codecs/h263/decoder.rs @@ -3,7 +3,7 @@ use frame::*; use super::super::*; use super::super::blockdsp; use super::*; -use super::code::*; +//use super::code::*; use formats; #[allow(dead_code)] @@ -330,7 +330,7 @@ impl H263BaseDecoder { for t in 0..8 { self.pred_coeffs[mb_pos].hor[i][t] = blk[i][t * 8]; } for t in 0..8 { self.pred_coeffs[mb_pos].ver[i][t] = blk[i][t]; } } - h263_idct(&mut blk[i]); + bdsp.idct(&mut blk[i]); } blockdsp::put_blocks(&mut buf, mb_x, mb_y, &blk); mvi.set_zero_mv(mb_x); @@ -362,7 +362,7 @@ impl H263BaseDecoder { } for i in 0..6 { bd.decode_block_inter(&binfo, &sstate, binfo.get_q(), i, ((cbp >> (5 - i)) & 1) != 0, &mut blk[i])?; - h263_idct(&mut blk[i]); + bdsp.idct(&mut blk[i]); } blockdsp::add_blocks(&mut buf, mb_x, mb_y, &blk); } else if binfo.mode != Type::B { @@ -430,7 +430,7 @@ impl H263BaseDecoder { if cbp != 0 { for i in 0..6 { bd.decode_block_inter(&binfo, &sstate, binfo.get_q(), i, ((cbp >> (5 - i)) & 1) != 0, &mut blk[i])?; - h263_idct(&mut blk[i]); + bdsp.idct(&mut blk[i]); } blockdsp::add_blocks(&mut buf, mb_x, mb_y, &blk); } @@ -447,7 +447,7 @@ impl H263BaseDecoder { b_mb.cbp = cbp; for i in 0..6 { bd.decode_block_inter(&binfo, &sstate, bquant, i, (cbp & (1 << (5 - i))) != 0, &mut b_mb.blk[i])?; - h263_idct(&mut b_mb.blk[i]); + bdsp.idct(&mut b_mb.blk[i]); } let is_fwd = !binfo.is_b_fwd(); -- 2.39.5