Skip to content

F
ffmpeg.wasm-core
Commit b38b7cc3 authored by Justin Ruggles's avatar Justin Ruggles
Browse files
Options

aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF

parent 2c07c180
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 13 deletions
libavformat/aiffdec.c
View file @ b38b7cc3
...@@ -110,17 +110,19 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size, ...@@ -110,17 +110,19 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size,
codec->sample_rate = sample_rate; codec->sample_rate = sample_rate;
size -= 18; size -= 18;
/* Got an AIFF-C? */ /* get codec id for AIFF-C */
if (version == AIFF_C_VERSION1) { if (version == AIFF_C_VERSION1) {
codec->codec_tag = avio_rl32(pb); codec->codec_tag = avio_rl32(pb);
codec->codec_id = ff_codec_get_id(ff_codec_aiff_tags, codec->codec_tag); codec->codec_id = ff_codec_get_id(ff_codec_aiff_tags, codec->codec_tag);
size -= 4;
}
if (version != AIFF_C_VERSION1 || codec->codec_id == CODEC_ID_PCM_S16BE) {
codec->codec_id = aiff_codec_get_id(codec->bits_per_coded_sample);
codec->bits_per_coded_sample = av_get_bits_per_sample(codec->codec_id);
aiff->block_duration = 1;
} else {
switch (codec->codec_id) { switch (codec->codec_id) {
case CODEC_ID_PCM_S16BE:
codec->codec_id = aiff_codec_get_id(codec->bits_per_coded_sample);
codec->bits_per_coded_sample = av_get_bits_per_sample(codec->codec_id);
aiff->block_duration = 1;
break;
case CODEC_ID_ADPCM_IMA_QT: case CODEC_ID_ADPCM_IMA_QT:
codec->block_align = 34*codec->channels; codec->block_align = 34*codec->channels;
break; break;
...@@ -139,16 +141,9 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size, ...@@ -139,16 +141,9 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size,
default: default:
break; break;
} }
size -= 4;
if (codec->block_align > 0) if (codec->block_align > 0)
aiff->block_duration = av_get_audio_frame_duration(codec, aiff->block_duration = av_get_audio_frame_duration(codec,
codec->block_align); codec->block_align);
} else {
/* Need the codec type */
codec->codec_id = aiff_codec_get_id(codec->bits_per_coded_sample);
codec->bits_per_coded_sample = av_get_bits_per_sample(codec->codec_id);
aiff->block_duration = 1;
} }
/* Block align needs to be computed in all cases, as the definition /* Block align needs to be computed in all cases, as the definition
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment