diff --git a/ChangeLog b/ChangeLog index 49d579a2aa..da91b32485 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-08-22 Tim-Philipp Müller + + * gst-libs/gst/riff/riff-ids.h: + * gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps): + Add voxware audio IDs (even if we can't play it) (#351795). + 2006-08-22 Tim-Philipp Müller * gst-libs/gst/riff/riff-media.c: diff --git a/gst-libs/gst/riff/riff-ids.h b/gst-libs/gst/riff/riff-ids.h index d078804cde..24b49a70bf 100644 --- a/gst-libs/gst/riff/riff-ids.h +++ b/gst-libs/gst/riff/riff-ids.h @@ -291,6 +291,19 @@ typedef struct _gst_riff_strf_auds { /* == WaveHeader (?) */ #define GST_RIFF_WAVE_FORMAT_ITU_G721_ADPCM (0x0040) #define GST_RIFF_WAVE_FORMAT_MPEGL12 (0x0050) #define GST_RIFF_WAVE_FORMAT_MPEGL3 (0x0055) +#define GST_RIFF_WAVE_FORMAT_VOXWARE (0x0062) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_BYTE_ALIGNED (0x0069) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC8 (0x0070) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC10 (0x0071) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC16 (0x0072) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_AC20 (0x0073) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_METAVOICE (0x0074) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_METASOUND (0x0075) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_RT29HW (0x0076) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_VR12 (0x0077) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_VR18 (0x0078) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_TQ40 (0x0079) +#define GST_RIFF_WAVE_FORMAT_VOXWARE_TQ60 (0x0081) #define GST_RIFF_IBM_FORMAT_MULAW (0x0101) #define GST_RIFF_IBM_FORMAT_ALAW (0x0102) #define GST_RIFF_IBM_FORMAT_ADPCM (0x0103) diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c index ef31f8de42..4a8498ac7d 100644 --- a/gst-libs/gst/riff/riff-media.c +++ b/gst-libs/gst/riff/riff-media.c @@ -970,6 +970,27 @@ gst_riff_create_audio_caps (guint16 codec_id, } break; } + + /* can anything decode these? pitfdll? */ + case GST_RIFF_WAVE_FORMAT_VOXWARE: + case GST_RIFF_WAVE_FORMAT_VOXWARE_BYTE_ALIGNED: + case GST_RIFF_WAVE_FORMAT_VOXWARE_AC8: + case GST_RIFF_WAVE_FORMAT_VOXWARE_AC10: + case GST_RIFF_WAVE_FORMAT_VOXWARE_AC16: + case GST_RIFF_WAVE_FORMAT_VOXWARE_AC20: + case GST_RIFF_WAVE_FORMAT_VOXWARE_METAVOICE: + case GST_RIFF_WAVE_FORMAT_VOXWARE_METASOUND: + case GST_RIFF_WAVE_FORMAT_VOXWARE_RT29HW: + case GST_RIFF_WAVE_FORMAT_VOXWARE_VR12: + case GST_RIFF_WAVE_FORMAT_VOXWARE_VR18: + case GST_RIFF_WAVE_FORMAT_VOXWARE_TQ40: + case GST_RIFF_WAVE_FORMAT_VOXWARE_TQ60:{ + caps = gst_caps_new_simple ("audio/x-voxware", + "voxwaretype", G_TYPE_INT, (gint) codec_id, NULL); + if (codec_name) + *codec_name = g_strdup ("Voxware"); + break; + } default: GST_WARNING ("Unknown audio tag 0x%04x", codec_id); return NULL;