[FFmpeg-devel] [PATCH] iff: initial 16SV support
Paul B Mahol
onemda at gmail.com
Tue Nov 20 21:33:15 CET 2012
Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
libavformat/iff.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/libavformat/iff.c b/libavformat/iff.c
index b748f49..39ad232 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -37,6 +37,7 @@
#include "internal.h"
#define ID_8SVX MKTAG('8','S','V','X')
+#define ID_16SV MKTAG('1','6','S','V')
#define ID_VHDR MKTAG('V','H','D','R')
#define ID_ATAK MKTAG('A','T','A','K')
#define ID_RLSE MKTAG('R','L','S','E')
@@ -128,6 +129,7 @@ static int iff_probe(AVProbeData *p)
if ( AV_RL32(d) == ID_FORM &&
(AV_RL32(d+8) == ID_8SVX ||
+ AV_RL32(d+8) == ID_16SV ||
AV_RL32(d+8) == ID_PBM ||
AV_RL32(d+8) == ID_ACBM ||
AV_RL32(d+8) == ID_DEEP ||
@@ -311,6 +313,9 @@ static int iff_read_header(AVFormatContext *s)
case AVMEDIA_TYPE_AUDIO:
avpriv_set_pts_info(st, 32, 1, st->codec->sample_rate);
+ if (st->codec->codec_tag == ID_16SV)
+ st->codec->codec_id = AV_CODEC_ID_PCM_S16BE_PLANAR;
+ else {
switch (iff->svx8_compression) {
case COMP_NONE:
st->codec->codec_id = AV_CODEC_ID_PCM_S8_PLANAR;
@@ -326,6 +331,7 @@ static int iff_read_header(AVFormatContext *s)
"Unknown SVX8 compression method '%d'\n", iff->svx8_compression);
return -1;
}
+ }
st->codec->bits_per_coded_sample = iff->svx8_compression == COMP_NONE ? 8 : 4;
st->codec->bit_rate = st->codec->channels * st->codec->sample_rate * st->codec->bits_per_coded_sample;
--
1.7.11.4
More information about the ffmpeg-devel
mailing list