X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_codecs.h;h=6c087da247c783853216142549def12140d09c09;hb=da9934d964539b0dcbd45455b35d757e2ce4aead;hp=1e4117ce738cc65abad908db2062cc48db920654;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h index 1e4117ce73..6c087da247 100644 --- a/include/vlc_codecs.h +++ b/include/vlc_codecs.h @@ -21,8 +21,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ -#ifndef _VLC_CODECS_H -#define _VLC_CODECS_H 1 +#ifndef VLC_CODECS_H +#define VLC_CODECS_H 1 + +#include +/** + * \file + * This file defines codec related structures needed by the demuxers and decoders + */ /* Structures exported to the demuxers and decoders */ @@ -37,12 +43,19 @@ typedef struct _GUID } 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 -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED _WAVEFORMATEX { uint16_t wFormatTag; uint16_t nChannels; @@ -57,9 +70,7 @@ _WAVEFORMATEX { #ifndef _WAVEFORMATEXTENSIBLE_ #define _WAVEFORMATEXTENSIBLE_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED _WAVEFORMATEXTENSIBLE { WAVEFORMATEX Format; union { @@ -75,9 +86,7 @@ _WAVEFORMATEXTENSIBLE { #ifndef _WAVEHEADER_ #define _WAVEHEADER_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED _WAVEHEADER { uint32_t MainChunkID; uint32_t Length; @@ -98,9 +107,7 @@ _WAVEHEADER { #if !defined(_BITMAPINFOHEADER_) && !defined(WIN32) #define _BITMAPINFOHEADER_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED { uint32_t biSize; uint32_t biWidth; @@ -116,9 +123,7 @@ typedef struct } BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER; typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED { BITMAPINFOHEADER bmiHeader; int bmiColors[1]; @@ -128,9 +133,7 @@ typedef struct #ifndef _RECT32_ #define _RECT32_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED { int left, top, right, bottom; } RECT32; @@ -144,9 +147,7 @@ typedef int64_t REFERENCE_TIME; #ifndef _VIDEOINFOHEADER_ #define _VIDEOINFOHEADER_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED { RECT32 rcSource; RECT32 rcTarget; @@ -160,9 +161,7 @@ typedef struct #ifndef _RGBQUAD_ #define _RGBQUAD_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED { uint8_t rgbBlue; uint8_t rgbGreen; @@ -174,9 +173,7 @@ typedef struct #ifndef _TRUECOLORINFO_ #define _TRUECOLORINFO_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED { uint32_t dwBitMasks[3]; RGBQUAD1 bmiColors[256]; @@ -186,9 +183,7 @@ typedef struct #ifndef _VIDEOINFO_ #define _VIDEOINFO_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED { RECT32 rcSource; RECT32 rcTarget; @@ -207,6 +202,10 @@ 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 */ @@ -217,6 +216,7 @@ typedef struct #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_TRUESPEECH 0x0022 /* TrueSpeech */ #define WAVE_FORMAT_GSM610 0x0031 /* Microsoft Corporation */ #define WAVE_FORMAT_MSNAUDIO 0x0032 /* Microsoft Corporation */ #define WAVE_FORMAT_G726 0x0045 /* ITU-T standard */ @@ -232,17 +232,30 @@ typedef struct #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 +/* At least FFmpeg 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 + +/* It seems that these IDs are used by braindead & obsolete VorbisACM encoder + * (Windows only) + * A few info is available except VorbisACM source (remember, Windows only) + * (available on http://svn.xiph.org), but it seems that vo3+ at least is + * made of Vorbis data encapsulated in Ogg container... + */ #define WAVE_FORMAT_VORB_1 0x674f -#define WAVE_FORMAT_VORB_1PLUS 0x676f #define WAVE_FORMAT_VORB_2 0x6750 -#define WAVE_FORMAT_VORB_2PLUS 0x6770 #define WAVE_FORMAT_VORB_3 0x6751 +#define WAVE_FORMAT_VORB_1PLUS 0x676f +#define WAVE_FORMAT_VORB_2PLUS 0x6770 #define WAVE_FORMAT_VORB_3PLUS 0x6771 + #define WAVE_FORMAT_SPEEX 0xa109 /* Speex audio */ @@ -260,7 +273,7 @@ static const GUID VLC_KSDATAFORMAT_SUBTYPE_PCM = {0xE923AABF, 0xCB58, 0x4471, {0 #define KSDATAFORMAT_SUBTYPE_PCM VLC_KSDATAFORMAT_SUBTYPE_PCM #endif -#ifndef _KSDATAFORMAT_SUBTYPE_UNKNOWN_ +#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}}; #define KSDATAFORMAT_SUBTYPE_UNKNOWN VLC_KSDATAFORMAT_SUBTYPE_UNKNOWN @@ -287,7 +300,7 @@ static const GUID VLC_KSDATAFORMAT_SUBTYPE_UNKNOWN = {0x00000000, 0x0000, 0x0000 #define WAVE_SPEAKER_TOP_BACK_RIGHT 0x20000 #define WAVE_SPEAKER_RESERVED 0x80000000 -static struct +static const struct { uint16_t i_tag; vlc_fourcc_t i_fourcc; @@ -296,34 +309,43 @@ static 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_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_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_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_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" }, + { WAVE_FORMAT_MPEGLAYER3, VLC_CODEC_MPGA, "Mpeg Audio" }, + { WAVE_FORMAT_MPEG, VLC_CODEC_MPGA, "Mpeg 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_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_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_FFMPEG_AAC, 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_FOURCC( 's', 'p', 'x', ' ' ), "Speex Audio" }, + { WAVE_FORMAT_SPEEX, VLC_CODEC_SPEEX, "Speex Audio" }, { WAVE_FORMAT_UNKNOWN, VLC_FOURCC( 'u', 'n', 'd', 'f' ), "Unknown" } }; @@ -353,7 +375,7 @@ static inline void fourcc_to_wf_tag( vlc_fourcc_t fcc, uint16_t *pi_tag ) * to determine the actual format. Microsoft has stopped giving out wFormatTag * assignments in lieu of letting 3rd parties generate their own GUIDs */ -static struct +static const struct { GUID guid_tag; vlc_fourcc_t i_fourcc; @@ -377,7 +399,7 @@ static inline void sf_tag_to_fourcc( GUID *guid_tag, { int i; - for( i = 0; !guidcmp( &sub_format_tag_to_fourcc[i].guid_tag, + for( i = 0; !guidcmp( &sub_format_tag_to_fourcc[i].guid_tag, &KSDATAFORMAT_SUBTYPE_UNKNOWN ); i++ ) { if( guidcmp( &sub_format_tag_to_fourcc[i].guid_tag, guid_tag ) ) break; @@ -386,31 +408,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; - vlc_bool_t b_smooth; - mtime_t i_fade_in; - mtime_t i_fade_out; - unsigned int i_align; - mtime_t i_time_offset; - vlc_bool_t b_forced_subs; - unsigned int palette[16]; - unsigned int colors[4]; - -} subtitle_data_t; - #endif /* "codecs.h" */