X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_codecs.h;h=29d131f6698fd3a50ceb164849f4714c9d428a45;hb=refs%2Fheads%2Fmaster;hp=988c5901eaf1dc188bbfba2192f02f91d623646c;hpb=c0f4bfc5d85c96cf29f4bd05fa5fa42eb344d1dc;p=vlc diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h index 988c5901ea..29d131f669 100644 --- a/include/vlc_codecs.h +++ b/include/vlc_codecs.h @@ -1,34 +1,34 @@ /***************************************************************************** - * codecs.h: codec related structures needed by the demuxers and decoders + * vlc_codecs.h: codec related structures needed by the demuxers and decoders ***************************************************************************** - * Copyright (C) 1999-2001 the VideoLAN team + * Copyright (C) 1999-2001 VLC authors and VideoLAN * $Id$ * * Author: Gildas Bazin * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ #ifndef VLC_CODECS_H #define VLC_CODECS_H 1 -#ifdef HAVE_ATTRIBUTE_PACKED -# define ATTR_PACKED __attribute__((__packed__)) -#else -# error FIXME -#endif +#include +/** + * \file + * This file defines codec related structures needed by the demuxers and decoders + */ /* Structures exported to the demuxers and decoders */ @@ -43,6 +43,20 @@ typedef struct _GUID } GUID, *REFGUID, *LPGUID; #endif /* GUID_DEFINED */ +typedef GUID guid_t; + +#ifdef HAVE_ATTRIBUTE_PACKED +# define ATTR_PACKED __attribute__((__packed__)) +#elif defined(__SUNPRO_C) || defined(_MSC_VER) +# pragma pack(1) +# define ATTR_PACKED +#elif defined(__APPLE__) +# pragma pack(push, 1) +# define ATTR_PACKED +#else +# error FIXME +#endif + #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ typedef struct @@ -65,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_ */ @@ -95,8 +111,9 @@ _WAVEHEADER { } WAVEHEADER; #endif /* _WAVEHEADER_ */ -#if !defined(_BITMAPINFOHEADER_) && !defined(WIN32) -#define _BITMAPINFOHEADER_ +#ifndef _VLC_BITMAPINFOHEADER_ +#define _VLC_BITMAPINFOHEADER_ + typedef struct ATTR_PACKED { @@ -111,14 +128,14 @@ ATTR_PACKED uint32_t biYPelsPerMeter; uint32_t biClrUsed; uint32_t biClrImportant; -} BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER; +} VLC_BITMAPINFOHEADER, *VLC_PBITMAPINFOHEADER, *VLC_LPBITMAPINFOHEADER; typedef struct ATTR_PACKED { - BITMAPINFOHEADER bmiHeader; - int bmiColors[1]; -} BITMAPINFO, *LPBITMAPINFO; + VLC_BITMAPINFOHEADER bmiHeader; + int bmiColors[1]; +} VLC_BITMAPINFO, *VLC_LPBITMAPINFO; #endif #ifndef _RECT32_ @@ -140,12 +157,12 @@ typedef int64_t REFERENCE_TIME; typedef struct ATTR_PACKED { - RECT32 rcSource; - RECT32 rcTarget; - uint32_t dwBitRate; - uint32_t dwBitErrorRate; - REFERENCE_TIME AvgTimePerFrame; - BITMAPINFOHEADER bmiHeader; + RECT32 rcSource; + RECT32 rcTarget; + uint32_t dwBitRate; + uint32_t dwBitErrorRate; + REFERENCE_TIME AvgTimePerFrame; + VLC_BITMAPINFOHEADER bmiHeader; } VIDEOINFOHEADER; #endif @@ -176,12 +193,12 @@ ATTR_PACKED typedef struct ATTR_PACKED { - RECT32 rcSource; - RECT32 rcTarget; - uint32_t dwBitRate; - uint32_t dwBitErrorRate; - REFERENCE_TIME AvgTimePerFrame; - BITMAPINFOHEADER bmiHeader; + RECT32 rcSource; + RECT32 rcTarget; + uint32_t dwBitRate; + uint32_t dwBitErrorRate; + REFERENCE_TIME AvgTimePerFrame; + VLC_BITMAPINFOHEADER bmiHeader; union { @@ -193,7 +210,14 @@ ATTR_PACKED } VIDEOINFO; #endif +#if defined(__SUNPRO_C) || defined(_MSC_VER) +# pragma pack() +#elif defined(__APPLE__) && !HAVE_ATTRIBUTE_PACKED +# pragma pack(pop) +#endif + /* WAVE format wFormatTag IDs */ +/* See http://msdn.microsoft.com/en-us/library/aa904731%28v=vs.80%29.aspx */ #define WAVE_FORMAT_UNKNOWN 0x0000 /* Microsoft Corporation */ #define WAVE_FORMAT_PCM 0x0001 /* Microsoft Corporation */ #define WAVE_FORMAT_ADPCM 0x0002 /* Microsoft Corporation */ @@ -203,28 +227,58 @@ ATTR_PACKED #define WAVE_FORMAT_DTS_MS 0x0008 /* Microsoft Corporation */ #define WAVE_FORMAT_WMAS 0x000a /* WMA 9 Speech */ #define WAVE_FORMAT_IMA_ADPCM 0x0011 /* Intel Corporation */ +#define WAVE_FORMAT_YAMAHA_ADPCM 0x0020 /* Yamaha */ +#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_A52 0x2000 -#define WAVE_FORMAT_DTS 0x2001 #define WAVE_FORMAT_WMA1 0x0160 /* WMA version 1 */ #define WAVE_FORMAT_WMA2 0x0161 /* WMA (v2) 7, 8, 9 Series */ #define WAVE_FORMAT_WMAP 0x0162 /* WMA 9 Professional */ #define WAVE_FORMAT_WMAL 0x0163 /* WMA 9 Lossless */ -#define WAVE_FORMAT_DIVIO_AAC 0x4143 -#define WAVE_FORMAT_AAC 0x00FF -#define WAVE_FORMAT_FFMPEG_AAC 0x706D -/* Need to check these */ -#define WAVE_FORMAT_DK3 0x0061 -#define WAVE_FORMAT_DK4 0x0062 +#define WAVE_FORMAT_ULEAD_DV_AUDIO_NTSC 0x0215 /* Ulead */ +#define WAVE_FORMAT_ULEAD_DV_AUDIO_PAL 0x0216 /* Ulead */ + +#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_ON2_AVC 0x0500 /* VP7 */ +#define WAVE_FORMAT_ON2_AVC_2 0x0501 /* VP6 */ + +#define WAVE_FORMAT_AAC_2 0x1601 /* Other AAC */ +#define WAVE_FORMAT_AAC_LATM 0x1602 /* AAC/LATM */ + +#define WAVE_FORMAT_A52 0x2000 /* a52 */ +#define WAVE_FORMAT_DTS 0x2001 /* DTS */ +#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 */ + +#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 @@ -242,11 +296,13 @@ ATTR_PACKED #define WAVE_FORMAT_VORB_2PLUS 0x6770 #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 */ #if !defined(WAVE_FORMAT_EXTENSIBLE) -#define WAVE_FORMAT_EXTENSIBLE 0xFFFE /* Microsoft */ + #define WAVE_FORMAT_EXTENSIBLE 0xFFFE /* Microsoft */ #endif /* GUID SubFormat IDs */ @@ -259,6 +315,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}}; @@ -294,38 +357,72 @@ static const struct } wave_format_tag_to_fourcc[] = { - { WAVE_FORMAT_PCM, VLC_FOURCC( 'a', 'r', 'a', 'w' ), "Raw audio" }, - { WAVE_FORMAT_ADPCM, VLC_FOURCC( 'm', 's', 0x00,0x02), "ADPCM" }, - { WAVE_FORMAT_IEEE_FLOAT, VLC_FOURCC( 'a', 'f', 'l', 't' ), "IEEE Float audio" }, - { WAVE_FORMAT_ALAW, VLC_FOURCC( 'a', 'l', 'a', 'w' ), "A-Law" }, - { WAVE_FORMAT_MULAW, VLC_FOURCC( 'm', 'l', 'a', 'w' ), "Mu-Law" }, - { WAVE_FORMAT_IMA_ADPCM, VLC_FOURCC( 'm', 's', 0x00,0x11), "Ima-ADPCM" }, - { WAVE_FORMAT_G726, VLC_FOURCC( 'g', '7', '2', '6' ), "G.726 ADPCM" }, - { WAVE_FORMAT_MPEGLAYER3, VLC_FOURCC( 'm', 'p', 'g', 'a' ), "Mpeg Audio" }, - { WAVE_FORMAT_MPEG, VLC_FOURCC( 'm', 'p', 'g', 'a' ), "Mpeg Audio" }, - { WAVE_FORMAT_A52, VLC_FOURCC( 'a', '5', '2', ' ' ), "A/52" }, - { WAVE_FORMAT_WMA1, VLC_FOURCC( 'w', 'm', 'a', '1' ), "Window Media Audio v1" }, - { WAVE_FORMAT_WMA2, VLC_FOURCC( 'w', 'm', 'a', '2' ), "Window Media Audio v2" }, - { WAVE_FORMAT_WMA2, VLC_FOURCC( 'w', 'm', 'a', ' ' ), "Window Media Audio v2" }, - { WAVE_FORMAT_WMAP, VLC_FOURCC( 'w', 'm', 'a', 'p' ), "Window Media Audio 9 Professional" }, - { WAVE_FORMAT_WMAL, VLC_FOURCC( 'w', 'm', 'a', 'l' ), "Window Media Audio 9 Lossless" }, - { WAVE_FORMAT_WMAS, VLC_FOURCC( 'w', 'm', 'a', 's' ), "Window Media Audio 9 Speech" }, - { WAVE_FORMAT_DK3, VLC_FOURCC( 'm', 's', 0x00,0x61), "Duck DK3" }, - { WAVE_FORMAT_DK4, VLC_FOURCC( 'm', 's', 0x00,0x62), "Duck DK4" }, - { WAVE_FORMAT_DTS, VLC_FOURCC( 'd', 't', 's', ' ' ), "DTS Coherent Acoustics" }, - { WAVE_FORMAT_DTS_MS, VLC_FOURCC( 'd', 't', 's', ' ' ), "DTS Coherent Acoustics" }, - { WAVE_FORMAT_DIVIO_AAC, VLC_FOURCC( 'm', 'p', '4', 'a' ), "MPEG-4 Audio (Divio)" }, - { WAVE_FORMAT_AAC, VLC_FOURCC( 'm', 'p', '4', 'a' ), "MPEG-4 Audio" }, - { WAVE_FORMAT_FFMPEG_AAC, VLC_FOURCC( 'm', 'p', '4', 'a' ), "MPEG-4 Audio" }, - { WAVE_FORMAT_VORBIS, VLC_FOURCC( 'v', 'o', 'r', 'b' ), "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" }, - { WAVE_FORMAT_VORB_2, VLC_FOURCC( 'v', 'o', 'r', '2' ), "Vorbis 2 Audio" }, - { WAVE_FORMAT_VORB_2PLUS, VLC_FOURCC( 'v', 'o', '2', '+' ), "Vorbis 2+ Audio" }, - { WAVE_FORMAT_VORB_3, VLC_FOURCC( 'v', 'o', 'r', '3' ), "Vorbis 3 Audio" }, - { WAVE_FORMAT_VORB_3PLUS, VLC_FOURCC( 'v', 'o', '3', '+' ), "Vorbis 3+ Audio" }, - { WAVE_FORMAT_SPEEX, VLC_FOURCC( 's', 'p', 'x', ' ' ), "Speex Audio" }, - { WAVE_FORMAT_UNKNOWN, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" } + { 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_CODEC_ADPCM_IMA_WAV, "Ima-ADPCM" }, + { 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_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" }, + { WAVE_FORMAT_WMA1, VLC_CODEC_WMA1, "Window Media Audio v1" }, + { WAVE_FORMAT_WMA2, VLC_CODEC_WMA2, "Window Media Audio v2" }, + { WAVE_FORMAT_WMAP, VLC_CODEC_WMAP, "Window Media Audio 9 Professional" }, + { WAVE_FORMAT_WMAL, VLC_CODEC_WMAL, "Window Media Audio 9 Lossless" }, + { 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_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_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" }, + { WAVE_FORMAT_VORB_2, VLC_FOURCC( 'v', 'o', 'r', '2' ), "Vorbis 2 Audio" }, + { WAVE_FORMAT_VORB_2PLUS, VLC_FOURCC( 'v', 'o', '2', '+' ), "Vorbis 2+ Audio" }, + { WAVE_FORMAT_VORB_3, VLC_FOURCC( 'v', 'o', 'r', '3' ), "Vorbis 3 Audio" }, + { WAVE_FORMAT_VORB_3PLUS, VLC_FOURCC( 'v', 'o', '3', '+' ), "Vorbis 3+ Audio" }, + { WAVE_FORMAT_SPEEX, VLC_CODEC_SPEEX, "Speex Audio" }, + { WAVE_FORMAT_FLAC, VLC_CODEC_FLAC, "FLAC Audio" }, + { WAVE_FORMAT_GSM_AMR_FIXED, VLC_CODEC_AMR_NB, "GSM-AMR Audio CBR, no SID" }, + { 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_ON2_AVC, VLC_CODEC_ON2AVC, "On2 Audio for Video Codec (VP7)" }, + { WAVE_FORMAT_ON2_AVC_2, VLC_CODEC_ON2AVC, "On2 Audio for Video Codec (VP6)" }, + + { WAVE_FORMAT_UNKNOWN, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" } }; static inline void wf_tag_to_fourcc( uint16_t i_tag, vlc_fourcc_t *fcc, @@ -362,7 +459,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" } }; @@ -387,31 +485,4 @@ static inline void sf_tag_to_fourcc( GUID *guid_tag, if( ppsz_name ) *ppsz_name = sub_format_tag_to_fourcc[i].psz_name; } -/** - * Structure to hold information concerning subtitles. - * Used between demuxers and decoders of subtitles. - */ -typedef struct es_sys_t -{ - char *psz_header; /* for 'ssa ' and 'subt' */ - - /* for spudec */ - unsigned int i_orig_height; - unsigned int i_orig_width; - unsigned int i_origin_x; - unsigned int i_origin_y; - unsigned int i_scale_h; - unsigned int i_scale_v; - unsigned int i_alpha; - bool b_smooth; - mtime_t i_fade_in; - mtime_t i_fade_out; - unsigned int i_align; - mtime_t i_time_offset; - bool b_forced_subs; - unsigned int palette[16]; - unsigned int colors[4]; - -} subtitle_data_t; - #endif /* "codecs.h" */