generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

utvideo: frame multithreading.

Browse Source 
>> 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>
This commit is contained in:
Aneesh Dogra 2012-01-09 00:49:46 +05:30 committed by Ronald S. Bultje
parent afb2aa5379
commit 12e984aed7
1 changed files with 7 additions and 4 deletions

11
libavcodec/utvideo.c

@ -31,6 +31,7 @@
#include "bytestream.h" #include "bytestream.h"
#include "get_bits.h" #include "get_bits.h"
#include "dsputil.h" #include "dsputil.h"
#include "thread.h"
enum { enum {
PRED_NONE = 0, PRED_NONE = 0,
@ -366,15 +367,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
int ret; int ret;
if (c->pic.data[0]) if (c->pic.data[0])
avctx->release_buffer(avctx, &c->pic); ff_thread_release_buffer(avctx, &c->pic);
c->pic.reference = 1; c->pic.reference = 1;
c->pic.buffer_hints = FF_BUFFER_HINTS_VALID; 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"); av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret; return ret;
} }
ff_thread_finish_setup(avctx);
/* parse plane structure to retrieve frame flags and validate slice offsets */ /* parse plane structure to retrieve frame flags and validate slice offsets */
ptr = buf; ptr = buf;
for (i = 0; i < c->planes; i++) { 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; UtvideoContext * const c = avctx->priv_data;
if (c->pic.data[0]) if (c->pic.data[0])
avctx->release_buffer(avctx, &c->pic); ff_thread_release_buffer(avctx, &c->pic);
av_freep(&c->slice_bits); av_freep(&c->slice_bits);
@ -572,7 +575,7 @@ AVCodec ff_utvideo_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("Ut Video"), .long_name = NULL_IF_CONFIG_SMALL("Ut Video"),
}; };