RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-01 02:00:50 +00:00
Code Issues Projects Releases Wiki Activity

dcstr: 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-13 11:11:26 +02:00 committed by James Almer
parent e4fc86a458
commit 6a9668e17f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/dcstr.c
View File

@ -41,7 +41,7 @@ static int dcstr_read_header(AVFormatContext *s)
return AVERROR(ENOMEM);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->channels = avio_rl32(s->pb);
st->codecpar->ch_layout.nb_channels = avio_rl32(s->pb);
st->codecpar->sample_rate = avio_rl32(s->pb);
if (st->codecpar->sample_rate <= 0)
return AVERROR_INVALIDDATA;
@ -50,14 +50,16 @@ static int dcstr_read_header(AVFormatContext *s)
avio_skip(s->pb, 4);
st->duration = avio_rl32(s->pb);
mult = avio_rl32(s->pb);
if (st->codecpar->channels <= 0 || mult <= 0 || mult > INT_MAX / st->codecpar->channels) {
av_log(s, AV_LOG_ERROR, "invalid number of channels %d x %d\n", st->codecpar->channels, mult);
if (st->codecpar->ch_layout.nb_channels <= 0 || mult <= 0 ||
mult > INT_MAX / st->codecpar->ch_layout.nb_channels) {
av_log(s, AV_LOG_ERROR, "invalid number of channels %d x %d\n",
st->codecpar->ch_layout.nb_channels, mult);
return AVERROR_INVALIDDATA;
}
st->codecpar->channels *= mult;
if (!align || align > INT_MAX / st->codecpar->channels)
st->codecpar->ch_layout.nb_channels *= mult;
if (!align || align > INT_MAX / st->codecpar->ch_layout.nb_channels)
return AVERROR_INVALIDDATA;
st->codecpar->block_align = align * st->codecpar->channels;
st->codecpar->block_align = align * st->codecpar->ch_layout.nb_channels;
switch (codec) {
case 4: st->codecpar->codec_id = AV_CODEC_ID_ADPCM_AICA; break;