Skip to content

V
vlc
Commit 2ff21391 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

PulseAudio: disable fix-rate when negotiating pass-through (refs #9309) 

API design bug in PulseAudio...
parent 7771a49e
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 6 deletions
modules/audio_output/pulse.c
View file @ 2ff21391
...@@ -794,12 +794,12 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -794,12 +794,12 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
} }
/* Stream parameters */ /* Stream parameters */
const pa_stream_flags_t flags = sys->flags_force pa_stream_flags_t flags = sys->flags_force
| PA_STREAM_START_CORKED | PA_STREAM_START_CORKED
| PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_INTERPOLATE_TIMING
| PA_STREAM_NOT_MONOTONIC | PA_STREAM_NOT_MONOTONIC
| PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_AUTO_TIMING_UPDATE
| PA_STREAM_FIX_RATE; | PA_STREAM_FIX_RATE;
struct pa_buffer_attr attr; struct pa_buffer_attr attr;
attr.maxlength = -1; attr.maxlength = -1;
...@@ -831,6 +831,12 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt) ...@@ -831,6 +831,12 @@ static int Start(audio_output_t *aout, audio_sample_format_t *restrict fmt)
pa_format_info_set_channels(formatv[formatc], ss.channels); pa_format_info_set_channels(formatv[formatc], ss.channels);
pa_format_info_set_channel_map(formatv[formatc], &map); pa_format_info_set_channel_map(formatv[formatc], &map);
formatc++; formatc++;
/* FIX flags are only permitted for PCM, and there is no way to pass
* different flags for different formats... */
flags &= ~(PA_STREAM_FIX_FORMAT
| PA_STREAM_FIX_RATE
| PA_STREAM_FIX_CHANNELS);
} }
/* Fallback to PCM */ /* Fallback to PCM */
......
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