Browse Source

lavf/riff: Support decoding Ambisonic wav files.

Reported and tested by Andy Furniss, adf d lists at gmail
tags/n3.0
Carl Eugen Hoyos 10 years ago
parent
commit
f17ca46009
2 changed files with 4 additions and 0 deletions
  1. +2
    -0
      libavformat/riff.h
  2. +2
    -0
      libavformat/riffdec.c

+ 2
- 0
libavformat/riff.h View File

@@ -107,6 +107,8 @@ extern const AVCodecGuid ff_codec_wav_guids[];


#define FF_MEDIASUBTYPE_BASE_GUID \ #define FF_MEDIASUBTYPE_BASE_GUID \
0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71 0x00, 0x00, 0x10, 0x00, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71
#define FF_AMBISONIC_BASE_GUID \
0x21, 0x07, 0xD3, 0x11, 0x86, 0x44, 0xC8, 0xC1, 0xCA, 0x00, 0x00, 0x00


static av_always_inline int ff_guidcmp(const void *g1, const void *g2) static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
{ {


+ 2
- 0
libavformat/riffdec.c View File

@@ -69,6 +69,8 @@ static void parse_waveformatex(AVIOContext *pb, AVCodecContext *c)


ff_get_guid(pb, &subformat); ff_get_guid(pb, &subformat);
if (!memcmp(subformat + 4, if (!memcmp(subformat + 4,
(const uint8_t[]){ FF_AMBISONIC_BASE_GUID }, 12) ||
!memcmp(subformat + 4,
(const uint8_t[]){ FF_MEDIASUBTYPE_BASE_GUID }, 12)) { (const uint8_t[]){ FF_MEDIASUBTYPE_BASE_GUID }, 12)) {
c->codec_tag = AV_RL32(subformat); c->codec_tag = AV_RL32(subformat);
c->codec_id = ff_wav_codec_get_id(c->codec_tag, c->codec_id = ff_wav_codec_get_id(c->codec_tag,


Loading…
Cancel
Save