X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_codecs.h;h=d217470698da1c63f28cc03f65f09a39bcd8915a;hb=4168ec3729c16ddc3cce5dcb2a69306e45ec0cb7;hp=1e4117ce738cc65abad908db2062cc48db920654;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h index 1e4117ce73..d217470698 100644 --- a/include/vlc_codecs.h +++ b/include/vlc_codecs.h @@ -24,6 +24,12 @@ #ifndef _VLC_CODECS_H #define _VLC_CODECS_H 1 +#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) @@ -40,9 +46,7 @@ typedef struct _GUID #ifndef _WAVEFORMATEX_ #define _WAVEFORMATEX_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED _WAVEFORMATEX { uint16_t wFormatTag; uint16_t nChannels; @@ -57,9 +61,7 @@ _WAVEFORMATEX { #ifndef _WAVEFORMATEXTENSIBLE_ #define _WAVEFORMATEXTENSIBLE_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED _WAVEFORMATEXTENSIBLE { WAVEFORMATEX Format; union { @@ -75,9 +77,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 +98,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 +114,7 @@ typedef struct } BITMAPINFOHEADER, *PBITMAPINFOHEADER, *LPBITMAPINFOHEADER; typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED { BITMAPINFOHEADER bmiHeader; int bmiColors[1]; @@ -128,9 +124,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 +138,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 +152,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 +164,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 +174,7 @@ typedef struct #ifndef _VIDEOINFO_ #define _VIDEOINFO_ typedef struct -#ifdef HAVE_ATTRIBUTE_PACKED - __attribute__((__packed__)) -#endif +ATTR_PACKED { RECT32 rcSource; RECT32 rcTarget; @@ -232,17 +218,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 +259,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 @@ -317,6 +316,8 @@ wave_format_tag_to_fourcc[] = { 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" }, @@ -377,7 +378,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; @@ -402,12 +403,12 @@ typedef struct es_sys_t unsigned int i_scale_h; unsigned int i_scale_v; unsigned int i_alpha; - vlc_bool_t b_smooth; + bool 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; + bool b_forced_subs; unsigned int palette[16]; unsigned int colors[4];