aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorJean First <jeanfirst@gmail.com>2011-09-30 11:42:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-09-30 15:40:56 +0200
commitf65c6f751fe011217ed4fa0668916c1933b1e34e (patch)
tree071d2972c3337bc44b89a9710819ba587cbfe495 /libavcodec
parent125ea3ee06c4d71082bee3fc03c65d7c8c10d68c (diff)
downloadffmpeg-f65c6f751fe011217ed4fa0668916c1933b1e34e.tar.gz
Enable multithreding when decoding with libopenjpeg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/libopenjpeg.c45
1 files changed, 36 insertions, 9 deletions
diff --git a/libavcodec/libopenjpeg.c b/libavcodec/libopenjpeg.c
index b780303904..42c71e361c 100644
--- a/libavcodec/libopenjpeg.c
+++ b/libavcodec/libopenjpeg.c
@@ -27,6 +27,7 @@
#include "libavutil/imgutils.h"
#include "avcodec.h"
#include "libavutil/intreadwrite.h"
+#include "thread.h"
#define OPJ_STATIC
#include <openjpeg.h>
@@ -58,6 +59,14 @@ static av_cold int libopenjpeg_decode_init(AVCodecContext *avctx)
return 0;
}
+static av_cold int libopenjpeg_decode_init_thread_copy(AVCodecContext *avctx)
+{
+ LibOpenJPEGContext *ctx = avctx->priv_data;
+
+ avctx->coded_frame = &ctx->image;
+ return 0;
+}
+
static int libopenjpeg_decode_frame(AVCodecContext *avctx,
void *data, int *data_size,
AVPacket *avpkt)
@@ -95,7 +104,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
}
opj_set_event_mgr((opj_common_ptr)dec, NULL, NULL);
- ctx->dec_params.cp_reduce = avctx->lowres;
+ ctx->dec_params.cp_limit_decoding = LIMIT_TO_MAIN_HEADER;
// Tie decoder with decoding parameters
opj_setup_decoder(dec, &ctx->dec_params);
stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
@@ -105,7 +114,7 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
return -1;
}
- // Decode the codestream
+ // Decode the header only
image = opj_decode_with_info(dec, stream, NULL);
opj_cio_close(stream);
if(!image) {
@@ -113,8 +122,8 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
opj_destroy_decompress(dec);
return -1;
}
- width = image->comps[0].w << avctx->lowres;
- height = image->comps[0].h << avctx->lowres;
+ width = image->x1 - image->x0;
+ height = image->y1 - image->y0;
if(av_image_check_size(width, height, 0, avctx) < 0) {
av_log(avctx, AV_LOG_ERROR, "%dx%d dimension invalid.\n", width, height);
goto done;
@@ -140,13 +149,30 @@ static int libopenjpeg_decode_frame(AVCodecContext *avctx,
}
if(picture->data[0])
- avctx->release_buffer(avctx, picture);
+ ff_thread_release_buffer(avctx, picture);
+
+ if(ff_thread_get_buffer(avctx, picture) < 0){
+ av_log(avctx, AV_LOG_ERROR, "ff_thread_get_buffer() failed\n");
+ return -1;
+ }
- if(avctx->get_buffer(avctx, picture) < 0) {
- av_log(avctx, AV_LOG_ERROR, "Couldn't allocate image buffer.\n");
+ ff_thread_finish_setup(avctx);
+
+ ctx->dec_params.cp_limit_decoding = NO_LIMITATION;
+ ctx->dec_params.cp_reduce = avctx->lowres;
+ // Tie decoder with decoding parameters
+ opj_setup_decoder(dec, &ctx->dec_params);
+ stream = opj_cio_open((opj_common_ptr)dec, buf, buf_size);
+ if(!stream) {
+ av_log(avctx, AV_LOG_ERROR, "Codestream could not be opened for reading.\n");
+ opj_destroy_decompress(dec);
return -1;
}
+ // Decode the codestream
+ image = opj_decode_with_info(dec, stream, NULL);
+ opj_cio_close(stream);
+
for(x = 0; x < image->numcomps; x++) {
adjust[x] = FFMAX(image->comps[x].prec - 8, 0);
}
@@ -180,7 +206,7 @@ static av_cold int libopenjpeg_decode_close(AVCodecContext *avctx)
LibOpenJPEGContext *ctx = avctx->priv_data;
if(ctx->image.data[0])
- avctx->release_buffer(avctx, &ctx->image);
+ ff_thread_release_buffer(avctx, &ctx->image);
return 0 ;
}
@@ -193,7 +219,8 @@ AVCodec ff_libopenjpeg_decoder = {
.init = libopenjpeg_decode_init,
.close = libopenjpeg_decode_close,
.decode = libopenjpeg_decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.max_lowres = 5,
.long_name = NULL_IF_CONFIG_SMALL("OpenJPEG based JPEG 2000 decoder"),
+ .init_thread_copy = ONLY_IF_THREADS_ENABLED(libopenjpeg_decode_init_thread_copy)
};