highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dsd: convert to new channel layout API

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Anton Khirnov
2019-05-29 08:13:23 +02:00
committed by James Almer
parent c5022f51f5
commit 2e430c1468
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/dsddec.c
View File

@@ -44,17 +44,17 @@ static av_cold int decode_init(AVCodecContext *avctx)
int i; int i;
uint8_t silence; uint8_t silence;
if (!avctx->channels) if (!avctx->ch_layout.nb_channels)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
ff_init_dsd_data(); ff_init_dsd_data();
s = av_malloc_array(sizeof(DSDContext), avctx->channels); s = av_malloc_array(sizeof(DSDContext), avctx->ch_layout.nb_channels);
if (!s) if (!s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
silence = avctx->codec_id == AV_CODEC_ID_DSD_LSBF || avctx->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR ? DSD_SILENCE_REVERSED : DSD_SILENCE; silence = avctx->codec_id == AV_CODEC_ID_DSD_LSBF || avctx->codec_id == AV_CODEC_ID_DSD_LSBF_PLANAR ? DSD_SILENCE_REVERSED : DSD_SILENCE;
for (i = 0; i < avctx->channels; i++) { for (i = 0; i < avctx->ch_layout.nb_channels; i++) {
s[i].pos = 0; s[i].pos = 0;
memset(s[i].buf, silence, sizeof(s[i].buf)); memset(s[i].buf, silence, sizeof(s[i].buf));
} }
@@ -84,7 +84,7 @@ static int dsd_channel(AVCodecContext *avctx, void *tdata, int j, int threadnr)
src_stride = 1; src_stride = 1;
} else { } else {
src_next = 1; src_next = 1;
src_stride = avctx->channels; src_stride = avctx->ch_layout.nb_channels;
} }
ff_dsd2pcm_translate(&s[j], frame->nb_samples, lsbf, ff_dsd2pcm_translate(&s[j], frame->nb_samples, lsbf,
@@ -101,17 +101,17 @@ static int decode_frame(AVCodecContext *avctx, void *data,
AVFrame *frame = data; AVFrame *frame = data;
int ret; int ret;
frame->nb_samples = avpkt->size / avctx->channels; frame->nb_samples = avpkt->size / avctx->ch_layout.nb_channels;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret; return ret;
td.frame = frame; td.frame = frame;
td.avpkt = avpkt; td.avpkt = avpkt;
avctx->execute2(avctx, dsd_channel, &td, NULL, avctx->channels); avctx->execute2(avctx, dsd_channel, &td, NULL, avctx->ch_layout.nb_channels);
*got_frame_ptr = 1; *got_frame_ptr = 1;
return frame->nb_samples * avctx->channels; return frame->nb_samples * avctx->ch_layout.nb_channels;
} }
#define DSD_DECODER(id_, name_, long_name_) \ #define DSD_DECODER(id_, name_, long_name_) \