Commit fda4b655 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

aout: drop support for S32I

parent 7234132c
...@@ -84,9 +84,7 @@ static const vlc_fourcc_t list[][2] = { ...@@ -84,9 +84,7 @@ static const vlc_fourcc_t list[][2] = {
{ VLC_CODEC_F64B, VLC_CODEC_F64L }, { VLC_CODEC_F64B, VLC_CODEC_F64L },
{ VLC_CODEC_F32B, VLC_CODEC_F32L }, { VLC_CODEC_F32B, VLC_CODEC_F32L },
{ VLC_CODEC_S24B, VLC_CODEC_S24L }, { VLC_CODEC_S24B, VLC_CODEC_S24L },
{ VLC_CODEC_S32B, VLC_CODEC_S32L },
{ VLC_CODEC_S24B, VLC_CODEC_S24L }, { VLC_CODEC_S24B, VLC_CODEC_S24L },
{ VLC_CODEC_S32B, VLC_CODEC_S32L },
}; };
static int Open(vlc_object_t *object) static int Open(vlc_object_t *object)
......
...@@ -318,11 +318,8 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -318,11 +318,8 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
case VLC_CODEC_F32L: case VLC_CODEC_F32L:
pcm_format = SND_PCM_FORMAT_FLOAT_LE; pcm_format = SND_PCM_FORMAT_FLOAT_LE;
break; break;
case VLC_CODEC_S32B: case VLC_CODEC_S32N:
pcm_format = SND_PCM_FORMAT_S32_BE; pcm_format = SND_PCM_FORMAT_S32;
break;
case VLC_CODEC_S32L:
pcm_format = SND_PCM_FORMAT_S32_LE;
break; break;
case VLC_CODEC_S24B: case VLC_CODEC_S24B:
pcm_format = SND_PCM_FORMAT_S24_3BE; pcm_format = SND_PCM_FORMAT_S24_3BE;
......
...@@ -118,11 +118,8 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -118,11 +118,8 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
format = AFMT_FLOAT; format = AFMT_FLOAT;
break; break;
#endif #endif
case VLC_CODEC_S32B: case VLC_CODEC_S32N:
format = AFMT_S32_BE; format = AFMT_S32_NE;
break;
case VLC_CODEC_S32L:
format = AFMT_S32_LE;
break; break;
case VLC_CODEC_S16N: case VLC_CODEC_S16N:
format = AFMT_S16_NE; format = AFMT_S16_NE;
...@@ -151,12 +148,11 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -151,12 +148,11 @@ static int Start (audio_output_t *aout, audio_sample_format_t *restrict fmt)
switch (format) switch (format)
{ {
case AFMT_U8: fmt->i_format = VLC_CODEC_U8; break; case AFMT_U8: fmt->i_format = VLC_CODEC_U8; break;
case AFMT_S16_NE: fmt->i_format = VLC_CODEC_S16N; break; case AFMT_S16_NE: fmt->i_format = VLC_CODEC_S16N; break;
//case AFMT_S24_BE: //case AFMT_S24_BE:
//case AFMT_S24_LE: //case AFMT_S24_LE:
case AFMT_S32_BE: fmt->i_format = VLC_CODEC_S32B; break; case AFMT_S32_NE: fmt->i_format = VLC_CODEC_S32N; break;
case AFMT_S32_LE: fmt->i_format = VLC_CODEC_S32L; break;
#ifdef AFMT_FLOAT #ifdef AFMT_FLOAT
case AFMT_FLOAT: fmt->i_format = VLC_CODEC_FL32; break; case AFMT_FLOAT: fmt->i_format = VLC_CODEC_FL32; break;
#endif #endif
......
...@@ -664,11 +664,8 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -664,11 +664,8 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
case VLC_CODEC_F32L: case VLC_CODEC_F32L:
ss.format = PA_SAMPLE_FLOAT32LE; ss.format = PA_SAMPLE_FLOAT32LE;
break; break;
case VLC_CODEC_S32B: case VLC_CODEC_S32N:
ss.format = PA_SAMPLE_S32BE; ss.format = PA_SAMPLE_S32NE;
break;
case VLC_CODEC_S32L:
ss.format = PA_SAMPLE_S32LE;
break; break;
case VLC_CODEC_S24B: case VLC_CODEC_S24B:
ss.format = PA_SAMPLE_S24BE; ss.format = PA_SAMPLE_S24BE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment