virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

dst: 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:34:13 +02:00 committed by James Almer
parent fbd6e2bab4
commit 89f9a9061e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/dstdec.c
View File

@ -80,8 +80,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
DSTContext *s = avctx->priv_data; DSTContext *s = avctx->priv_data;
int i; int i;
if (avctx->channels > DST_MAX_CHANNELS) { if (avctx->ch_layout.nb_channels > DST_MAX_CHANNELS) {
avpriv_request_sample(avctx, "Channel count %d", avctx->channels); avpriv_request_sample(avctx, "Channel count %d", avctx->ch_layout.nb_channels);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
@ -97,7 +97,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
avctx->sample_fmt = AV_SAMPLE_FMT_FLT; avctx->sample_fmt = AV_SAMPLE_FMT_FLT;
for (i = 0; i < avctx->channels; i++) for (i = 0; i < avctx->ch_layout.nb_channels; i++)
memset(s->dsdctx[i].buf, 0x69, sizeof(s->dsdctx[i].buf)); memset(s->dsdctx[i].buf, 0x69, sizeof(s->dsdctx[i].buf));
ff_init_dsd_data(); ff_init_dsd_data();
@ -243,7 +243,7 @@ static int decode_frame(AVCodecContext *avctx, void *data,
unsigned map_ch_to_pelem[DST_MAX_CHANNELS]; unsigned map_ch_to_pelem[DST_MAX_CHANNELS];
unsigned i, ch, same_map, dst_x_bit; unsigned i, ch, same_map, dst_x_bit;
unsigned half_prob[DST_MAX_CHANNELS]; unsigned half_prob[DST_MAX_CHANNELS];
const int channels = avctx->channels; const int channels = avctx->ch_layout.nb_channels;
DSTContext *s = avctx->priv_data; DSTContext *s = avctx->priv_data;
GetBitContext *gb = &s->gb; GetBitContext *gb = &s->gb;
ArithCoder *ac = &s->ac; ArithCoder *ac = &s->ac;