X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_codecs.h;h=7fa4492b167ad6830e4ad9bcab1c765ee8c710fd;hb=37e886d113b8b567c15208579fb2f5cdd88f367f;hp=668a3488775088ea8dfc7f88dcdc9b050a9a4d02;hpb=22fecf0b8456e3257201cacededfd8f5dab16f21;p=vlc diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h index 668a348877..7fa4492b16 100644 --- a/include/vlc_codecs.h +++ b/include/vlc_codecs.h @@ -47,7 +47,7 @@ typedef GUID guid_t; #ifdef HAVE_ATTRIBUTE_PACKED # define ATTR_PACKED __attribute__((__packed__)) -#elif defined(__SUNPRO_C) +#elif defined(__SUNPRO_C) || defined(_MSC_VER) # pragma pack(1) # define ATTR_PACKED #elif defined(__APPLE__) @@ -79,11 +79,13 @@ ATTR_PACKED _WAVEFORMATEXTENSIBLE { WAVEFORMATEX Format; union { - uint16_t wValidBitsPerSample; - uint16_t wSamplesPerBlock; - uint16_t wReserved; + uint16_t wValidBitsPerSample; /* bits of precision */ + uint16_t wSamplesPerBlock; /* valid if wBitsPerSample==0 */ + uint16_t wReserved; /* If neither applies, set to zero. */ } Samples; - uint32_t dwChannelMask; + + uint32_t dwChannelMask; /* Channels present */ + GUID SubFormat; } WAVEFORMATEXTENSIBLE, *PWAVEFORMATEXTENSIBLE; #endif /* _WAVEFORMATEXTENSIBLE_ */ @@ -208,7 +210,7 @@ ATTR_PACKED } VIDEOINFO; #endif -#if defined(__SUNPRO_C) +#if defined(__SUNPRO_C) || defined(_MSC_VER) # pragma pack() #elif defined(__APPLE__) && !HAVE_ATTRIBUTE_PACKED # pragma pack(pop) @@ -229,15 +231,20 @@ ATTR_PACKED #define WAVE_FORMAT_TRUESPEECH 0x0022 /* TrueSpeech */ #define WAVE_FORMAT_GSM610 0x0031 /* Microsoft Corporation */ #define WAVE_FORMAT_MSNAUDIO 0x0032 /* Microsoft Corporation */ +#define WAVE_FORMAT_AMR_NB_2 0x0038 /* AMR NB rogue */ #define WAVE_FORMAT_MSG723 0x0042 /* Microsoft G.723 [G723.1] */ #define WAVE_FORMAT_G726 0x0045 /* ITU-T standard */ #define WAVE_FORMAT_MPEG 0x0050 /* Microsoft Corporation */ #define WAVE_FORMAT_MPEGLAYER3 0x0055 /* ISO/MPEG Layer3 Format Tag */ #define WAVE_FORMAT_AMR_NB 0x0057 /* AMR NB */ #define WAVE_FORMAT_AMR_WB 0x0058 /* AMR Wideband */ +#define WAVE_FORMAT_G726_ADPCM 0x0064 /* G.726 ADPCM */ +#define WAVE_FORMAT_VOXWARE_RT29 0x0075 /* VoxWare MetaSound */ #define WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 /* Sonic Foundry */ +#define WAVE_FORMAT_VIVOG723 0x0111 /* Vivo G.723.1 */ #define WAVE_FORMAT_AAC 0x00FF /* */ +#define WAVE_FORMAT_AAC_MS 0xa106 /* Microsoft AAC */ #define WAVE_FORMAT_SIPRO 0x0130 /* Sipro Lab Telecom Inc. */ #define WAVE_FORMAT_WMA1 0x0160 /* WMA version 1 */ @@ -251,6 +258,7 @@ ATTR_PACKED #define WAVE_FORMAT_ATRAC3 0x0270 /* Atrac3, != from MSDN doc */ #define WAVE_FORMAT_SONY_ATRAC3 0x0272 /* Atrac3, != from MSDN doc */ +#define WAVE_FORMAT_IMC 0x0401 #define WAVE_FORMAT_INDEO_AUDIO 0x0402 /* Indeo Audio Coder */ #define WAVE_FORMAT_AAC_2 0x1601 /* Other AAC */ @@ -258,17 +266,16 @@ ATTR_PACKED #define WAVE_FORMAT_A52 0x2000 /* a52 */ #define WAVE_FORMAT_DTS 0x2001 /* DTS */ -#define WAVE_FORMAT_FFMPEG_AAC 0x706D +#define WAVE_FORMAT_AVCODEC_AAC 0x706D #define WAVE_FORMAT_DIVIO_AAC 0x4143 /* Divio's AAC */ #define WAVE_FORMAT_GSM_AMR_FIXED 0x7A21 /* Fixed bitrate, no SID */ #define WAVE_FORMAT_GSM_AMR 0x7A22 /* Variable bitrate, including SID */ -/* Need to check these */ -#define WAVE_FORMAT_DK3 0x0061 -#define WAVE_FORMAT_DK4 0x0062 +#define WAVE_FORMAT_DK3 0x0062 +#define WAVE_FORMAT_DK4 0x0061 -/* At least FFmpeg use that ID: from libavformat/riff.c ('Vo' == 0x566f) +/* At least libavformat use that ID: from libavformat/riff.c ('Vo' == 0x566f) * { CODEC_ID_VORBIS, ('V'<<8)+'o' }, //HACK/FIXME, does vorbis in WAV/AVI have an (in)official id? */ #define WAVE_FORMAT_VORBIS 0x566f @@ -287,7 +294,7 @@ ATTR_PACKED #define WAVE_FORMAT_VORB_3PLUS 0x6771 #define WAVE_FORMAT_G723_1 0xa100 - +#define WAVE_FORMAT_AAC_3 0xa106 #define WAVE_FORMAT_SPEEX 0xa109 /* Speex audio */ #define WAVE_FORMAT_FLAC 0xf1ac /* Xiph Flac */ @@ -305,6 +312,13 @@ static const GUID VLC_KSDATAFORMAT_SUBTYPE_PCM = {0xE923AABF, 0xCB58, 0x4471, {0 #define KSDATAFORMAT_SUBTYPE_PCM VLC_KSDATAFORMAT_SUBTYPE_PCM #endif +#ifndef _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT_ +#define _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT_ {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}} +static const GUID VLC_KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; +#define KSDATAFORMAT_SUBTYPE_IEEE_FLOAT VLC_KSDATAFORMAT_SUBTYPE_PCM +#endif + + #ifndef _KSDATAFORMAT_SUBTYPE_UNKNOWN_ #define _KSDATAFORMAT_SUBTYPE_UNKNOWN_ {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}} static const GUID VLC_KSDATAFORMAT_SUBTYPE_UNKNOWN = {0x00000000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; @@ -355,12 +369,16 @@ wave_format_tag_to_fourcc[] = { WAVE_FORMAT_YAMAHA_ADPCM, VLC_CODEC_ADPCM_YAMAHA, "Yamaha ADPCM" }, { WAVE_FORMAT_TRUESPEECH, VLC_CODEC_TRUESPEECH, "Truespeech" }, { WAVE_FORMAT_GSM610, VLC_CODEC_GSM_MS, "Microsoft WAV GSM" }, + { WAVE_FORMAT_MSNAUDIO, VLC_CODEC_GSM_MS, "Microsoft MSN Audio" }, { WAVE_FORMAT_G726, VLC_CODEC_ADPCM_G726, "G.726 ADPCM" }, + { WAVE_FORMAT_G726_ADPCM, VLC_CODEC_ADPCM_G726, "G.726 ADPCM" }, { WAVE_FORMAT_G723_1, VLC_CODEC_G723_1, "G.723.1" }, { WAVE_FORMAT_MSG723, VLC_CODEC_G723_1, "Microsoft G.723 [G723.1]" }, - { WAVE_FORMAT_MPEGLAYER3, VLC_CODEC_MPGA, "Mpeg Audio" }, + { WAVE_FORMAT_VIVOG723, VLC_CODEC_G723_1, "Vivo G.723.1" }, + { WAVE_FORMAT_MPEGLAYER3, VLC_CODEC_MP3, "Mpeg Audio Layer 3" }, { WAVE_FORMAT_MPEG, VLC_CODEC_MPGA, "Mpeg Audio" }, { WAVE_FORMAT_AMR_NB, VLC_CODEC_AMR_NB, "AMR NB" }, + { WAVE_FORMAT_AMR_NB_2, VLC_CODEC_AMR_NB, "AMR NB" }, { WAVE_FORMAT_AMR_WB, VLC_CODEC_AMR_WB, "AMR Wideband" }, { WAVE_FORMAT_SIPRO, VLC_CODEC_SIPR, "Sipr Audio" }, { WAVE_FORMAT_A52, VLC_CODEC_A52, "A/52" }, @@ -371,15 +389,17 @@ wave_format_tag_to_fourcc[] = { WAVE_FORMAT_WMAS, VLC_CODEC_WMAS, "Window Media Audio 9 Speech" }, { WAVE_FORMAT_ATRAC3, VLC_CODEC_ATRAC3, "Sony Atrac3" }, { WAVE_FORMAT_SONY_ATRAC3,VLC_CODEC_ATRAC3, "Sony Atrac3" }, - { WAVE_FORMAT_DK3, VLC_FOURCC( 'm', 's', 0x00,0x61), "Duck DK3" }, - { WAVE_FORMAT_DK4, VLC_FOURCC( 'm', 's', 0x00,0x62), "Duck DK4" }, + { WAVE_FORMAT_DK3, VLC_CODEC_ADPCM_DK3, "Duck DK3" }, + { WAVE_FORMAT_DK4, VLC_CODEC_ADPCM_DK4, "Duck DK4" }, { WAVE_FORMAT_DTS, VLC_CODEC_DTS, "DTS Coherent Acoustics" }, { WAVE_FORMAT_DTS_MS, VLC_CODEC_DTS, "DTS Coherent Acoustics" }, { WAVE_FORMAT_DIVIO_AAC, VLC_CODEC_MP4A, "MPEG-4 Audio (Divio)" }, { WAVE_FORMAT_AAC, VLC_CODEC_MP4A, "MPEG-4 Audio" }, { WAVE_FORMAT_AAC_2, VLC_CODEC_MP4A, "MPEG-4 Audio" }, + { WAVE_FORMAT_AAC_3, VLC_CODEC_MP4A, "MPEG-4 Audio" }, { WAVE_FORMAT_AAC_LATM, VLC_CODEC_MP4A, "MPEG-4 Audio" }, - { WAVE_FORMAT_FFMPEG_AAC, VLC_CODEC_MP4A, "MPEG-4 Audio" }, + { WAVE_FORMAT_AVCODEC_AAC, VLC_CODEC_MP4A, "MPEG-4 Audio" }, + { WAVE_FORMAT_AAC_MS, VLC_CODEC_MP4A, "MPEG-4 Audio" }, { WAVE_FORMAT_VORBIS, VLC_CODEC_VORBIS, "Vorbis Audio" }, { WAVE_FORMAT_VORB_1, VLC_FOURCC( 'v', 'o', 'r', '1' ), "Vorbis 1 Audio" }, { WAVE_FORMAT_VORB_1PLUS, VLC_FOURCC( 'v', 'o', '1', '+' ), "Vorbis 1+ Audio" }, @@ -393,7 +413,10 @@ wave_format_tag_to_fourcc[] = { WAVE_FORMAT_GSM_AMR, VLC_CODEC_AMR_NB, "GSM-AMR Audio VBR, SID" }, { WAVE_FORMAT_ULEAD_DV_AUDIO_NTSC, VLC_CODEC_ULEAD_DV_AUDIO_NTSC, "Ulead DV audio NTSC" }, { WAVE_FORMAT_ULEAD_DV_AUDIO_PAL, VLC_CODEC_ULEAD_DV_AUDIO_PAL, "Ulead DV audio PAL" }, + { WAVE_FORMAT_IMC, VLC_CODEC_IMC, "IMC" }, { WAVE_FORMAT_INDEO_AUDIO, VLC_CODEC_INDEO_AUDIO, "Indeo Audio Coder" }, + { WAVE_FORMAT_VOXWARE_RT29,VLC_CODEC_METASOUND, "VoxWare MetaSound" }, + { WAVE_FORMAT_UNKNOWN, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" } }; @@ -431,7 +454,8 @@ static const struct } sub_format_tag_to_fourcc[] = { - { _KSDATAFORMAT_SUBTYPE_PCM_, VLC_FOURCC( 'p', 'c', 'm', ' ' ), "PCM" }, + { _KSDATAFORMAT_SUBTYPE_PCM_, VLC_FOURCC( 'a', 'r', 'a', 'w' ), "PCM" }, + { _KSDATAFORMAT_SUBTYPE_IEEE_FLOAT_, VLC_FOURCC( 'a', 'f', 'l', 't' ), "Float PCM" }, { _KSDATAFORMAT_SUBTYPE_UNKNOWN_, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" } };