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

j2kdec: merge picture handling from jpeg2000

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-05-31 01:32:36 +02:00
parent f471b5fa30
commit 45c0e338fc
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/j2kdec.c
View File

@ -62,7 +62,6 @@ typedef struct Jpeg2000Tile {
typedef struct Jpeg2000DecoderContext {
AVClass *class;
AVCodecContext *avctx;
AVFrame *picture;
GetByteContext g;
int width, height;
@ -162,7 +161,6 @@ static int tag_tree_decode(Jpeg2000DecoderContext *s, Jpeg2000TgtNode *node,
static int get_siz(Jpeg2000DecoderContext *s)
{
int i, ret;
ThreadFrame frame = { .f = s->picture };
if (bytestream2_get_bytes_left(&s->g) < 36)
return AVERROR(EINVAL);
@ -255,13 +253,6 @@ static int get_siz(Jpeg2000DecoderContext *s)
break;
}
if ((ret = ff_thread_get_buffer(s->avctx, &frame, 0)) < 0)
return ret;
s->picture->pict_type = AV_PICTURE_TYPE_I;
s->picture->key_frame = 1;
return 0;
}
@ -1237,11 +1228,10 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame, AVPacket *avpkt)
{
Jpeg2000DecoderContext *s = avctx->priv_data;
ThreadFrame frame = { .f = data };
AVFrame *picture = data;
int tileno, ret;
s->picture = picture;
s->avctx = avctx;
bytestream2_init(&s->g, avpkt->data, avpkt->size);
s->curtileno = -1;
@ -1276,11 +1266,19 @@ static int jpeg2000_decode_frame(AVCodecContext *avctx, void *data,
if (ret = jpeg2000_read_main_headers(s))
goto err_out;
/* get picture buffer */
if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed.\n");
goto err_out;
}
picture->pict_type = AV_PICTURE_TYPE_I;
picture->key_frame = 1;
if (ret = jpeg2000_read_bitstream_packets(s))
goto err_out;
for (tileno = 0; tileno < s->numXtiles * s->numYtiles; tileno++)
if (ret = jpeg2000_decode_tile(s, s->tile + tileno, s->picture))
if (ret = jpeg2000_decode_tile(s, s->tile + tileno, picture))
goto err_out;
jpeg2000_dec_cleanup(s);