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

apm: 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:07:51 -03:00
parent f4a71eec32
commit 64f27c10ee
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
libavformat/apm.c
View File

@@ -104,6 +104,7 @@ static int apm_read_header(AVFormatContext *s)
APMExtraData extradata; APMExtraData extradata;
AVCodecParameters *par; AVCodecParameters *par;
uint8_t buf[APM_FILE_EXTRADATA_SIZE]; uint8_t buf[APM_FILE_EXTRADATA_SIZE];
int channels;
if (!(st = avformat_new_stream(s, NULL))) if (!(st = avformat_new_stream(s, NULL)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -116,7 +117,7 @@ static int apm_read_header(AVFormatContext *s)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
par = st->codecpar; par = st->codecpar;
par->channels = avio_rl16(s->pb); channels = avio_rl16(s->pb);
par->sample_rate = avio_rl32(s->pb); par->sample_rate = avio_rl32(s->pb);
/* Skip the bitrate, it's usually wrong anyway. */ /* Skip the bitrate, it's usually wrong anyway. */
@@ -136,17 +137,14 @@ static int apm_read_header(AVFormatContext *s)
if (par->bits_per_coded_sample != 4) if (par->bits_per_coded_sample != 4)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
if (par->channels == 2) if (channels > 2)
par->channel_layout = AV_CH_LAYOUT_STEREO;
else if (par->channels == 1)
par->channel_layout = AV_CH_LAYOUT_MONO;
else
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
av_channel_layout_default(&par->ch_layout, channels);
par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_type = AVMEDIA_TYPE_AUDIO;
par->codec_id = AV_CODEC_ID_ADPCM_IMA_APM; par->codec_id = AV_CODEC_ID_ADPCM_IMA_APM;
par->format = AV_SAMPLE_FMT_S16; par->format = AV_SAMPLE_FMT_S16;
par->bit_rate = par->channels * par->bit_rate = par->ch_layout.nb_channels *
par->sample_rate * par->sample_rate *
par->bits_per_coded_sample; par->bits_per_coded_sample;
@@ -175,7 +173,7 @@ static int apm_read_header(AVFormatContext *s)
st->start_time = 0; st->start_time = 0;
st->duration = extradata.data_size * st->duration = extradata.data_size *
(8 / par->bits_per_coded_sample) / (8 / par->bits_per_coded_sample) /
par->channels; par->ch_layout.nb_channels;
return 0; return 0;
} }
@@ -195,7 +193,7 @@ static int apm_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt->flags &= ~AV_PKT_FLAG_CORRUPT; pkt->flags &= ~AV_PKT_FLAG_CORRUPT;
pkt->stream_index = 0; pkt->stream_index = 0;
pkt->duration = ret * (8 / par->bits_per_coded_sample) / par->channels; pkt->duration = ret * (8 / par->bits_per_coded_sample) / par->ch_layout.nb_channels;
return 0; return 0;
} }
@@ -227,7 +225,7 @@ static int apm_write_init(AVFormatContext *s)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (par->channels > 2) { if (par->ch_layout.nb_channels > 2) {
av_log(s, AV_LOG_ERROR, "APM files only support up to 2 channels\n"); av_log(s, AV_LOG_ERROR, "APM files only support up to 2 channels\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
@@ -260,10 +258,10 @@ static int apm_write_header(AVFormatContext *s)
* be used because of the extra 2 bytes. * be used because of the extra 2 bytes.
*/ */
avio_wl16(s->pb, APM_TAG_CODEC); avio_wl16(s->pb, APM_TAG_CODEC);
avio_wl16(s->pb, par->channels); avio_wl16(s->pb, par->ch_layout.nb_channels);
avio_wl32(s->pb, par->sample_rate); avio_wl32(s->pb, par->sample_rate);
/* This is the wrong calculation, but it's what the orginal files have. */ /* This is the wrong calculation, but it's what the orginal files have. */
avio_wl32(s->pb, par->sample_rate * par->channels * 2); avio_wl32(s->pb, par->sample_rate * par->ch_layout.nb_channels * 2);
avio_wl16(s->pb, par->block_align); avio_wl16(s->pb, par->block_align);
avio_wl16(s->pb, par->bits_per_coded_sample); avio_wl16(s->pb, par->bits_per_coded_sample);
avio_wl32(s->pb, APM_FILE_EXTRADATA_SIZE); avio_wl32(s->pb, APM_FILE_EXTRADATA_SIZE);