Commit 56d05a40 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

PulseAudio: Support for 7.1 and use accept 32-bits float as input, patch by Danny Wood.

Cosmetic on the file too.
parent 0c028c29
...@@ -76,6 +76,7 @@ if (!p_sys->context || pa_context_get_state(p_sys->context) != PA_CONTEXT_READY ...@@ -76,6 +76,7 @@ if (!p_sys->context || pa_context_get_state(p_sys->context) != PA_CONTEXT_READY
goto label; \ goto label; \
} \ } \
} while(0); } while(0);
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
...@@ -89,6 +90,7 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata); ...@@ -89,6 +90,7 @@ static void stream_request_cb(pa_stream *s, size_t length, void *userdata);
static void stream_latency_update_cb(pa_stream *s, void *userdata); static void stream_latency_update_cb(pa_stream *s, void *userdata);
static void success_cb(pa_stream *s, int sucess, void *userdata); static void success_cb(pa_stream *s, int sucess, void *userdata);
static void uninit(aout_instance_t *p_aout); static void uninit(aout_instance_t *p_aout);
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
*****************************************************************************/ *****************************************************************************/
...@@ -128,6 +130,13 @@ static int Open ( vlc_object_t *p_this ) ...@@ -128,6 +130,13 @@ static int Open ( vlc_object_t *p_this )
/* Setup the pulse audio stream based on the input stream count */ /* Setup the pulse audio stream based on the input stream count */
switch(ss.channels) switch(ss.channels)
{ {
case 8:
p_aout->output.output.i_physical_channels
= AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
| AOUT_CHAN_MIDDLELEFT | AOUT_CHAN_MIDDLERIGHT
| AOUT_CHAN_REARLEFT | AOUT_CHAN_REARRIGHT
| AOUT_CHAN_LFE;
break;
case 6: case 6:
p_aout->output.output.i_physical_channels p_aout->output.output.i_physical_channels
= AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER = AOUT_CHAN_LEFT | AOUT_CHAN_RIGHT | AOUT_CHAN_CENTER
...@@ -159,8 +168,8 @@ static int Open ( vlc_object_t *p_this ) ...@@ -159,8 +168,8 @@ static int Open ( vlc_object_t *p_this )
msg_Info(p_aout, "No. of Audio Channels: %d", ss.channels); msg_Info(p_aout, "No. of Audio Channels: %d", ss.channels);
ss.rate = p_aout->output.output.i_rate; ss.rate = p_aout->output.output.i_rate;
ss.format = PA_SAMPLE_S16LE; ss.format = PA_SAMPLE_FLOAT32NE;
p_aout->output.output.i_format = AOUT_FMT_S16_NE; p_aout->output.output.i_format = VLC_FOURCC('f','l','3','2');
if (!pa_sample_spec_valid(&ss)) { if (!pa_sample_spec_valid(&ss)) {
msg_Err(p_aout,"Invalid sample spec"); msg_Err(p_aout,"Invalid sample spec");
......
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