diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2009-01-23 11:33:29 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2009-01-23 11:33:29 +0100 |
| commit | a7f2540f779c71f95a49002309f68befd01091bf (patch) | |
| tree | 16b78f0cef142c968caf237bda9c6aaaba8659f7 | |
| parent | 64b20fd7b57c0a2afe2c2a2702a48aadece340f8 (diff) | |
Add more codec ids for RIFF formats
Handle codec ID for various other AAC formats.
Sync the list of possible codec ids with that of ffmpeg.
Fixes #567255
| -rw-r--r-- | gst-libs/gst/riff/riff-ids.h | 6 | ||||
| -rw-r--r-- | gst-libs/gst/riff/riff-media.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h index e043c565..33ffb9c5 100644 --- a/gst-libs/gst/riff/riff-ids.h +++ b/gst-libs/gst/riff/riff-ids.h @@ -403,6 +403,7 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */ #define GST_RIFF_WAVE_FORMAT_SONY_ATRAC3 (0x0270) #define GST_RIFF_WAVE_FORMAT_FM_TOWNS_SND (0x0300) #define GST_RIFF_WAVE_FORMAT_BTV_DIGITAL (0x0400) +#define GST_RIFF_WAVE_FORMAT_IMC (0x0401) #define GST_RIFF_WAVE_FORMAT_QDESIGN_MUSIC (0x0450) #define GST_RIFF_WAVE_FORMAT_VME_VMPCM (0x0680) #define GST_RIFF_WAVE_FORMAT_TPC (0x0681) @@ -416,14 +417,19 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */ #define GST_RIFF_WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS (0x1500) #define GST_RIFF_WAVE_FORMAT_A52 (0x2000) #define GST_RIFF_WAVE_FORMAT_DTS (0x2001) +#define GST_RIFF_WAVE_FORMAT_SONIC (0x2048) +#define GST_RIFF_WAVE_FORMAT_SONIC_LS (0x2048) +#define GST_RIFF_WAVE_FORMAT_AAC_AC (0x4143) #define GST_RIFF_WAVE_FORMAT_VORBIS1 (0x674f) #define GST_RIFF_WAVE_FORMAT_VORBIS2 (0x6750) #define GST_RIFF_WAVE_FORMAT_VORBIS3 (0x6751) #define GST_RIFF_WAVE_FORMAT_VORBIS1PLUS (0x676f) #define GST_RIFF_WAVE_FORMAT_VORBIS2PLUS (0x6770) #define GST_RIFF_WAVE_FORMAT_VORBIS3PLUS (0x6771) +#define GST_RIFF_WAVE_FORMAT_AAC_pm (0x706d) #define GST_RIFF_WAVE_FORMAT_GSM_AMR_CBR (0x7A21) #define GST_RIFF_WAVE_FORMAT_GSM_AMR_VBR (0x7A22) +#define GST_RIFF_WAVE_FORMAT_FLAC (0xF1AC) #define GST_RIFF_WAVE_FORMAT_EXTENSIBLE (0xFFFE) guint16 channels; guint32 rate; diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index d65550d9..c0e76601 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -1135,6 +1135,8 @@ gst_riff_create_audio_caps (guint16 codec_id, rate_chan = FALSE; break; case GST_RIFF_WAVE_FORMAT_AAC: + case GST_RIFF_WAVE_FORMAT_AAC_AC: + case GST_RIFF_WAVE_FORMAT_AAC_pm: { channels_max = 8; caps = gst_caps_new_simple ("audio/mpeg", |