[vlc-commits] aout: drop support for S32I

[Rémi Denis-Courmont]

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

aout: drop support for S32I

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

 modules/audio_filter/converter/endian.c |    2 --
 modules/audio_output/alsa.c             |    7 ++-----
 modules/audio_output/oss.c              |   14 +++++---------
 modules/audio_output/pulse.c            |    7 ++-----
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/modules/audio_filter/converter/endian.c b/modules/audio_filter/converter/endian.c
index 13657b7..a0ed3ea 100644
--- a/modules/audio_filter/converter/endian.c
+++ b/modules/audio_filter/converter/endian.c
@@ -84,9 +84,7 @@ static const vlc_fourcc_t list[][2] = {
     { VLC_CODEC_F64B, VLC_CODEC_F64L },
     { VLC_CODEC_F32B, VLC_CODEC_F32L },
     { VLC_CODEC_S24B, VLC_CODEC_S24L },
-    { VLC_CODEC_S32B, VLC_CODEC_S32L },
     { VLC_CODEC_S24B, VLC_CODEC_S24L },
-    { VLC_CODEC_S32B, VLC_CODEC_S32L },
 };
 
 static int Open(vlc_object_t *object)
diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
index 93d8054..712433c 100644
--- a/modules/audio_output/alsa.c
+++ b/modules/audio_output/alsa.c
@@ -318,11 +318,8 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
         case VLC_CODEC_F32L:
             pcm_format = SND_PCM_FORMAT_FLOAT_LE;
             break;
-        case VLC_CODEC_S32B:
-            pcm_format = SND_PCM_FORMAT_S32_BE;
-            break;
-        case VLC_CODEC_S32L:
-            pcm_format = SND_PCM_FORMAT_S32_LE;
+        case VLC_CODEC_S32N:
+            pcm_format = SND_PCM_FORMAT_S32;
             break;
         case VLC_CODEC_S24B:
             pcm_format = SND_PCM_FORMAT_S24_3BE;
diff --git a/modules/audio_output/oss.c b/modules/audio_output/oss.c
index 4e2c6e6..7f9859e 100644
--- a/modules/audio_output/oss.c
+++ b/modules/audio_output/oss.c
@@ -118,11 +118,8 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
             format = AFMT_FLOAT;
             break;
 #endif
-        case VLC_CODEC_S32B:
-            format = AFMT_S32_BE;
-            break;
-        case VLC_CODEC_S32L:
-            format = AFMT_S32_LE;
+        case VLC_CODEC_S32N:
+            format = AFMT_S32_NE;
             break;
         case VLC_CODEC_S16N:
             format = AFMT_S16_NE;
@@ -151,12 +148,11 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
 
     switch (format)
     {
-        case AFMT_U8:    fmt->i_format = VLC_CODEC_U8;   break;
-        case AFMT_S16_NE:   fmt->i_format = VLC_CODEC_S16N; break;
+        case AFMT_U8:     fmt->i_format = VLC_CODEC_U8;   break;
+        case AFMT_S16_NE: fmt->i_format = VLC_CODEC_S16N; break;
         //case AFMT_S24_BE:
         //case AFMT_S24_LE:
-        case AFMT_S32_BE: fmt->i_format = VLC_CODEC_S32B; break;
-        case AFMT_S32_LE: fmt->i_format = VLC_CODEC_S32L; break;
+        case AFMT_S32_NE: fmt->i_format = VLC_CODEC_S32N; break;
 #ifdef AFMT_FLOAT
         case AFMT_FLOAT:  fmt->i_format = VLC_CODEC_FL32; break;
 #endif
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index d955483..1afc724 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -664,11 +664,8 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
         case VLC_CODEC_F32L:
             ss.format = PA_SAMPLE_FLOAT32LE;
             break;
-        case VLC_CODEC_S32B:
-            ss.format = PA_SAMPLE_S32BE;
-            break;
-        case VLC_CODEC_S32L:
-            ss.format = PA_SAMPLE_S32LE;
+        case VLC_CODEC_S32N:
+            ss.format = PA_SAMPLE_S32NE;
             break;
         case VLC_CODEC_S24B:
             ss.format = PA_SAMPLE_S24BE;