mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sink, source: Prevent unnecessary rate update attempts

Browse source 
We don't need to try a rate update if the desired sample rate is the
same as the one the sink or source is already using.
This commit is contained in:
Arun Raghavan 2012-11-15 15:51:52 +05:30
parent 0a0189d972
commit cd1102cce0
4 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -371,10 +371,7 @@ int pa_sink_input_new(
pa_log_info("Trying to change sample rate");
if (pa_sink_update_rate(data->sink, data->sample_spec.rate, pa_sink_input_new_data_is_passthrough(data)) == TRUE)
pa_log_info("Rate changed to %u Hz",
data->sink->sample_spec.rate);
else
pa_log_info("Resampling enabled to %u Hz", data->sink->sample_spec.rate);
pa_log_info("Rate changed to %u Hz", data->sink->sample_spec.rate);
}
/* Due to the fixing of the sample spec the volume might not match anymore */
@ -1662,11 +1659,7 @@ int pa_sink_input_finish_move(pa_sink_input *i, pa_sink *dest, pa_bool_t save) {
pa_log_info("Trying to change sample rate");
if (pa_sink_update_rate(dest, i->sample_spec.rate, pa_sink_input_is_passthrough(i)) == TRUE)
pa_log_info("Rate changed to %u Hz",
dest->sample_spec.rate);
else
pa_log_info("Resampling enabled to %u Hz",
dest->sample_spec.rate);
pa_log_info("Rate changed to %u Hz", dest->sample_spec.rate);
}
if (i->moving)

3
src/pulsecore/sink.c
View file

@ -1392,6 +1392,9 @@ pa_bool_t pa_sink_update_rate(pa_sink *s, uint32_t rate, pa_bool_t passthrough)
desired_rate = rate; /* use stream sampling rate, discard default/alternate settings */
}
if (desired_rate == s->sample_spec.rate)
return FALSE;
if (!passthrough && pa_sink_used_by(s) > 0)
return FALSE;

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

@ -350,10 +350,7 @@ int pa_source_output_new(
pa_log_info("Trying to change sample rate");
if (pa_source_update_rate(data->source, data->sample_spec.rate, pa_source_output_new_data_is_passthrough(data)) == TRUE)
pa_log_info("Rate changed to %u Hz",
data->source->sample_spec.rate);
else
pa_log_info("Resampling enabled to %u Hz", data->source->sample_spec.rate);
pa_log_info("Rate changed to %u Hz", data->source->sample_spec.rate);
}
if (data->resample_method == PA_RESAMPLER_INVALID)
@ -1425,11 +1422,7 @@ int pa_source_output_finish_move(pa_source_output *o, pa_source *dest, pa_bool_t
pa_log_info("Trying to change sample rate");
if (pa_source_update_rate(dest, o->sample_spec.rate, pa_source_output_is_passthrough(o)) == TRUE)
pa_log_info("Rate changed to %u Hz",
dest->sample_spec.rate);
else
pa_log_info("Resampling enabled to %u Hz",
dest->sample_spec.rate);
pa_log_info("Rate changed to %u Hz", dest->sample_spec.rate);
}
if (o->moving)

3
src/pulsecore/source.c
View file

@ -1000,6 +1000,9 @@ pa_bool_t pa_source_update_rate(pa_source *s, uint32_t rate, pa_bool_t passthrou
desired_rate = rate; /* use stream sampling rate, discard default/alternate settings */
}
if (desired_rate == s->sample_spec.rate)
return FALSE;
if (!passthrough && pa_source_used_by(s) > 0)
return FALSE;