Commit 88027999 authored by Christophe Gisquet's avatar Christophe Gisquet Committed by Ronald S. Bultje

rv34: remove constant parameter

is_block2 was always 0, so just remove it, and change accordingly the code.
Signed-off-by: 's avatarRonald S. Bultje <rsbultje@gmail.com>
parent 34e1b075
...@@ -260,20 +260,15 @@ static inline void decode_subblock1(DCTELEM *dst, int code, GetBitContext *gb, V ...@@ -260,20 +260,15 @@ static inline void decode_subblock1(DCTELEM *dst, int code, GetBitContext *gb, V
decode_coeff(dst, coeff, 3, gb, vlc, q); decode_coeff(dst, coeff, 3, gb, vlc, q);
} }
static inline void decode_subblock3(DCTELEM *dst, int code, const int is_block2, GetBitContext *gb, VLC *vlc, static inline void decode_subblock3(DCTELEM *dst, int code, GetBitContext *gb, VLC *vlc,
int q_dc, int q_ac1, int q_ac2) int q_dc, int q_ac1, int q_ac2)
{ {
int flags = modulo_three_table[code]; int flags = modulo_three_table[code];
decode_coeff( dst+0*4+0, (flags >> 6) , 3, gb, vlc, q_dc); decode_coeff(dst+0*4+0, (flags >> 6) , 3, gb, vlc, q_dc);
if(is_block2){ decode_coeff(dst+0*4+1, (flags >> 4) & 3, 2, gb, vlc, q_ac1);
decode_coeff(dst+1*4+0, (flags >> 4) & 3, 2, gb, vlc, q_ac1); decode_coeff(dst+1*4+0, (flags >> 2) & 3, 2, gb, vlc, q_ac1);
decode_coeff(dst+0*4+1, (flags >> 2) & 3, 2, gb, vlc, q_ac1); decode_coeff(dst+1*4+1, (flags >> 0) & 3, 2, gb, vlc, q_ac2);
}else{
decode_coeff(dst+0*4+1, (flags >> 4) & 3, 2, gb, vlc, q_ac1);
decode_coeff(dst+1*4+0, (flags >> 2) & 3, 2, gb, vlc, q_ac1);
}
decode_coeff( dst+1*4+1, (flags >> 0) & 3, 2, gb, vlc, q_ac2);
} }
/** /**
...@@ -298,7 +293,7 @@ static inline int rv34_decode_block(DCTELEM *dst, GetBitContext *gb, RV34VLC *rv ...@@ -298,7 +293,7 @@ static inline int rv34_decode_block(DCTELEM *dst, GetBitContext *gb, RV34VLC *rv
code >>= 3; code >>= 3;
if (modulo_three_table[code] & 0x3F) { if (modulo_three_table[code] & 0x3F) {
decode_subblock3(dst, code, 0, gb, &rvlc->coefficient, q_dc, q_ac1, q_ac2); decode_subblock3(dst, code, gb, &rvlc->coefficient, q_dc, q_ac1, q_ac2);
} else { } else {
decode_subblock1(dst, code, gb, &rvlc->coefficient, q_dc); decode_subblock1(dst, code, gb, &rvlc->coefficient, q_dc);
if (!pattern) if (!pattern)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment