[vlc-commits] pulse: simplify format for passthrough

Thomas Guillem git at videolan.org
Fri Oct 7 12:10:18 CEST 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Thu Oct  6 17:14:23 2016 +0200| [3e64922c003785f4c5b0c084f1d056f2a0016bb8] | committer: Thomas Guillem

pulse: simplify format for passthrough

This format is used only by pa_sample_spec_valid() when doing passthrough.

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

 modules/audio_output/pulse.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 20b3561..18cc0de 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -722,26 +722,26 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
             fmt->i_bytes_per_frame = 4;
             fmt->i_frame_length = 1;
             encoding = PA_ENCODING_AC3_IEC61937;
-            ss.format = HAVE_FPU ? PA_SAMPLE_FLOAT32NE : PA_SAMPLE_S16NE;
+            ss.format = PA_SAMPLE_S16NE;
             break;
         case VLC_CODEC_EAC3:
             fmt->i_format = VLC_CODEC_SPDIFL;
             fmt->i_bytes_per_frame = 4;
             fmt->i_frame_length = 1;
             encoding = PA_ENCODING_EAC3_IEC61937;
-            ss.format = HAVE_FPU ? PA_SAMPLE_FLOAT32NE : PA_SAMPLE_S16NE;
+            ss.format = PA_SAMPLE_S16NE;
             break;
         /* case VLC_CODEC_MPGA:
             fmt->i_format = VLC_CODEC_SPDIFL FIXME;
             encoding = PA_ENCODING_MPEG_IEC61937;
-            ss.format = HAVE_FPU ? PA_SAMPLE_FLOAT32NE : PA_SAMPLE_S16NE;
+            ss.format = PA_SAMPLE_S16NE;
             break;*/
         case VLC_CODEC_DTS:
             fmt->i_format = VLC_CODEC_SPDIFL;
             fmt->i_bytes_per_frame = 4;
             fmt->i_frame_length = 1;
             encoding = PA_ENCODING_DTS_IEC61937;
-            ss.format = HAVE_FPU ? PA_SAMPLE_FLOAT32NE : PA_SAMPLE_S16NE;
+            ss.format = PA_SAMPLE_S16NE;
 
             break;
         default:



More information about the vlc-commits mailing list