* This file defines codec related structures needed by the demuxers and decoders
*/
-#ifdef HAVE_ATTRIBUTE_PACKED
-# define ATTR_PACKED __attribute__((__packed__))
-#else
-# error FIXME
-#endif
-
/* Structures exported to the demuxers and decoders */
#if !(defined _GUID_DEFINED || defined GUID_DEFINED)
} GUID, *REFGUID, *LPGUID;
#endif /* GUID_DEFINED */
+#ifdef HAVE_ATTRIBUTE_PACKED
+# define ATTR_PACKED __attribute__((__packed__))
+#elif defined(__SUNPRO_C)
+# pragma pack(1)
+# define ATTR_PACKED
+#else
+# error FIXME
+#endif
+
#ifndef _WAVEFORMATEX_
#define _WAVEFORMATEX_
typedef struct
} VIDEOINFO;
#endif
+#if defined(__SUNPRO_C)
+# pragma pack()
+#endif
+
/* WAVE format wFormatTag IDs */
#define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */
#define WAVE_FORMAT_PCM 0x0001 /* Microsoft Corporation */
wave_format_tag_to_fourcc[] =
{
{ WAVE_FORMAT_PCM, VLC_FOURCC( 'a', 'r', 'a', 'w' ), "Raw audio" },
+ { WAVE_FORMAT_PCM, VLC_CODEC_S8, "PCM S8 audio" },
+ { WAVE_FORMAT_PCM, VLC_CODEC_S16L, "PCM S16L audio" },
+ { WAVE_FORMAT_PCM, VLC_CODEC_S24L, "PCM S24L audio" },
+ { WAVE_FORMAT_PCM, VLC_CODEC_S32L, "PCM S32L audio" },
{ WAVE_FORMAT_ADPCM, VLC_CODEC_ADPCM_MS, "ADPCM" },
{ WAVE_FORMAT_IEEE_FLOAT, VLC_FOURCC( 'a', 'f', 'l', 't' ), "IEEE Float audio" },
+ { WAVE_FORMAT_IEEE_FLOAT, VLC_CODEC_F32L, "PCM 32 (Float) audio" },
+ { WAVE_FORMAT_IEEE_FLOAT, VLC_CODEC_F64L, "PCM 64 (Float) audio" },
{ WAVE_FORMAT_ALAW, VLC_CODEC_ALAW, "A-Law" },
{ WAVE_FORMAT_MULAW, VLC_CODEC_MULAW, "Mu-Law" },
- { WAVE_FORMAT_IMA_ADPCM, VLC_FOURCC( 'm', 's', 0x00,0x11), "Ima-ADPCM" },
+ { WAVE_FORMAT_IMA_ADPCM, VLC_CODEC_ADPCM_IMA_WAV, "Ima-ADPCM" },
{ WAVE_FORMAT_TRUESPEECH, VLC_FOURCC(0x22, 0x0, 0x0, 0x0 ), "Truespeech" },
{ WAVE_FORMAT_GSM610, VLC_CODEC_GSM_MS, "Microsoft WAV GSM" },
{ WAVE_FORMAT_G726, VLC_CODEC_ADPCM_G726, "G.726 ADPCM" },