From: Vittorio Giovara <vittorio.giov...@gmail.com>
Signed-off-by: Vittorio Giovara <vittorio.giov...@gmail.com>
Signed-off-by: Anton Khirnov <an...@khirnov.net>
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavformat/wsddec.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/libavformat/wsddec.c b/libavformat/wsddec.c
index 1f90f5b467..a8754f84e4 100644
--- a/libavformat/wsddec.c
+++ b/libavformat/wsddec.c
@@ -128,18 +128,22 @@ static int wsd_read_header(AVFormatContext *s)
st->codecpar->codec_id = s->iformat->raw_codec_id;
st->codecpar->sample_rate = avio_rb32(pb) / 8;
avio_skip(pb, 4);
- st->codecpar->channels = avio_r8(pb) & 0xF;
- st->codecpar->bit_rate = (int64_t)st->codecpar->channels *
st->codecpar->sample_rate * 8LL;
- if (!st->codecpar->channels)
+ st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC;
+ st->codecpar->ch_layout.nb_channels = avio_r8(pb) & 0xF;
+ st->codecpar->bit_rate = (int64_t)st->codecpar->ch_layout.nb_channels *
+ st->codecpar->sample_rate * 8LL;
+ if (!st->codecpar->ch_layout.nb_channels)
return AVERROR_INVALIDDATA;
avio_skip(pb, 3);
channel_assign = avio_rb32(pb);
if (!(channel_assign & 1)) {
+ uint64_t ch_mask = 0;
int i;
for (i = 1; i < 32; i++)
if ((channel_assign >> i) & 1)
- st->codecpar->channel_layout |= wsd_to_av_channel_layoyt(s, i);
+ ch_mask |= wsd_to_av_channel_layoyt(s, i);
+ av_channel_layout_from_mask(&st->codecpar->ch_layout, ch_mask);
}
avio_skip(pb, 16);
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
