From 02c0032ab42f33533007cbc24866d4ce5f73b635 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Sat, 6 Feb 2010 14:20:12 +0100 Subject: [PATCH] Added VLC_CODEC_F32/64 L/B. VLC_CODEC_FL32/64 are mapped on the native type as before. --- include/vlc_fourcc.h | 11 +++++++++-- src/misc/fourcc.c | 13 ++++++++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h index 6528f7e550..e0560f5307 100644 --- a/include/vlc_fourcc.h +++ b/include/vlc_fourcc.h @@ -263,12 +263,15 @@ #define VLC_CODEC_S32B VLC_FOURCC('s','3','2','b') #define VLC_CODEC_U32L VLC_FOURCC('u','3','2','l') #define VLC_CODEC_U32B VLC_FOURCC('u','3','2','b') +#define VLC_CODEC_F32L VLC_FOURCC('f','3','2','l') +#define VLC_CODEC_F32B VLC_FOURCC('f','3','2','b') +#define VLC_CODEC_F64L VLC_FOURCC('f','6','4','l') +#define VLC_CODEC_F64B VLC_FOURCC('f','6','4','b') + #define VLC_CODEC_ALAW VLC_FOURCC('a','l','a','w') #define VLC_CODEC_MULAW VLC_FOURCC('m','l','a','w') #define VLC_CODEC_S24DAUD VLC_FOURCC('d','a','u','d') #define VLC_CODEC_FI32 VLC_FOURCC('f','i','3','2') -#define VLC_CODEC_FL32 VLC_FOURCC('f','l','3','2') -#define VLC_CODEC_FL64 VLC_FOURCC('f','l','6','4') #define VLC_CODEC_TWINVQ VLC_FOURCC('T','W','I','N') #define VLC_CODEC_ADPCM_IMA_AMV VLC_FOURCC('i','m','a','v') @@ -298,6 +301,8 @@ # define VLC_CODEC_U16N VLC_CODEC_U16B # define VLC_CODEC_S24N VLC_CODEC_S24B # define VLC_CODEC_S32N VLC_CODEC_S32B +# define VLC_CODEC_FL32 VLC_CODEC_F32B +# define VLC_CODEC_FL64 VLC_CODEC_F64B # define VLC_CODEC_S16I VLC_CODEC_S16L # define VLC_CODEC_U16I VLC_CODEC_U16L @@ -308,6 +313,8 @@ # define VLC_CODEC_U16N VLC_CODEC_U16L # define VLC_CODEC_S24N VLC_CODEC_S24L # define VLC_CODEC_S32N VLC_CODEC_S32L +# define VLC_CODEC_FL32 VLC_CODEC_F32L +# define VLC_CODEC_FL64 VLC_CODEC_F64L # define VLC_CODEC_S16I VLC_CODEC_S16B # define VLC_CODEC_U16I VLC_CODEC_U16B diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c index 7d34362c72..5bd1d8b708 100644 --- a/src/misc/fourcc.c +++ b/src/misc/fourcc.c @@ -1084,11 +1084,18 @@ static const entry_t p_list_audio[] = { B(VLC_CODEC_FI32, "32 bits fixed float"), A("fi32"), - B(VLC_CODEC_FL32, "32 bits float"), + B(VLC_CODEC_F32L, "32 bits float LE"), + A("f32l"), A("fl32"), - B(VLC_CODEC_FL64, "64 bits float"), - A("fl64"), + B(VLC_CODEC_F32L, "32 bits float BE"), + A("f32b"), + + B(VLC_CODEC_F64L, "64 bits float LE"), + A("f64l"), + + B(VLC_CODEC_F64L, "64 bits float BE"), + A("f64b"), B(VLC_CODEC_TWINVQ, "TwinVQ"), A("TWIN"), -- 2.39.2