aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVittorio Giovara <vittorio.giovara@gmail.com>2017-03-31 18:54:29 +0200
committerJames Almer <jamrial@gmail.com>2022-03-15 09:42:38 -0300
commit0116c9162ef64d89b36fa9efa84335ca35aa7c50 (patch)
tree6628c26340533b75aed1aa8546bec9fd9ecba604
parent36fc3e9b05e20d81fa251f10b2f4f9cdadfb04c8 (diff)
downloadffmpeg-0116c9162ef64d89b36fa9efa84335ca35aa7c50.tar.gz
westwood: convert to new channel layout API
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com> Signed-off-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavformat/westwood_aud.c10
-rw-r--r--libavformat/westwood_audenc.c2
-rw-r--r--libavformat/westwood_vqa.c2
3 files changed, 6 insertions, 8 deletions
diff --git a/libavformat/westwood_aud.c b/libavformat/westwood_aud.c
index ff51e8bd36..9896bd46df 100644
--- a/libavformat/westwood_aud.c
+++ b/libavformat/westwood_aud.c
@@ -118,9 +118,7 @@ static int wsaud_read_header(AVFormatContext *s)
}
avpriv_set_pts_info(st, 64, 1, sample_rate);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
- st->codecpar->channels = channels;
- st->codecpar->channel_layout = channels == 1 ? AV_CH_LAYOUT_MONO :
- AV_CH_LAYOUT_STEREO;
+ av_channel_layout_default(&st->codecpar->ch_layout, channels);
st->codecpar->sample_rate = sample_rate;
return 0;
@@ -164,14 +162,14 @@ static int wsaud_read_packet(AVFormatContext *s,
if (ret != chunk_size)
return AVERROR(EIO);
- if (st->codecpar->channels <= 0) {
+ if (st->codecpar->ch_layout.nb_channels <= 0) {
av_log(s, AV_LOG_ERROR, "invalid number of channels %d\n",
- st->codecpar->channels);
+ st->codecpar->ch_layout.nb_channels);
return AVERROR_INVALIDDATA;
}
/* 2 samples/byte, 1 or 2 samples per frame depending on stereo */
- pkt->duration = (chunk_size * 2) / st->codecpar->channels;
+ pkt->duration = (chunk_size * 2) / st->codecpar->ch_layout.nb_channels;
}
pkt->stream_index = st->index;
diff --git a/libavformat/westwood_audenc.c b/libavformat/westwood_audenc.c
index 597d68350f..a2401eff5a 100644
--- a/libavformat/westwood_audenc.c
+++ b/libavformat/westwood_audenc.c
@@ -77,7 +77,7 @@ static int wsaud_write_header(AVFormatContext *ctx)
a->size = 0;
/* Flag if we have stereo data. */
- if (st->codecpar->channels == 2)
+ if (st->codecpar->ch_layout.nb_channels == 2)
flags |= 1;
/* This flags that the file contains 16 bit samples rather than 8 bit
diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c
index 9d116060a3..ed5c1a3416 100644
--- a/libavformat/westwood_vqa.c
+++ b/libavformat/westwood_vqa.c
@@ -226,7 +226,7 @@ static int wsvqa_read_packet(AVFormatContext *s,
wsvqa->bps = 8;
st->codecpar->sample_rate = wsvqa->sample_rate;
st->codecpar->bits_per_coded_sample = wsvqa->bps;
- st->codecpar->channels = wsvqa->channels;
+ av_channel_layout_default(&st->codecpar->ch_layout, wsvqa->channels);
st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO;
avpriv_set_pts_info(st, 64, 1, st->codecpar->sample_rate);