X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fvlc_aout.h;h=21b67fbdb6a47e4ed8a9a93ab569da508bed4cdc;hb=b5625a39634deaa4082b44a326614a5b79b8dc39;hp=00b7e2e6b13cdf550528c25f8a06fe1014d17aa8;hpb=29e5165b2a6099a3c83bf29759a7a60225b6d90e;p=vlc diff --git a/include/vlc_aout.h b/include/vlc_aout.h index 00b7e2e6b1..21b67fbdb6 100644 --- a/include/vlc_aout.h +++ b/include/vlc_aout.h @@ -47,25 +47,14 @@ extern "C" { && ((p_first)->i_physical_channels == (p_second)->i_physical_channels)\ && ((p_first)->i_original_channels == (p_second)->i_original_channels) ) -#ifdef WORDS_BIGENDIAN -# define AOUT_FMT_S16_NE VLC_FOURCC('s','1','6','b') -# define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','b') -# define AOUT_FMT_S24_NE VLC_FOURCC('s','2','4','b') -# define AOUT_FMT_S32_NE VLC_FOURCC('s','3','2','b') -# define AOUT_FMT_SPDIF_NE VLC_FOURCC('s','p','d','b') -#else -# define AOUT_FMT_S16_NE VLC_FOURCC('s','1','6','l') -# define AOUT_FMT_U16_NE VLC_FOURCC('u','1','6','l') -# define AOUT_FMT_S24_NE VLC_FOURCC('s','2','4','l') -# define AOUT_FMT_S32_NE VLC_FOURCC('s','3','2','l') -# define AOUT_FMT_SPDIF_NE VLC_FOURCC('s','p','d','i') -#endif - -#define AOUT_FMT_NON_LINEAR( p_format ) \ - ( ((p_format)->i_format == VLC_FOURCC('s','p','d','i')) \ - || ((p_format)->i_format == VLC_FOURCC('s','p','d','b')) \ - || ((p_format)->i_format == VLC_FOURCC('a','5','2',' ')) \ - || ((p_format)->i_format == VLC_FOURCC('d','t','s',' ')) ) +#define VLC_CODEC_SPDIFL VLC_FOURCC('s','p','d','i') +#define VLC_CODEC_SPDIFB VLC_FOURCC('s','p','d','b') + +#define AOUT_FMT_NON_LINEAR( p_format ) \ + ( ((p_format)->i_format == VLC_CODEC_SPDIFL) \ + || ((p_format)->i_format == VLC_CODEC_SPDIFB) \ + || ((p_format)->i_format == VLC_CODEC_A52) \ + || ((p_format)->i_format == VLC_CODEC_DTS) ) /* This is heavily borrowed from libmad, by Robert Leslie */ /*