diff options
| author | wm4 <wm4@nowhere> | 2015-06-16 20:57:43 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-06-16 21:11:59 +0200 |
| commit | 831d7c3c400b554484561bf912c1f9657f8192cd (patch) | |
| tree | 7c3abe2dadd826f58ac316f9c35b56d9e869d760 /audio/out/ao_oss.c | |
| parent | 488ebdb0d57b4e822e8dac4fac18dfe460b61ac6 (diff) | |
| download | mpv-831d7c3c400b554484561bf912c1f9657f8192cd.tar.bz2 mpv-831d7c3c400b554484561bf912c1f9657f8192cd.tar.xz | |
audio: remove S8, U16, U24, U32 formats
They are useless. Not only are they actually rarely in use; but
libavcodec doesn't even output them, as libavcodec has no such sample
formats for decoded audio.
Even if it should happen that we actually still need them (e.g. if doing
direct hardware output), there are better solutions. Swapping the sign
is a fast and lossless operation and can be done inplace, so AO actually
needing it could do this directly.
If you wonder why we keep U8 instead of S8: because libavcodec does it.
Diffstat (limited to 'audio/out/ao_oss.c')
| -rw-r--r-- | audio/out/ao_oss.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/audio/out/ao_oss.c b/audio/out/ao_oss.c index bf320e9b65..bcb21aeffd 100644 --- a/audio/out/ao_oss.c +++ b/audio/out/ao_oss.c @@ -94,40 +94,20 @@ static const struct mp_chmap oss_layouts[MP_NUM_CHANNELS + 1] = { #define AFMT_S16_NE MP_SELECT_LE_BE(AFMT_S16_LE, AFMT_S16_BE) #endif -#if !defined(AFMT_U16_NE) && defined(AFMT_U16_LE) && defined(AFMT_U16_BE) -#define AFMT_U16_NE MP_SELECT_LE_BE(AFMT_U16_LE, AFMT_U16_BE) -#endif - -#if !defined(AFMT_U24_NE) && defined(AFMT_U24_LE) && defined(AFMT_U24_BE) -#define AFMT_U24_NE MP_SELECT_LE_BE(AFMT_U24_LE, AFMT_U24_BE) -#endif - #if !defined(AFMT_S24_NE) && defined(AFMT_S24_LE) && defined(AFMT_S24_BE) #define AFMT_S24_NE MP_SELECT_LE_BE(AFMT_S24_LE, AFMT_S24_BE) #endif -#if !defined(AFMT_U32_NE) && defined(AFMT_U32_LE) && defined(AFMT_U32_BE) -#define AFMT_U32_NE AFMT_U32MP_SELECT_LE_BE(AFMT_U32_LE, AFMT_U32_BE) -#endif - #if !defined(AFMT_S32_NE) && defined(AFMT_S32_LE) && defined(AFMT_S32_BE) #define AFMT_S32_NE AFMT_S32MP_SELECT_LE_BE(AFMT_S32_LE, AFMT_S32_BE) #endif static const int format_table[][2] = { {AFMT_U8, AF_FORMAT_U8}, - {AFMT_S8, AF_FORMAT_S8}, - {AFMT_U16_NE, AF_FORMAT_U16}, {AFMT_S16_NE, AF_FORMAT_S16}, -#ifdef AFMT_U24_NE - {AFMT_U24_NE, AF_FORMAT_U24}, -#endif #ifdef AFMT_S24_NE {AFMT_S24_NE, AF_FORMAT_S24}, #endif -#ifdef AFMT_U32_NE - {AFMT_U32_NE, AF_FORMAT_U32}, -#endif #ifdef AFMT_S32_NE {AFMT_S32_NE, AF_FORMAT_S32}, #endif |