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

fastaudio: convert to new channel layout API

Browse Source 
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2021-08-25 10:31:57 -03:00
parent 989ca4d86d
commit 4d73dc14de
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/fastaudio.c
View File

@ -78,7 +78,7 @@ static av_cold int fastaudio_init(AVCodecContext *avctx)
for (int i = 0; i < 8; i++) for (int i = 0; i < 8; i++)
s->table[7][i] = i * 0.34f / 3.f - 0.2f; s->table[7][i] = i * 0.34f / 3.f - 0.2f;
s->ch = av_calloc(avctx->channels, sizeof(*s->ch)); s->ch = av_calloc(avctx->ch_layout.nb_channels, sizeof(*s->ch));
if (!s->ch) if (!s->ch)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -113,7 +113,7 @@ static int fastaudio_decode(AVCodecContext *avctx, void *data,
int subframes; int subframes;
int ret; int ret;
subframes = pkt->size / (40 * avctx->channels); subframes = pkt->size / (40 * avctx->ch_layout.nb_channels);
frame->nb_samples = subframes * 256; frame->nb_samples = subframes * 256;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret; return ret;
@ -121,7 +121,7 @@ static int fastaudio_decode(AVCodecContext *avctx, void *data,
bytestream2_init(&gb, pkt->data, pkt->size); bytestream2_init(&gb, pkt->data, pkt->size);
for (int subframe = 0; subframe < subframes; subframe++) { for (int subframe = 0; subframe < subframes; subframe++) {
for (int channel = 0; channel < avctx->channels; channel++) { for (int channel = 0; channel < avctx->ch_layout.nb_channels; channel++) {
ChannelItems *ch = &s->ch[channel]; ChannelItems *ch = &s->ch[channel];
float result[256] = { 0 }; float result[256] = { 0 };
unsigned src[10]; unsigned src[10];