X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/71816ecb7f81fe7a124cefa2258cfa64046908a1..fb70fa22c36f9220e8f4424948d0af476fb3d7a9:/src/pulsecore/source-output.c diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index 48cd6a04..4323bcf8 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -32,7 +32,9 @@ #include #include +#include #include +#include #include #include #include @@ -221,11 +223,9 @@ int pa_source_output_new( pa_source_output *o; pa_resampler *resampler = NULL; char st[PA_SAMPLE_SPEC_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], fmt[PA_FORMAT_INFO_SNPRINT_MAX]; - pa_channel_map original_cm; + pa_channel_map volume_map; int r; char *pt; - pa_sample_spec ss; - pa_channel_map map; pa_assert(_o); pa_assert(core); @@ -242,11 +242,19 @@ int pa_source_output_new( /* From this point on, we want to work only with formats, and get back * to using the sample spec and channel map after all decisions w.r.t. * routing are complete. */ - pa_idxset *tmp = pa_idxset_new(NULL, NULL); - pa_format_info *f = pa_format_info_from_sample_spec(&data->sample_spec, - data->channel_map_is_set ? &data->channel_map : NULL); - pa_idxset_put(tmp, f, NULL); - pa_source_output_new_data_set_formats(data, tmp); + pa_format_info *f; + pa_idxset *formats; + + f = pa_format_info_from_sample_spec2(&data->sample_spec, data->channel_map_is_set ? &data->channel_map : NULL, + !(data->flags & PA_SOURCE_OUTPUT_FIX_FORMAT), + !(data->flags & PA_SOURCE_OUTPUT_FIX_RATE), + !(data->flags & PA_SOURCE_OUTPUT_FIX_CHANNELS)); + if (!f) + return -PA_ERR_INVALID; + + formats = pa_idxset_new(NULL, NULL); + pa_idxset_put(formats, f, NULL); + pa_source_output_new_data_set_formats(data, formats); } if ((r = pa_hook_fire(&core->hooks[PA_CORE_HOOK_SOURCE_OUTPUT_NEW], data)) < 0) @@ -268,11 +276,6 @@ int pa_source_output_new( pa_source_output_new_data_set_source(data, source, false); } - pa_return_val_if_fail(PA_SOURCE_IS_LINKED(pa_source_get_state(data->source)), -PA_ERR_BADSTATE); - pa_return_val_if_fail(!data->direct_on_input || data->direct_on_input->sink == data->source->monitor_of, -PA_ERR_INVALID); - - /* Routing's done, we have a source. Now let's fix the format. */ - /* If something didn't pick a format for us, pick the top-most format since * we assume this is sorted in priority order */ if (!data->format && data->nego_formats && !pa_idxset_isempty(data->nego_formats)) @@ -291,26 +294,27 @@ int pa_source_output_new( return -PA_ERR_NOTSUPPORTED; } - /* Now populate the sample spec and format according to the final - * format that we've negotiated */ - pa_return_val_if_fail(pa_format_info_to_sample_spec(data->format, &ss, &map) == 0, -PA_ERR_INVALID); - pa_source_output_new_data_set_sample_spec(data, &ss); - if (pa_format_info_is_pcm(data->format) && pa_channel_map_valid(&map)) - pa_source_output_new_data_set_channel_map(data, &map); - - if (!data->sample_spec_is_set) - data->sample_spec = data->source->sample_spec; + pa_return_val_if_fail(PA_SOURCE_IS_LINKED(pa_source_get_state(data->source)), -PA_ERR_BADSTATE); + pa_return_val_if_fail(!data->direct_on_input || data->direct_on_input->sink == data->source->monitor_of, -PA_ERR_INVALID); - pa_return_val_if_fail(pa_sample_spec_valid(&data->sample_spec), -PA_ERR_INVALID); + /* Routing is done. We have a source and a format. */ - if (!data->channel_map_is_set) { - if (pa_channel_map_compatible(&data->source->channel_map, &data->sample_spec)) - data->channel_map = data->source->channel_map; - else - pa_channel_map_init_extend(&data->channel_map, data->sample_spec.channels, PA_CHANNEL_MAP_DEFAULT); + if (data->volume_is_set && pa_format_info_is_pcm(data->format)) { + /* If volume is set, we need to save the original data->channel_map, + * so that we can remap the volume from the original channel map to the + * final channel map of the stream in case data->channel_map gets + * modified in pa_format_info_to_sample_spec2(). */ + r = pa_stream_get_volume_channel_map(&data->volume, data->channel_map_is_set ? &data->channel_map : NULL, data->format, &volume_map); + if (r < 0) + return r; } - pa_return_val_if_fail(pa_channel_map_compatible(&data->channel_map, &data->sample_spec), -PA_ERR_INVALID); + /* Now populate the sample spec and channel map according to the final + * format that we've negotiated */ + r = pa_format_info_to_sample_spec2(data->format, &data->sample_spec, &data->channel_map, &data->source->sample_spec, + &data->source->channel_map); + if (r < 0) + return r; /* Don't restore (or save) stream volume for passthrough streams and * prevent attenuation/gain */ @@ -330,7 +334,10 @@ int pa_source_output_new( if (!data->volume_writable) data->save_volume = false; - pa_return_val_if_fail(pa_cvolume_compatible(&data->volume, &data->sample_spec), -PA_ERR_INVALID); + if (data->volume_is_set) + /* The original volume channel map may be different than the final + * stream channel map, so remapping may be needed. */ + pa_cvolume_remap(&data->volume, &volume_map, &data->channel_map); if (!data->volume_factor_is_set) pa_cvolume_reset(&data->volume_factor, data->sample_spec.channels); @@ -345,31 +352,6 @@ int pa_source_output_new( if (!data->muted_is_set) data->muted = false; - if (data->flags & PA_SOURCE_OUTPUT_FIX_FORMAT) { - pa_return_val_if_fail(pa_format_info_is_pcm(data->format), -PA_ERR_INVALID); - data->sample_spec.format = data->source->sample_spec.format; - pa_format_info_set_sample_format(data->format, data->sample_spec.format); - } - - if (data->flags & PA_SOURCE_OUTPUT_FIX_RATE) { - pa_return_val_if_fail(pa_format_info_is_pcm(data->format), -PA_ERR_INVALID); - pa_format_info_set_rate(data->format, data->sample_spec.rate); - data->sample_spec.rate = data->source->sample_spec.rate; - } - - original_cm = data->channel_map; - - if (data->flags & PA_SOURCE_OUTPUT_FIX_CHANNELS) { - pa_return_val_if_fail(pa_format_info_is_pcm(data->format), -PA_ERR_INVALID); - data->sample_spec.channels = data->source->sample_spec.channels; - data->channel_map = data->source->channel_map; - pa_format_info_set_channels(data->format, data->sample_spec.channels); - pa_format_info_set_channel_map(data->format, &data->channel_map); - } - - pa_assert(pa_sample_spec_valid(&data->sample_spec)); - pa_assert(pa_channel_map_valid(&data->channel_map)); - if (!(data->flags & PA_SOURCE_OUTPUT_VARIABLE_RATE) && !pa_sample_spec_equal(&data->sample_spec, &data->source->sample_spec)) { /* try to change source rate. This is done before the FIXATE hook since @@ -388,9 +370,6 @@ int pa_source_output_new( return -PA_ERR_NOTSUPPORTED; } - /* Due to the fixing of the sample spec the volume might not match anymore */ - pa_cvolume_remap(&data->volume, &original_cm, &data->channel_map); - if (data->resample_method == PA_RESAMPLER_INVALID) data->resample_method = core->resample_method; @@ -1082,8 +1061,8 @@ void pa_source_output_set_mute(pa_source_output *o, bool mute, bool save) { pa_assert_ctl_context(); pa_assert(PA_SOURCE_OUTPUT_IS_LINKED(o->state)); - if (!o->muted == !mute) { - o->save_muted = o->save_muted || mute; + if (mute == o->muted) { + o->save_muted |= save; return; } @@ -1284,6 +1263,7 @@ int pa_source_output_start_move(pa_source_output *o) { * their volume - this function does all that by using recursion. */ static void update_volume_due_to_moving(pa_source_output *o, pa_source *dest) { pa_cvolume old_volume; + pa_cvolume new_volume; pa_assert(o); pa_assert(dest); @@ -1357,25 +1337,21 @@ static void update_volume_due_to_moving(pa_source_output *o, pa_source *dest) { * (sources that use volume sharing should always have * soft_volume of 0 dB) */ - old_volume = o->destination_source->reference_volume; - - o->destination_source->reference_volume = root_source->reference_volume; - pa_cvolume_remap(&o->destination_source->reference_volume, &root_source->channel_map, &o->destination_source->channel_map); + new_volume = root_source->reference_volume; + pa_cvolume_remap(&new_volume, &root_source->channel_map, &o->destination_source->channel_map); + pa_source_set_reference_volume_direct(o->destination_source, &new_volume); o->destination_source->real_volume = root_source->real_volume; pa_cvolume_remap(&o->destination_source->real_volume, &root_source->channel_map, &o->destination_source->channel_map); pa_assert(pa_cvolume_is_norm(&o->destination_source->soft_volume)); - /* Notify others about the changed source volume. If you wonder whether - * o->destination_source->set_volume() should be called somewhere, that's not - * the case, because sources that use volume sharing shouldn't have any - * internal volume that set_volume() would update. If you wonder - * whether the thread_info variables should be synced, yes, they - * should, and it's done by the PA_SOURCE_MESSAGE_FINISH_MOVE message - * handler. */ - if (!pa_cvolume_equal(&o->destination_source->reference_volume, &old_volume)) - pa_subscription_post(o->core, PA_SUBSCRIPTION_EVENT_SOURCE|PA_SUBSCRIPTION_EVENT_CHANGE, o->destination_source->index); + /* If you wonder whether o->destination_source->set_volume() should be + * called somewhere, that's not the case, because sources that use + * volume sharing shouldn't have any internal volume that set_volume() + * would update. If you wonder whether the thread_info variables should + * be synced, yes, they should, and it's done by the + * PA_SOURCE_MESSAGE_FINISH_MOVE message handler. */ /* Recursively update origin source outputs. */ PA_IDXSET_FOREACH(destination_source_output, o->destination_source->outputs, idx) @@ -1677,7 +1653,8 @@ int pa_source_output_update_rate(pa_source_output *o) { o->requested_resample_method, ((o->flags & PA_SOURCE_OUTPUT_VARIABLE_RATE) ? PA_RESAMPLER_VARIABLE_RATE : 0) | ((o->flags & PA_SOURCE_OUTPUT_NO_REMAP) ? PA_RESAMPLER_NO_REMAP : 0) | - (o->core->disable_remixing || (o->flags & PA_SOURCE_OUTPUT_NO_REMIX) ? PA_RESAMPLER_NO_REMIX : 0)); + (o->core->disable_remixing || (o->flags & PA_SOURCE_OUTPUT_NO_REMIX) ? PA_RESAMPLER_NO_REMIX : 0) | + (o->core->disable_lfe_remixing ? PA_RESAMPLER_NO_LFE : 0)); if (!new_resampler) { pa_log_warn("Unsupported resampling operation.");