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

exr: frame multithreading support

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2012-07-12 20:39:55 +00:00
parent 674216991d
commit 1033807313
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/exr.c
View File

@ -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,
} }
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,
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 = {
.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"),
}; };