Showing the changes to libavcodec (1 of 1 file). Show all
Unified · Split
| @@ -419,20 +419,13 @@ static int decode_residual(const H264Context *h, H264SliceContext *sl, · 418 unmodified lines | ||
| 419 | 419 | else |
| 420 | 420 | coeff_token = get_vlc2(gb, chroma422_dc_coeff_token_vlc_table, |
| 421 | 421 | CHROMA422_DC_COEFF_TOKEN_VLC_BITS, 1); |
| 422 | − total_coeff= coeff_token>>2; | |
| 423 | 422 | }else{ |
| 424 | − if(n >= LUMA_DC_BLOCK_INDEX){ | |
| 425 | − total_coeff= pred_non_zero_count(h, sl, (n - LUMA_DC_BLOCK_INDEX)*16); | |
| 426 | − coeff_token = get_vlc2(gb, coeff_token_vlc[total_coeff], | |
| 427 | − COEFF_TOKEN_VLC_BITS, 2); | |
| 428 | − total_coeff= coeff_token>>2; | |
| 429 | − }else{ | |
| 430 | − total_coeff= pred_non_zero_count(h, sl, n); | |
| 431 | − coeff_token = get_vlc2(gb, coeff_token_vlc[total_coeff], | |
| 432 | − COEFF_TOKEN_VLC_BITS, 2); | |
| 433 | − total_coeff= coeff_token>>2; | |
| 434 | − } | |
| 423 | + total_coeff = pred_non_zero_count(h, sl, n >= LUMA_DC_BLOCK_INDEX ? | |
| 424 | + (n - LUMA_DC_BLOCK_INDEX) * 16 : n); | |
| 425 | + coeff_token = get_vlc2(gb, coeff_token_vlc[total_coeff], | |
| 426 | + COEFF_TOKEN_VLC_BITS, 2); | |
| 435 | 427 | } |
| 428 | + total_coeff = coeff_token >> 2; | |
| 436 | 429 | sl->non_zero_count_cache[scan8[n]] = total_coeff; |
| 437 | 430 | |
| 438 | 431 | //FIXME set last_non_zero? |