From 314269118161ed7735a905332ccf847d1ec696a2 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 19 Sep 2016 23:08:32 +0200 Subject: [PATCH] avformat/wavdec: add support for decoding 24.0 and 16.8 floating point pcm formats Fixes #5602 and #5603. Signed-off-by: Paul B Mahol --- libavformat/wavdec.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c index ae42a6167f..987155e39e 100644 --- a/libavformat/wavdec.c +++ b/libavformat/wavdec.c @@ -556,6 +556,19 @@ break_loop: if (sample_count) st->duration = sample_count; + if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S32LE && + st->codecpar->block_align == st->codecpar->channels * 4 && + st->codecpar->bits_per_coded_sample == 32 && + st->codecpar->extradata_size == 2 && + AV_RL16(st->codecpar->extradata) == 1) { + st->codecpar->codec_id = AV_CODEC_ID_PCM_F16LE; + st->codecpar->bits_per_coded_sample = 16; + } else if (st->codecpar->codec_id == AV_CODEC_ID_PCM_S24LE && + st->codecpar->block_align == st->codecpar->channels * 4 && + st->codecpar->bits_per_coded_sample == 24) { + st->codecpar->codec_id = AV_CODEC_ID_PCM_F24LE; + } + ff_metadata_conv_ctx(s, NULL, wav_metadata_conv); ff_metadata_conv_ctx(s, NULL, ff_riff_info_conv);