mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink-input, source-output: Check rate update success for passthrough

Browse source 
This makes sure we don't try to plug in a passthrough stream if the
final sink/source sample spec doesn't match what we want. In the future,
we might want to change rate updates to try a full sample spec update
for passthrough streams.

https://bugs.freedesktop.org/show_bug.cgi?id=50951
This commit is contained in:
Arun Raghavan 2012-11-19 12:52:28 +05:30
parent da4163a85e
commit 3effdfc16f
2 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/pulsecore/sink-input.c
View file

@ -374,6 +374,14 @@ int pa_sink_input_new(
pa_log_info("Rate changed to %u Hz", data->sink->sample_spec.rate); pa_log_info("Rate changed to %u Hz", data->sink->sample_spec.rate);
} }
if (pa_sink_input_new_data_is_passthrough(data) &&
!pa_sample_spec_equal(&data->sample_spec, &data->sink->sample_spec)) {
/* rate update failed, or other parts of sample spec didn't match */
pa_log_debug("Could not update sink sample spec to match passthrough stream");
return -PA_ERR_NOTSUPPORTED;
}
/* Due to the fixing of the sample spec the volume might not match anymore */ /* Due to the fixing of the sample spec the volume might not match anymore */
pa_cvolume_remap(&data->volume, &original_cm, &data->channel_map); pa_cvolume_remap(&data->volume, &original_cm, &data->channel_map);

8
src/pulsecore/source-output.c
View file

@ -350,6 +350,14 @@ int pa_source_output_new(
pa_log_info("Rate changed to %u Hz", data->source->sample_spec.rate); pa_log_info("Rate changed to %u Hz", data->source->sample_spec.rate);
} }
if (pa_source_output_new_data_is_passthrough(data) &&
!pa_sample_spec_equal(&data->sample_spec, &data->source->sample_spec)) {
/* rate update failed, or other parts of sample spec didn't match */
pa_log_debug("Could not update source sample spec to match passthrough stream");
return -PA_ERR_NOTSUPPORTED;
}
/* Due to the fixing of the sample spec the volume might not match anymore */ /* Due to the fixing of the sample spec the volume might not match anymore */
pa_cvolume_remap(&data->volume, &original_cm, &data->channel_map); pa_cvolume_remap(&data->volume, &original_cm, &data->channel_map);