[vlc-commits] aout: drop support for U24 and S24I

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Dec 19 20:03:36 2012 +0200| [d95e65c6b3399b856e1ff7b3f10df23ba84e1888] | committer: Rémi Denis-Courmont

aout: drop support for U24 and S24I

It seems S24N needs to be kept for the FLAC decoder though.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d95e65c6b3399b856e1ff7b3f10df23ba84e1888
---

 modules/audio_filter/converter/endian.c |   19 -------------------
 modules/audio_output/alsa.c             |   12 ------------
 modules/audio_output/pulse.c            |    6 ------
 3 files changed, 37 deletions(-)

diff --git a/modules/audio_filter/converter/endian.c b/modules/audio_filter/converter/endian.c
index 1dcf667..b93015a 100644
--- a/modules/audio_filter/converter/endian.c
+++ b/modules/audio_filter/converter/endian.c
@@ -44,23 +44,7 @@ vlc_module_begin()
     set_callbacks(Open, NULL)
 vlc_module_end()
 
-static block_t *Filter24(filter_t *filter, block_t *block)
-{
-    uint8_t *data = (uint8_t *)block->p_buffer;
-
-    for (size_t i = 0; i < block->i_buffer; i += 3) {
-        uint8_t buf = data[i];
-        data[i] = data[i + 2];
-        data[i + 2] = buf;
-    }
-
-    (void) filter;
-    return block;
-}
-
 static const vlc_fourcc_t list[][2] = {
-    { VLC_CODEC_S24B, VLC_CODEC_S24L },
-    { VLC_CODEC_S24B, VLC_CODEC_S24L },
 };
 
 static int Open(vlc_object_t *object)
@@ -89,9 +73,6 @@ static int Open(vlc_object_t *object)
 
 ok:
     switch (src->i_bitspersample) {
-        case 24:
-            filter->pf_audio_filter = Filter24;
-            break;
     }
 
     return VLC_SUCCESS;
diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 045ea5c..cd0a593 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -315,18 +315,6 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
         case VLC_CODEC_S32N:
             pcm_format = SND_PCM_FORMAT_S32;
             break;
-        case VLC_CODEC_S24B:
-            pcm_format = SND_PCM_FORMAT_S24_3BE;
-            break;
-        case VLC_CODEC_S24L:
-            pcm_format = SND_PCM_FORMAT_S24_3LE;
-            break;
-        case VLC_CODEC_U24B:
-            pcm_format = SND_PCM_FORMAT_U24_3BE;
-            break;
-        case VLC_CODEC_U24L:
-            pcm_format = SND_PCM_FORMAT_U24_3LE;
-            break;
         case VLC_CODEC_S16N:
             pcm_format = SND_PCM_FORMAT_S16;
             break;
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index d30aa28..62e4aa5 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -662,12 +662,6 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
         case VLC_CODEC_S32N:
             ss.format = PA_SAMPLE_S32NE;
             break;
-        case VLC_CODEC_S24B:
-            ss.format = PA_SAMPLE_S24BE;
-            break;
-        case VLC_CODEC_S24L:
-            ss.format = PA_SAMPLE_S24LE;
-            break;
         case VLC_CODEC_S16N:
             ss.format = PA_SAMPLE_S16NE;
             break;