Commit 10338073 authored by Paul B Mahol's avatar Paul B Mahol

exr: frame multithreading support

Signed-off-by: 's avatarPaul B Mahol <onemda@gmail.com>
parent 67421699
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "mathops.h" #include "mathops.h"
#include "thread.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
enum ExrCompr { enum ExrCompr {
...@@ -478,7 +479,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -478,7 +479,7 @@ static int decode_frame(AVCodecContext *avctx,
} }
if (s->picture.data[0]) if (s->picture.data[0])
avctx->release_buffer(avctx, &s->picture); ff_thread_release_buffer(avctx, &s->picture);
if (av_image_check_size(w, h, 0, avctx)) if (av_image_check_size(w, h, 0, avctx))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -505,7 +506,7 @@ static int decode_frame(AVCodecContext *avctx, ...@@ -505,7 +506,7 @@ static int decode_frame(AVCodecContext *avctx,
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
if ((ret = avctx->get_buffer(avctx, p)) < 0) { if ((ret = ff_thread_get_buffer(avctx, p)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
} }
...@@ -660,6 +661,6 @@ AVCodec ff_exr_decoder = { ...@@ -660,6 +661,6 @@ AVCodec ff_exr_decoder = {
.init = decode_init, .init = decode_init,
.close = decode_end, .close = decode_end,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"), .long_name = NULL_IF_CONFIG_SMALL("OpenEXR image"),
}; };
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment