avformat/wavdec: add support for decoding 24.0 and 16.8 floating point pcm formats
authorPaul B Mahol <onemda@gmail.com>
Mon, 19 Sep 2016 21:08:32 +0000 (23:08 +0200)
committerPaul B Mahol <onemda@gmail.com>
Thu, 22 Dec 2016 09:30:21 +0000 (10:30 +0100)
Fixes #5602 and #5603.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
libavformat/wavdec.c

index ae42a61..987155e 100644 (file)
@@ -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);