virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avcodec/vc1_block: Simplify dcdiff initialization

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
zhaoxiu.zeng 2015-02-25 00:28:45 +08:00 committed by Michael Niedermayer
parent bd55f01c96
commit ccad34e3ca
1 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libavcodec/vc1_block.c
View File

@ -571,16 +571,12 @@ static int vc1_decode_i_block(VC1Context *v, int16_t block[64], int n,
return -1; return -1;
} }
if (dcdiff) { if (dcdiff) {
const int m = (v->pq == 1 || v->pq == 2) ? 3 - v->pq : 0;
if (dcdiff == 119 /* ESC index value */) { if (dcdiff == 119 /* ESC index value */) {
/* TODO: Optimize */ dcdiff = get_bits(gb, 8 + m);
if (v->pq == 1) dcdiff = get_bits(gb, 10);
else if (v->pq == 2) dcdiff = get_bits(gb, 9);
else dcdiff = get_bits(gb, 8);
} else { } else {
if (v->pq == 1) if (m)
dcdiff = (dcdiff << 2) + get_bits(gb, 2) - 3; dcdiff = (dcdiff << m) + get_bits(gb, m) - ((1 << m) - 1);
else if (v->pq == 2)
dcdiff = (dcdiff << 1) + get_bits1(gb) - 1;
} }
if (get_bits1(gb)) if (get_bits1(gb))
dcdiff = -dcdiff; dcdiff = -dcdiff;
@ -739,16 +735,12 @@ static int vc1_decode_i_block_adv(VC1Context *v, int16_t block[64], int n,
return -1; return -1;
} }
if (dcdiff) { if (dcdiff) {
const int m = (mquant == 1 || mquant == 2) ? 3 - mquant : 0;
if (dcdiff == 119 /* ESC index value */) { if (dcdiff == 119 /* ESC index value */) {
/* TODO: Optimize */ dcdiff = get_bits(gb, 8 + m);
if (mquant == 1) dcdiff = get_bits(gb, 10);
else if (mquant == 2) dcdiff = get_bits(gb, 9);
else dcdiff = get_bits(gb, 8);
} else { } else {
if (mquant == 1) if (m)
dcdiff = (dcdiff << 2) + get_bits(gb, 2) - 3; dcdiff = (dcdiff << m) + get_bits(gb, m) - ((1 << m) - 1);
else if (mquant == 2)
dcdiff = (dcdiff << 1) + get_bits1(gb) - 1;
} }
if (get_bits1(gb)) if (get_bits1(gb))
dcdiff = -dcdiff; dcdiff = -dcdiff;
@ -960,16 +952,12 @@ static int vc1_decode_intra_block(VC1Context *v, int16_t block[64], int n,
return -1; return -1;
} }
if (dcdiff) { if (dcdiff) {
const int m = (mquant == 1 || mquant == 2) ? 3 - mquant : 0;
if (dcdiff == 119 /* ESC index value */) { if (dcdiff == 119 /* ESC index value */) {
/* TODO: Optimize */ dcdiff = get_bits(gb, 8 + m);
if (mquant == 1) dcdiff = get_bits(gb, 10);
else if (mquant == 2) dcdiff = get_bits(gb, 9);
else dcdiff = get_bits(gb, 8);
} else { } else {
if (mquant == 1) if (m)
dcdiff = (dcdiff << 2) + get_bits(gb, 2) - 3; dcdiff = (dcdiff << m) + get_bits(gb, m) - ((1 << m) - 1);
else if (mquant == 2)
dcdiff = (dcdiff << 1) + get_bits1(gb) - 1;
} }
if (get_bits1(gb)) if (get_bits1(gb))
dcdiff = -dcdiff; dcdiff = -dcdiff;