Skip to content

F
ffmpeg
Commit f17ca460 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

lavf/riff: Support decoding Ambisonic wav files. 

Reported and tested by Andy Furniss, adf d lists at gmail
parent 2fc552b6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
libavformat/riff.h
View file @ f17ca460
...@@ -107,6 +107,8 @@ extern const AVCodecGuid ff_codec_wav_guids[]; ...@@ -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)
{ {
......
libavformat/riffdec.c
View file @ f17ca460
...@@ -69,6 +69,8 @@ static void parse_waveformatex(AVIOContext *pb, AVCodecContext *c) ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment