diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-03-25 14:33:15 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-03-25 22:00:52 +0100 |
| commit | 585cfabb799d510780db673bd9012a968e29aaed (patch) | |
| tree | c5e36d3239b353706a1eb68981e3aede68d527be /libavcodec/jpeg2000dec.c | |
| parent | e2298b3fccde6aeaacf97912e4f2afe2d3548e00 (diff) | |
| download | ffmpeg-585cfabb799d510780db673bd9012a968e29aaed.tar.gz | |
avcodec/jpeg2000dec: add slice threading support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/jpeg2000dec.c')
| -rw-r--r-- | libavcodec/jpeg2000dec.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 962b7bc79c..e9f5f51af3 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1755,9 +1755,12 @@ WRITE_FRAME(16, uint16_t) #undef WRITE_FRAME -static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, - AVFrame *picture) +static int jpeg2000_decode_tile(AVCodecContext *avctx, void *td, + int jobnr, int threadnr) { + Jpeg2000DecoderContext *s = avctx->priv_data; + AVFrame *picture = td; + Jpeg2000Tile *tile = s->tile + jobnr; int x; tile_codeblocks(s, tile); @@ -2067,7 +2070,7 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data, Jpeg2000DecoderContext *s = avctx->priv_data; ThreadFrame frame = { .f = data }; AVFrame *picture = data; - int tileno, ret; + int ret; s->avctx = avctx; bytestream2_init(&s->g, avpkt->data, avpkt->size); @@ -2114,9 +2117,7 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data, if (ret = jpeg2000_read_bitstream_packets(s)) goto end; - for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++) - if (ret = jpeg2000_decode_tile(s, s->tile + tileno, picture)) - goto end; + avctx->execute2(avctx, jpeg2000_decode_tile, picture, NULL, s->numXtiles * s->numYtiles); jpeg2000_dec_cleanup(s); @@ -2159,7 +2160,7 @@ AVCodec ff_jpeg2000_decoder = { .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_JPEG2000, - .capabilities = AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS | AV_CODEC_CAP_DR1, .priv_data_size = sizeof(Jpeg2000DecoderContext), .init_static_data = jpeg2000_init_static_data, .init = jpeg2000_decode_init, |