virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

mjpegdec: Fix used quant index for gbr

Browse Source 
Fixes Ticket1651

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-11 02:30:56 +02:00
parent 94e86ae15a
commit 15cee5e562
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mjpegdec.c
View File

@ -1088,7 +1088,7 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah,
s->dsp.clear_block(s->block); s->dsp.clear_block(s->block);
if (decode_block(s, s->block, i, if (decode_block(s, s->block, i,
s->dc_index[i], s->ac_index[i], s->dc_index[i], s->ac_index[i],
s->quant_matrixes[s->quant_index[c]]) < 0) { s->quant_matrixes[s->quant_sindex[i]]) < 0) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"error y=%d x=%d\n", mb_y, mb_x); "error y=%d x=%d\n", mb_y, mb_x);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -1101,9 +1101,9 @@ static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int Ah,
int16_t *block = s->blocks[c][block_idx]; int16_t *block = s->blocks[c][block_idx];
if (Ah) if (Ah)
block[0] += get_bits1(&s->gb) * block[0] += get_bits1(&s->gb) *
s->quant_matrixes[s->quant_index[c]][0] << Al; s->quant_matrixes[s->quant_sindex[i]][0] << Al;
else if (decode_dc_progressive(s, block, i, s->dc_index[i], else if (decode_dc_progressive(s, block, i, s->dc_index[i],
s->quant_matrixes[s->quant_index[c]], s->quant_matrixes[s->quant_sindex[i]],
Al) < 0) { Al) < 0) {
av_log(s->avctx, AV_LOG_ERROR, av_log(s->avctx, AV_LOG_ERROR,
"error y=%d x=%d\n", mb_y, mb_x); "error y=%d x=%d\n", mb_y, mb_x);
@ -1136,7 +1136,7 @@ static int mjpeg_decode_scan_progressive_ac(MJpegDecodeContext *s, int ss,
uint8_t *data = s->picture.data[c]; uint8_t *data = s->picture.data[c];
int linesize = s->linesize[c]; int linesize = s->linesize[c];
int last_scan = 0; int last_scan = 0;
int16_t *quant_matrix = s->quant_matrixes[s->quant_index[c]]; int16_t *quant_matrix = s->quant_matrixes[s->quant_sindex[0]];
av_assert0(ss>=0 && Ah>=0 && Al>=0); av_assert0(ss>=0 && Ah>=0 && Al>=0);
if (se < ss || se > 63) { if (se < ss || se > 63) {
@ -1231,6 +1231,7 @@ int ff_mjpeg_decode_sos(MJpegDecodeContext *s, const uint8_t *mb_bitmask,
&& nb_components == 3 && s->nb_components == 3 && i) && nb_components == 3 && s->nb_components == 3 && i)
index = 3 - i; index = 3 - i;
s->quant_sindex[i] = s->quant_index[index];
s->nb_blocks[i] = s->h_count[index] * s->v_count[index]; s->nb_blocks[i] = s->h_count[index] * s->v_count[index];
s->h_scount[i] = s->h_count[index]; s->h_scount[i] = s->h_count[index];
s->v_scount[i] = s->v_count[index]; s->v_scount[i] = s->v_count[index];

1
libavcodec/mjpegdec.h
View File

@ -84,6 +84,7 @@ typedef struct MJpegDecodeContext {
int nb_blocks[MAX_COMPONENTS]; int nb_blocks[MAX_COMPONENTS];
int h_scount[MAX_COMPONENTS]; int h_scount[MAX_COMPONENTS];
int v_scount[MAX_COMPONENTS]; int v_scount[MAX_COMPONENTS];
int quant_sindex[MAX_COMPONENTS];
int h_max, v_max; /* maximum h and v counts */ int h_max, v_max; /* maximum h and v counts */
int quant_index[4]; /* quant table index for each component */ int quant_index[4]; /* quant table index for each component */
int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */ int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */