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

fwse: 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:19:50 -03:00
parent 07cdec42d1
commit 7261f2a180
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/fwse.c
View File

@@ -40,6 +40,7 @@ static int fwse_probe(const AVProbeData *p)
static int fwse_read_header(AVFormatContext *s) static int fwse_read_header(AVFormatContext *s)
{ {
unsigned start_offset, version; unsigned start_offset, version;
int channels;
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
AVCodecParameters *par; AVCodecParameters *par;
AVStream *st; AVStream *st;
@@ -59,13 +60,10 @@ static int fwse_read_header(AVFormatContext *s)
par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = AV_CODEC_ID_ADPCM_IMA_MTF; par->codec_id = AV_CODEC_ID_ADPCM_IMA_MTF;
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;
st->duration = avio_rl32(pb); st->duration = avio_rl32(pb);
par->sample_rate = avio_rl32(pb); par->sample_rate = avio_rl32(pb);
if (par->sample_rate <= 0 || par->sample_rate > INT_MAX) if (par->sample_rate <= 0 || par->sample_rate > INT_MAX)