RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

aiff: convert to new channel layout API 

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Vittorio Giovara 2017-03-31 13:27:47 +02:00 committed by James Almer
parent 14bbc23b68
commit 0ecd7106d7
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/aiffdec.c
View File

@ -99,6 +99,7 @@ static int get_aiff_header(AVFormatContext *s, int size,
uint64_t val; uint64_t val;
int sample_rate; int sample_rate;
unsigned int num_frames; unsigned int num_frames;
int channels;
if (size == INT_MAX) if (size == INT_MAX)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
@ -106,7 +107,8 @@ static int get_aiff_header(AVFormatContext *s, int size,
if (size & 1) if (size & 1)
size++; size++;
par->codec_type = AVMEDIA_TYPE_AUDIO; par->codec_type = AVMEDIA_TYPE_AUDIO;
par->channels = avio_rb16(pb); channels = avio_rb16(pb);
par->ch_layout.nb_channels = channels;
num_frames = avio_rb32(pb); num_frames = avio_rb32(pb);
par->bits_per_coded_sample = avio_rb16(pb); par->bits_per_coded_sample = avio_rb16(pb);
@ -154,10 +156,10 @@ static int get_aiff_header(AVFormatContext *s, int size,
aiff->block_duration = 1; aiff->block_duration = 1;
break; break;
case AV_CODEC_ID_ADPCM_IMA_QT: case AV_CODEC_ID_ADPCM_IMA_QT:
par->block_align = 34 * par->channels; par->block_align = 34 * channels;
break; break;
case AV_CODEC_ID_MACE3: case AV_CODEC_ID_MACE3:
par->block_align = 2 * par->channels; par->block_align = 2 * channels;
break; break;
case AV_CODEC_ID_ADPCM_G726LE: case AV_CODEC_ID_ADPCM_G726LE:
par->bits_per_coded_sample = 5; par->bits_per_coded_sample = 5;
@ -165,7 +167,7 @@ static int get_aiff_header(AVFormatContext *s, int size,
case AV_CODEC_ID_ADPCM_G722: case AV_CODEC_ID_ADPCM_G722:
case AV_CODEC_ID_MACE6: case AV_CODEC_ID_MACE6:
case AV_CODEC_ID_SDX2_DPCM: case AV_CODEC_ID_SDX2_DPCM:
par->block_align = 1 * par->channels; par->block_align = 1 * channels;
break; break;
case AV_CODEC_ID_GSM: case AV_CODEC_ID_GSM:
par->block_align = 33; par->block_align = 33;
@ -182,7 +184,7 @@ static int get_aiff_header(AVFormatContext *s, int size,
/* Block align needs to be computed in all cases, as the definition /* Block align needs to be computed in all cases, as the definition
* is specific to applications -> here we use the WAVE format definition */ * is specific to applications -> here we use the WAVE format definition */
if (!par->block_align) if (!par->block_align)
par->block_align = (av_get_bits_per_sample(par->codec_id) * par->channels) >> 3; par->block_align = (av_get_bits_per_sample(par->codec_id) * channels) >> 3;
if (aiff->block_duration) { if (aiff->block_duration) {
par->bit_rate = av_rescale(par->sample_rate, par->block_align * 8LL, par->bit_rate = av_rescale(par->sample_rate, par->block_align * 8LL,

8
libavformat/aiffenc.c
View File

@ -144,10 +144,10 @@ static int aiff_write_header(AVFormatContext *s)
avio_wb32(pb, 0xA2805140); avio_wb32(pb, 0xA2805140);
} }
if (par->channels > 2 && par->channel_layout) { if (par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE && par->ch_layout.nb_channels > 2) {
ffio_wfourcc(pb, "CHAN"); ffio_wfourcc(pb, "CHAN");
avio_wb32(pb, 12); avio_wb32(pb, 12);
ff_mov_write_chan(pb, par->channel_layout); ff_mov_write_chan(pb, par->ch_layout.u.mask);
} }
put_meta(s, "title", MKTAG('N', 'A', 'M', 'E')); put_meta(s, "title", MKTAG('N', 'A', 'M', 'E'));
@ -158,7 +158,7 @@ static int aiff_write_header(AVFormatContext *s)
/* Common chunk */ /* Common chunk */
ffio_wfourcc(pb, "COMM"); ffio_wfourcc(pb, "COMM");
avio_wb32(pb, aifc ? 24 : 18); /* size */ avio_wb32(pb, aifc ? 24 : 18); /* size */
avio_wb16(pb, par->channels); /* Number of channels */ avio_wb16(pb, par->ch_layout.nb_channels); /* Number of channels */
aiff->frames = avio_tell(pb); aiff->frames = avio_tell(pb);
avio_wb32(pb, 0); /* Number of frames */ avio_wb32(pb, 0); /* Number of frames */
@ -170,7 +170,7 @@ static int aiff_write_header(AVFormatContext *s)
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
if (!par->block_align) if (!par->block_align)
par->block_align = (par->bits_per_coded_sample * par->channels) >> 3; par->block_align = (par->bits_per_coded_sample * par->ch_layout.nb_channels) >> 3;
avio_wb16(pb, par->bits_per_coded_sample); /* Sample size */ avio_wb16(pb, par->bits_per_coded_sample); /* Sample size */