diff options
| author | Paul B Mahol <onemda@gmail.com> | 2013-06-03 16:45:26 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2013-06-05 22:35:32 +0000 |
| commit | b28851a1d688f2c650977ea73c1d775417a0bd0e (patch) | |
| tree | 0beaf409d83d4f96e9ad828d587a9b287d550173 /libavcodec/alac.c | |
| parent | 9684d7f1a2264b45eb0a697b0d720a6cd5c35ea6 (diff) | |
| download | ffmpeg-b28851a1d688f2c650977ea73c1d775417a0bd0e.tar.gz | |
alac: frame multi-threading support
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/alac.c')
| -rw-r--r-- | libavcodec/alac.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libavcodec/alac.c b/libavcodec/alac.c index 751b40b046..9a6a118148 100644 --- a/libavcodec/alac.c +++ b/libavcodec/alac.c @@ -50,6 +50,7 @@ #include "get_bits.h" #include "bytestream.h" #include "internal.h" +#include "thread.h" #include "unary.h" #include "mathops.h" #include "alac_data.h" @@ -287,9 +288,10 @@ static int decode_element(AVCodecContext *avctx, AVFrame *frame, int ch_index, return AVERROR_INVALIDDATA; } if (!alac->nb_samples) { + ThreadFrame tframe = { .f = frame }; /* get output buffer */ frame->nb_samples = output_samples; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) + if ((ret = ff_thread_get_buffer(avctx, &tframe, 0)) < 0) return ret; } else if (output_samples != alac->nb_samples) { av_log(avctx, AV_LOG_ERROR, "sample count mismatch: %u != %d\n", @@ -616,6 +618,12 @@ static av_cold int alac_decode_init(AVCodecContext * avctx) return 0; } +static int init_thread_copy(AVCodecContext *avctx) +{ + ALACContext *alac = avctx->priv_data; + return allocate_buffers(alac); +} + AVCodec ff_alac_decoder = { .name = "alac", .type = AVMEDIA_TYPE_AUDIO, @@ -624,6 +632,7 @@ AVCodec ff_alac_decoder = { .init = alac_decode_init, .close = alac_decode_close, .decode = alac_decode_frame, - .capabilities = CODEC_CAP_DR1, + .init_thread_copy = init_thread_copy, + .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, .long_name = NULL_IF_CONFIG_SMALL("ALAC (Apple Lossless Audio Codec)"), }; |