virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

wavpack: frame multi-threading support

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol
2013-06-03 16:22:46 +00:00
parent 495db0e3b0
commit 9684d7f1a2
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/wavpack.c
View File

@@ -25,6 +25,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "internal.h" #include "internal.h"
#include "thread.h"
#include "unary.h" #include "unary.h"
#include "bytestream.h" #include "bytestream.h"
@@ -754,6 +755,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
AVFrame *frame, const uint8_t *buf, int buf_size) AVFrame *frame, const uint8_t *buf, int buf_size)
{ {
WavpackContext *wc = avctx->priv_data; WavpackContext *wc = avctx->priv_data;
ThreadFrame tframe = { .f = frame };
WavpackFrameContext *s; WavpackFrameContext *s;
GetByteContext gb; GetByteContext gb;
void *samples_l, *samples_r; void *samples_l, *samples_r;
@@ -1120,7 +1122,7 @@ static int wavpack_decode_block(AVCodecContext *avctx, int block_no,
/* get output buffer */ /* get output buffer */
frame->nb_samples = s->samples + 1; frame->nb_samples = s->samples + 1;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) if ((ret = ff_thread_get_buffer(avctx, &tframe, 0)) < 0)
return ret; return ret;
frame->nb_samples = s->samples; frame->nb_samples = s->samples;
} }
@@ -1236,6 +1238,6 @@ AVCodec ff_wavpack_decoder = {
.close = wavpack_decode_end, .close = wavpack_decode_end,
.decode = wavpack_decode_frame, .decode = wavpack_decode_frame,
.flush = wavpack_decode_flush, .flush = wavpack_decode_flush,
.capabilities = CODEC_CAP_DR1, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS,
.long_name = NULL_IF_CONFIG_SMALL("WavPack"), .long_name = NULL_IF_CONFIG_SMALL("WavPack"),
}; };