X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_codecs.h;h=6fad0e2df412edbca45940a50602746ab2ca58c9;hb=629dbd8af1ac2b65b3cc9477616c9c8ae4c2e7af;hp=46047116c7d286a918163a796d5fb6c10e4bf9ba;hpb=ebd800345f87349ff51971ae88c56cb439da4dcf;p=vlc diff --git a/include/vlc_codecs.h b/include/vlc_codecs.h index 46047116c7..6fad0e2df4 100644 --- a/include/vlc_codecs.h +++ b/include/vlc_codecs.h @@ -24,17 +24,12 @@ #ifndef VLC_CODECS_H #define VLC_CODECS_H 1 +#include /** * \file * 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) @@ -48,6 +43,15 @@ 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 @@ -198,7 +202,12 @@ ATTR_PACKED } VIDEOINFO; #endif +#if defined(__SUNPRO_C) +# pragma pack() +#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 */ @@ -208,22 +217,31 @@ 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_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 */ #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_DOLBY_AC3_SPDIF 0x0092 /* Sonic Foundry */ -#define WAVE_FORMAT_A52 0x2000 -#define WAVE_FORMAT_DTS 0x2001 +#define WAVE_FORMAT_AAC 0x00FF /* */ +#define WAVE_FORMAT_SIPRO 0x0130 /* Sipro Lab Telecom Inc. */ + #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_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_FFMPEG_AAC 0x706D +#define WAVE_FORMAT_DIVIO_AAC 0x4143 /* Divio's AAC */ /* Need to check these */ #define WAVE_FORMAT_DK3 0x0061 @@ -249,9 +267,8 @@ ATTR_PACKED #define WAVE_FORMAT_SPEEX 0xa109 /* Speex audio */ - #if !defined(WAVE_FORMAT_EXTENSIBLE) -#define WAVE_FORMAT_EXTENSIBLE 0xFFFE /* Microsoft */ + #define WAVE_FORMAT_EXTENSIBLE 0xFFFE /* Microsoft */ #endif /* GUID SubFormat IDs */ @@ -300,36 +317,48 @@ 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_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_AMR_NB, 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_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_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_LATM, 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" } }; @@ -392,31 +421,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" */