diff options
| author | Paul B Mahol <onemda@gmail.com> | 2018-08-22 18:46:51 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2018-08-26 18:07:57 +0200 |
| commit | 3aacb0d196d1c89c386fe26a5df8d994a3eef619 (patch) | |
| tree | eac60acc7e17478aba2fe443108fc8b71b883098 | |
| parent | c84a57d1a2189ccd99dc1d5b705f9f1578ff03aa (diff) | |
| download | ffmpeg-3aacb0d196d1c89c386fe26a5df8d994a3eef619.tar.gz | |
avcodec/proresdec2: add frame threading support
| -rw-r--r-- | libavcodec/proresdec2.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index b4ea6b5e03..d818e5d8da 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -36,6 +36,7 @@ #include "simple_idct.h" #include "proresdec.h" #include "proresdata.h" +#include "thread.h" static void permute(uint8_t *dst, const uint8_t *src, const uint8_t permutation[64]) { @@ -644,6 +645,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt) { ProresContext *ctx = avctx->priv_data; + ThreadFrame tframe = { .f = data }; AVFrame *frame = data; const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -669,7 +671,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, buf += frame_hdr_size; buf_size -= frame_hdr_size; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, &tframe, 0)) < 0) return ret; decode_picture: @@ -697,6 +699,17 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, return avpkt->size; } +#if HAVE_THREADS +static int decode_init_thread_copy(AVCodecContext *avctx) +{ + ProresContext *ctx = avctx->priv_data; + + ctx->slices = NULL; + + return 0; +} +#endif + static av_cold int decode_close(AVCodecContext *avctx) { ProresContext *ctx = avctx->priv_data; @@ -713,7 +726,8 @@ AVCodec ff_prores_decoder = { .id = AV_CODEC_ID_PRORES, .priv_data_size = sizeof(ProresContext), .init = decode_init, + .init_thread_copy = ONLY_IF_THREADS_ENABLED(decode_init_thread_copy), .close = decode_close, .decode = decode_frame, - .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS | AV_CODEC_CAP_FRAME_THREADS, }; |