diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-17 17:35:31 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-17 17:35:31 +0000 |
| commit | ab08865ae1ed585f5c1284961767ce085e8d0b38 (patch) | |
| tree | 0d1ed690694bdcadcbe0875b7bde32f10b19ce1c /libao2 | |
| parent | 7ab2e83945cdd2315ebdb52ee9a61e9de991fadc (diff) | |
| download | mpv-ab08865ae1ed585f5c1284961767ce085e8d0b38.tar.bz2 mpv-ab08865ae1ed585f5c1284961767ce085e8d0b38.tar.xz | |
added float
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8223 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libao2')
| -rw-r--r-- | libao2/afmt.c | 16 | ||||
| -rw-r--r-- | libao2/afmt.h | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/libao2/afmt.c b/libao2/afmt.c index 8463d6c5d9..3eb81e84be 100644 --- a/libao2/afmt.c +++ b/libao2/afmt.c @@ -42,6 +42,8 @@ char *audio_out_format_name(int format) case AFMT_S32_BE: return("Signed 32-bit (Big-Endian)"); #endif + case AFMT_FLOAT: + return("Floating Point"); } return("Unknown"); } @@ -50,6 +52,12 @@ char *audio_out_format_name(int format) int audio_out_format_bits(int format){ switch (format) { + case AFMT_S16_LE: + case AFMT_S16_BE: + case AFMT_U16_LE: + case AFMT_U16_BE: + return 16;//16 bits + /* the following two formats are not available with old linux kernel headers (e.g. in 2.2.16) @@ -62,12 +70,8 @@ int audio_out_format_bits(int format){ case AFMT_S32_BE: return 32; #endif - - case AFMT_U16_LE: - case AFMT_U16_BE: - case AFMT_S16_LE: - case AFMT_S16_BE: - return 16;//16 bits + case AFMT_FLOAT: + return 32; case AFMT_MU_LAW: case AFMT_A_LAW: diff --git a/libao2/afmt.h b/libao2/afmt.h index ed2d01027f..2b5b904a92 100644 --- a/libao2/afmt.h +++ b/libao2/afmt.h @@ -47,3 +47,7 @@ # define AFMT_S32_NE AFMT_S32_LE # endif #endif + +#ifndef AFMT_FLOAT +# define AFMT_FLOAT 0x00004000 +#endif |