Commit 847e6393 authored by Vittorio Giovara's avatar Vittorio Giovara Committed by James Almer

mmf: convert to new channel layout API

Signed-off-by: 's avatarVittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: 's avatarAnton Khirnov <anton@khirnov.net>
Signed-off-by: 's avatarJames Almer <jamrial@gmail.com>
parent 7baa1807
......@@ -80,7 +80,7 @@ static int mmf_write_header(AVFormatContext *s)
return AVERROR(EINVAL);
}
mmf->stereo = s->streams[0]->codecpar->channels > 1;
mmf->stereo = s->streams[0]->codecpar->ch_layout.nb_channels > 1;
if (mmf->stereo &&
s->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) {
av_log(s, AV_LOG_ERROR, "Yamaha SMAF stereo is experimental, "
......@@ -261,8 +261,7 @@ static int mmf_read_header(AVFormatContext *s)
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
st->codecpar->codec_id = AV_CODEC_ID_ADPCM_YAMAHA;
st->codecpar->sample_rate = rate;
st->codecpar->channels = (params >> 7) + 1;
st->codecpar->channel_layout = params >> 7 ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO;
av_channel_layout_default(&st->codecpar->ch_layout, (params >> 7) + 1);
st->codecpar->bits_per_coded_sample = 4;
st->codecpar->bit_rate = st->codecpar->sample_rate *
st->codecpar->bits_per_coded_sample;
......
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