diff options
author | Paul B Mahol <onemda@gmail.com> | 2019-08-28 17:28:16 +0200 |
---|---|---|
committer | Paul B Mahol <onemda@gmail.com> | 2019-08-28 17:28:16 +0200 |
commit | 9606e4b6e68de8c5d9ffe0c829716f0d5dbf1215 (patch) | |
tree | 3434468362e27476e79efad696090abda0614484 /libavcodec/dsddec.c | |
parent | 98f5cbcb7db455dac8b4a6cbbe0dd72ec6a892fd (diff) | |
download | ffmpeg-9606e4b6e68de8c5d9ffe0c829716f0d5dbf1215.tar.gz |
avcodec/dsddec: add slice threading support
Diffstat (limited to 'libavcodec/dsddec.c')
-rw-r--r-- | libavcodec/dsddec.c | 47 |
1 files changed, 32 insertions, 15 deletions
diff --git a/libavcodec/dsddec.c b/libavcodec/dsddec.c index 2c5c357acc..7c3ae15768 100644 --- a/libavcodec/dsddec.c +++ b/libavcodec/dsddec.c @@ -61,17 +61,20 @@ static av_cold int decode_init(AVCodecContext *avctx) return 0; } -static int decode_frame(AVCodecContext *avctx, void *data, - int *got_frame_ptr, AVPacket *avpkt) +typedef struct ThreadData { + AVFrame *frame; + AVPacket *avpkt; +} ThreadData; + +static int dsd_channel(AVCodecContext *avctx, void *tdata, int j, int threadnr) { - DSDContext * s = avctx->priv_data; - AVFrame *frame = data; - int ret, i; int lsbf = avctx->codec_id == AV_CODEC_ID_DSD_LSBF || avctx->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR; - int src_next; - int src_stride; - - frame->nb_samples = avpkt->size / avctx->channels; + DSDContext *s = avctx->priv_data; + ThreadData *td = tdata; + AVFrame *frame = td->frame; + AVPacket *avpkt = td->avpkt; + int src_next, src_stride; + float *dst = ((float **)frame->extended_data)[j]; if (avctx->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR || avctx->codec_id == AV_CODEC_ID_DSD_MSBF_PLANAR) { src_next = frame->nb_samples; @@ -81,15 +84,28 @@ static int decode_frame(AVCodecContext *avctx, void *data, src_stride = avctx->channels; } + ff_dsd2pcm_translate(&s[j], frame->nb_samples, lsbf, + avpkt->data + j * src_next, src_stride, + dst, 1); + + return 0; +} + +static int decode_frame(AVCodecContext *avctx, void *data, + int *got_frame_ptr, AVPacket *avpkt) +{ + ThreadData td; + AVFrame *frame = data; + int ret; + + frame->nb_samples = avpkt->size / avctx->channels; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - for (i = 0; i < avctx->channels; i++) { - float * dst = ((float **)frame->extended_data)[i]; - ff_dsd2pcm_translate(&s[i], frame->nb_samples, lsbf, - avpkt->data + i * src_next, src_stride, - dst, 1); - } + td.frame = frame; + td.avpkt = avpkt; + avctx->execute2(avctx, dsd_channel, &td, NULL, avctx->channels); *got_frame_ptr = 1; return frame->nb_samples * avctx->channels; @@ -103,6 +119,7 @@ AVCodec ff_##name_##_decoder = { \ .id = AV_CODEC_ID_##id_, \ .init = decode_init, \ .decode = decode_frame, \ + .capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SLICE_THREADS, \ .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, \ AV_SAMPLE_FMT_NONE }, \ }; |