History

avcodec/jpeg2000dec: jpeg2000 has its own lowres option

jpeg2000 overrides the global lowres variable with a lowres field called reduction_factor ffmpeg -lowres X causes the reduction_factor to be set ffplay -lowres X causes both lowres and the reduction_factor to be set ossfuss sets only lowres only the ffmpeg variant works. This patch tries to make the other 2 work. Alternative we could just error out if things are inconsistent. More complex restructuring should be limited to the master branch to keep this reasonably easy to backport Fixes: out of array access Fixes: 59672/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000

Michael Niedermayer committed 3 years ago

Commit c012d1f1 parent 90647a91 file · +9 −1Browse files

Unified · Split

libavcodec/jpeg2000dec.c+9−1
@@ -308,7 +308,7 @@ static int get_siz(Jpeg2000DecoderContext *s) · 307 unmodified lines
308308 dimy = FFMAX(dimy, ff_jpeg2000_ceildiv(o_dimy, s->cdy[i]));
309309 }
310310
311− ret = ff_set_dimensions(s->avctx, dimx, dimy);
311+ ret = ff_set_dimensions(s->avctx, dimx << s->avctx->lowres, dimy << s->avctx->lowres);
312312 if (ret < 0)
313313 return ret;
314314
@@ -2426,6 +2426,14 @@ static av_cold int jpeg2000_decode_init(AVCodecContext *avctx) · 2111 unmodified lines
24262426 {
24272427 Jpeg2000DecoderContext *s = avctx->priv_data;
24282428
2429+ if (avctx->lowres)
2430+ av_log(avctx, AV_LOG_WARNING, "lowres is overriden by reduction_factor but set anyway\n");
2431+ if (!s->reduction_factor && avctx->lowres < JPEG2000_MAX_RESLEVELS) {
2432+ s->reduction_factor = avctx->lowres;
2433+ }
2434+ if (avctx->lowres != s->reduction_factor && avctx->lowres)
2435+ return AVERROR(EINVAL);
2436+
24292437 ff_jpeg2000dsp_init(&s->dsp);
24302438 ff_jpeg2000_init_tier1_luts();
24312439

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t