virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avcodec/jpeg2000dec: add slice threading support

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-03-25 14:33:15 +01:00
parent e2298b3fcc
commit 585cfabb79
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/jpeg2000dec.c
View File

@ -1755,9 +1755,12 @@ WRITE_FRAME(16, uint16_t)
#undef WRITE_FRAME #undef WRITE_FRAME
static int jpeg2000_decode_tile(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, static int jpeg2000_decode_tile(AVCodecContext *avctx, void *td,
AVFrame *picture) int jobnr, int threadnr)
{ {
Jpeg2000DecoderContext *s = avctx->priv_data;
AVFrame *picture = td;
Jpeg2000Tile *tile = s->tile + jobnr;
int x; int x;
tile_codeblocks(s, tile); tile_codeblocks(s, tile);
@ -2067,7 +2070,7 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data,
Jpeg2000DecoderContext *s = avctx->priv_data; Jpeg2000DecoderContext *s = avctx->priv_data;
ThreadFrame frame = { .f = data }; ThreadFrame frame = { .f = data };
AVFrame *picture = data; AVFrame *picture = data;
int tileno, ret; int ret;
s->avctx = avctx; s->avctx = avctx;
bytestream2_init(&s->g, avpkt->data, avpkt->size); 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)) if (ret = jpeg2000_read_bitstream_packets(s))
goto end; goto end;
for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++) avctx->execute2(avctx, jpeg2000_decode_tile, picture, NULL, s->numXtiles * s->numYtiles);
if (ret = jpeg2000_decode_tile(s, s->tile + tileno, picture))
goto end;
jpeg2000_dec_cleanup(s); jpeg2000_dec_cleanup(s);
@ -2159,7 +2160,7 @@ AVCodec ff_jpeg2000_decoder = {
.long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"), .long_name = NULL_IF_CONFIG_SMALL("JPEG 2000"),
.type = AVMEDIA_TYPE_VIDEO, .type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_JPEG2000, .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), .priv_data_size = sizeof(Jpeg2000DecoderContext),
.init_static_data = jpeg2000_init_static_data, .init_static_data = jpeg2000_init_static_data,
.init = jpeg2000_decode_init, .init = jpeg2000_decode_init,