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

derf: 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-23 23:17:05 -03:00
parent d03b327787
commit a64494df49
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/derf.c
View File

@ -38,6 +38,7 @@ static int derf_probe(const AVProbeData *p)
static int derf_read_header(AVFormatContext *s) static int derf_read_header(AVFormatContext *s)
{ {
unsigned data_size; unsigned data_size;
int channels;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVCodecParameters *par; AVCodecParameters *par;
AVStream *st; AVStream *st;
@ -52,15 +53,12 @@ static int derf_read_header(AVFormatContext *s)
par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = AV_CODEC_ID_DERF_DPCM; par->codec_id = AV_CODEC_ID_DERF_DPCM;
par->format = AV_SAMPLE_FMT_S16; par->format = AV_SAMPLE_FMT_S16;
par->channels = avio_rl32(pb); channels = avio_rl32(pb);
if (par->channels != 1 && par->channels != 2) if (channels != 1 && channels != 2)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (par->channels == 1) av_channel_layout_default(&par->ch_layout, channels);
par->channel_layout = AV_CH_LAYOUT_MONO;
else if (par->channels == 2)
par->channel_layout = AV_CH_LAYOUT_STEREO;
data_size = avio_rl32(pb); data_size = avio_rl32(pb);
st->duration = data_size / par->channels; st->duration = data_size / channels;
par->sample_rate = 22050; par->sample_rate = 22050;
par->block_align = 1; par->block_align = 1;