RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

aic: use chroma scan tables while decoding luma component in progressive mode 

For some unclear reason Apple decided to use the same scan tables for luma and
chroma in the progressive mode while using different ones for luma in the
interlaced mode.
This commit is contained in:
Kostya Shishkov 2013-07-03 20:46:28 +02:00
parent 95a57d26d8
commit 410066986f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/aic.c
View File

@ -196,11 +196,11 @@ static int aic_decode_header(AICContext *ctx, const uint8_t *src, int size)
} while (0) } while (0)
static int aic_decode_coeffs(GetBitContext *gb, int16_t *dst, static int aic_decode_coeffs(GetBitContext *gb, int16_t *dst,
int band, int slice_width) int band, int slice_width, int force_chroma)
{ {
int has_skips, coeff_type, coeff_bits, skip_type, skip_bits; int has_skips, coeff_type, coeff_bits, skip_type, skip_bits;
const int num_coeffs = aic_num_band_coeffs[band]; const int num_coeffs = aic_num_band_coeffs[band];
const uint8_t *scan = aic_scan[band]; const uint8_t *scan = aic_scan[band | force_chroma];
int mb, idx, val; int mb, idx, val;
has_skips = get_bits1(gb); has_skips = get_bits1(gb);
@ -319,7 +319,8 @@ static int aic_decode_slice(AICContext *ctx, int mb_x, int mb_y,
sizeof(*ctx->slice_data) * slice_width * AIC_BAND_COEFFS); sizeof(*ctx->slice_data) * slice_width * AIC_BAND_COEFFS);
for (i = 0; i < NUM_BANDS; i++) for (i = 0; i < NUM_BANDS; i++)
if ((ret = aic_decode_coeffs(&gb, ctx->data_ptr[i], if ((ret = aic_decode_coeffs(&gb, ctx->data_ptr[i],
i, slice_width)) < 0) i, slice_width,
!ctx->interlaced)) < 0)
return ret; return ret;
for (mb = 0; mb < slice_width; mb++) { for (mb = 0; mb < slice_width; mb++) {
@ -334,7 +335,7 @@ static int aic_decode_slice(AICContext *ctx, int mb_x, int mb_y,
ctx->dsp.idct(ctx->block); ctx->dsp.idct(ctx->block);
if (!ctx->interlaced) { if (!ctx->interlaced) {
dst = Y + (blk & 1) * 8 * ystride + (blk >> 1) * 8; dst = Y + (blk >> 1) * 8 * ystride + (blk & 1) * 8;
ctx->dsp.put_signed_pixels_clamped(ctx->block, dst, ctx->dsp.put_signed_pixels_clamped(ctx->block, dst,
ystride); ystride);
} else { } else {