diff options
| author | Aneesh Dogra <lionaneesh@gmail.com> | 2012-01-09 00:49:46 +0530 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-01-08 12:21:10 -0800 |
| commit | 12e984aed76d52e959bb7cbee72c149444ff58ce (patch) | |
| tree | b5e92ca7afd47eaf83e435b70aa317242adb213b /libavcodec | |
| parent | afb2aa537954db537d54358997b68f46561fd5a7 (diff) | |
| download | ffmpeg-12e984aed76d52e959bb7cbee72c149444ff58ce.tar.gz | |
utvideo: frame multithreading.
>> time ./avconv -i file.avi -f null -
Before : real 0m7.784s
After : real 0m3.662s
Tested on a Intel Core i3 Processor (2 cores, 4 threads).
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utvideo.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libavcodec/utvideo.c b/libavcodec/utvideo.c index d105d29148..89854c277c 100644 --- a/libavcodec/utvideo.c +++ b/libavcodec/utvideo.c @@ -31,6 +31,7 @@ #include "bytestream.h" #include "get_bits.h" #include "dsputil.h" +#include "thread.h" enum { PRED_NONE = 0, @@ -366,15 +367,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac int ret; if (c->pic.data[0]) - avctx->release_buffer(avctx, &c->pic); + ff_thread_release_buffer(avctx, &c->pic); c->pic.reference = 1; c->pic.buffer_hints = FF_BUFFER_HINTS_VALID; - if ((ret = avctx->get_buffer(avctx, &c->pic)) < 0) { + if ((ret = ff_thread_get_buffer(avctx, &c->pic)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } + ff_thread_finish_setup(avctx); + /* parse plane structure to retrieve frame flags and validate slice offsets */ ptr = buf; for (i = 0; i < c->planes; i++) { @@ -557,7 +560,7 @@ static av_cold int decode_end(AVCodecContext *avctx) UtvideoContext * const c = avctx->priv_data; if (c->pic.data[0]) - avctx->release_buffer(avctx, &c->pic); + ff_thread_release_buffer(avctx, &c->pic); av_freep(&c->slice_bits); @@ -572,7 +575,7 @@ AVCodec ff_utvideo_decoder = { .init = decode_init, .close = decode_end, .decode = decode_frame, - .capabilities = CODEC_CAP_DR1, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, .long_name = NULL_IF_CONFIG_SMALL("Ut Video"), }; |