diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 11:33:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-25 11:33:51 +0100 |
| commit | ed25ca16617121b382a961980707844fafcf82f8 (patch) | |
| tree | ea582f538fe589342d6f861a164901627fd68941 | |
| parent | bcccb2c2986bca9307b66a8d681addad54c786ff (diff) | |
| parent | b67138598ce158e3083f6295a27b63e2065d5ecb (diff) | |
| download | ffmpeg-ed25ca16617121b382a961980707844fafcf82f8.tar.gz | |
Merge commit 'b67138598ce158e3083f6295a27b63e2065d5ecb'
* commit 'b67138598ce158e3083f6295a27b63e2065d5ecb':
vc1: Simplify a little setting the intra variables
Conflicts:
libavcodec/vc1_block.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vc1_block.c | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index 6f84228edf..5d2562967d 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -1638,8 +1638,6 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA; s->mb_intra = 1; v->is_intra[s->mb_x] = 0x3F; - for (i = 0; i < 6; i++) - v->mb_type[0][s->block_index[i]] = 1; fieldtx = v->fieldtx_plane[mb_pos] = get_bits1(gb); mb_has_coeffs = get_bits1(gb); if (mb_has_coeffs) @@ -1652,11 +1650,11 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) s->c_dc_scale = s->c_dc_scale_table[mquant]; dst_idx = 0; for (i = 0; i < 6; i++) { - s->dc_val[0][s->block_index[i]] = 0; + v->a_avail = v->c_avail = 0; + v->mb_type[0][s->block_index[i]] = 1; + s->dc_val[0][s->block_index[i]] = 0; dst_idx += i >> 2; val = ((cbp >> (5 - i)) & 1); - v->mb_type[0][s->block_index[i]] = s->mb_intra; - v->a_avail = v->c_avail = 0; if (i == 2 || i == 3 || !s->first_slice_line) v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; if (i == 1 || i == 3 || s->mb_x) @@ -1822,11 +1820,11 @@ static int vc1_decode_p_mb_intfi(VC1Context *v) cbp = 1 + get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_ICBPCY_VLC_BITS, 2); dst_idx = 0; for (i = 0; i < 6; i++) { - s->dc_val[0][s->block_index[i]] = 0; + v->a_avail = v->c_avail = 0; v->mb_type[0][s->block_index[i]] = 1; + s->dc_val[0][s->block_index[i]] = 0; dst_idx += i >> 2; val = ((cbp >> (5 - i)) & 1); - v->a_avail = v->c_avail = 0; if (i == 2 || i == 3 || !s->first_slice_line) v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; if (i == 1 || i == 3 || s->mb_x) @@ -2100,11 +2098,11 @@ static void vc1_decode_b_mb_intfi(VC1Context *v) cbp = 1 + get_vlc2(&v->s.gb, v->cbpcy_vlc->table, VC1_ICBPCY_VLC_BITS, 2); dst_idx = 0; for (i = 0; i < 6; i++) { - s->dc_val[0][s->block_index[i]] = 0; + v->a_avail = v->c_avail = 0; + v->mb_type[0][s->block_index[i]] = 1; + s->dc_val[0][s->block_index[i]] = 0; dst_idx += i >> 2; val = ((cbp >> (5 - i)) & 1); - v->mb_type[0][s->block_index[i]] = s->mb_intra; - v->a_avail = v->c_avail = 0; if (i == 2 || i == 3 || !s->first_slice_line) v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; if (i == 1 || i == 3 || s->mb_x) @@ -2313,8 +2311,6 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) s->current_picture.mb_type[mb_pos] = MB_TYPE_INTRA; s->mb_intra = 1; v->is_intra[s->mb_x] = 0x3F; - for (i = 0; i < 6; i++) - v->mb_type[0][s->block_index[i]] = 1; fieldtx = v->fieldtx_plane[mb_pos] = get_bits1(gb); mb_has_coeffs = get_bits1(gb); if (mb_has_coeffs) @@ -2327,11 +2323,11 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) s->c_dc_scale = s->c_dc_scale_table[mquant]; dst_idx = 0; for (i = 0; i < 6; i++) { - s->dc_val[0][s->block_index[i]] = 0; + v->a_avail = v->c_avail = 0; + v->mb_type[0][s->block_index[i]] = 1; + s->dc_val[0][s->block_index[i]] = 0; dst_idx += i >> 2; val = ((cbp >> (5 - i)) & 1); - v->mb_type[0][s->block_index[i]] = s->mb_intra; - v->a_avail = v->c_avail = 0; if (i == 2 || i == 3 || !s->first_slice_line) v->a_avail = v->mb_type[0][s->block_index[i] - s->block_wrap[i]]; if (i == 1 || i == 3 || s->mb_x) |