diff options
| author | Paul B Mahol <onemda@gmail.com> | 2017-04-11 17:05:01 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-04-11 17:05:01 +0200 |
| commit | c61dc289110c3aaed41517ce89e0d9dc9359d5d0 (patch) | |
| tree | 2fabb372e2b8ae21aaa01269f5c1bbd46d4de169 | |
| parent | 8378466507db45ed4c104e22bdb568f6965e29cc (diff) | |
| download | ffmpeg-c61dc289110c3aaed41517ce89e0d9dc9359d5d0.tar.gz | |
avcodec/lcldec: add support for frame threads
Signed-off-by: Paul B Mahol <onemda@gmail.com>
| -rw-r--r-- | libavcodec/lcldec.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c index f5040c6609..abc04e35dc 100644 --- a/libavcodec/lcldec.c +++ b/libavcodec/lcldec.c @@ -46,6 +46,7 @@ #include "bytestream.h" #include "internal.h" #include "lcl.h" +#include "thread.h" #if CONFIG_ZLIB_DECODER #include <zlib.h> @@ -157,6 +158,7 @@ static int zlib_decomp(AVCodecContext *avctx, const uint8_t *src, int src_len, i static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { AVFrame *frame = data; + ThreadFrame tframe = { .f = data }; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; LclDecContext * const c = avctx->priv_data; @@ -173,7 +175,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac unsigned int len = buf_size; int linesize; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, &tframe, 0)) < 0) return ret; outptr = frame->data[0]; // Output image pointer @@ -618,6 +620,13 @@ static av_cold int decode_init(AVCodecContext *avctx) return 0; } +#if HAVE_THREADS +static int init_thread_copy(AVCodecContext *avctx) +{ + return decode_init(avctx); +} +#endif + static av_cold int decode_end(AVCodecContext *avctx) { LclDecContext * const c = avctx->priv_data; @@ -639,9 +648,10 @@ AVCodec ff_mszh_decoder = { .id = AV_CODEC_ID_MSZH, .priv_data_size = sizeof(LclDecContext), .init = decode_init, + .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .close = decode_end, .decode = decode_frame, - .capabilities = AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif @@ -654,9 +664,10 @@ AVCodec ff_zlib_decoder = { .id = AV_CODEC_ID_ZLIB, .priv_data_size = sizeof(LclDecContext), .init = decode_init, + .init_thread_copy = ONLY_IF_THREADS_ENABLED(init_thread_copy), .close = decode_end, .decode = decode_frame, - .capabilities = AV_CODEC_CAP_DR1, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, }; #endif |