gemian/pulseaudio-modules-droid
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common: Store initial input stream metrics as defaults.

Browse source 
And if reconfiguration fails restore defaults instead of
previously used values.
This commit is contained in:
Juho Hämäläinen 2019-11-15 14:19:25 +02:00
parent a2eb4143ef
commit 3192069095
2 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/common/droid-util.c
View file

@ -1614,19 +1614,11 @@ static void input_stream_close(pa_droid_stream *s) {
bool pa_droid_stream_reconfigure_input(pa_droid_stream *s,
const pa_sample_spec *requested_sample_spec,
const pa_channel_map *requested_channel_map) {
pa_sample_spec orig_req_ss;
pa_channel_map orig_req_cm;
pa_assert(s);
pa_assert(s->input);
pa_assert(requested_sample_spec);
pa_assert(requested_channel_map);
first_reconfigure = s->input->stream ? false : true;
orig_req_ss = s->input->req_sample_spec;
orig_req_cm = s->input->req_channel_map;
/* Copy our requested specs, so we know them when resuming from suspend
* as well. */
s->input->req_sample_spec = *requested_sample_spec;
@ -1636,9 +1628,9 @@ bool pa_droid_stream_reconfigure_input(pa_droid_stream *s,
if (input_stream_open(s, false) < 0) {
if (!s->input->first) {
pa_log_debug("Input stream reconfigure failed, restore original values.");
s->input->req_sample_spec = orig_req_ss;
s->input->req_channel_map = orig_req_cm;
pa_log_debug("Input stream reconfigure failed, restore default values.");
s->input->req_sample_spec = s->input->default_sample_spec;
s->input->req_channel_map = s->input->default_channel_map;
input_stream_open(s, false);
}
return false;
@ -1648,25 +1640,27 @@ bool pa_droid_stream_reconfigure_input(pa_droid_stream *s,
}
pa_droid_stream *pa_droid_open_input_stream(pa_droid_hw_module *hw_module,
const pa_sample_spec *requested_sample_spec,
const pa_channel_map *requested_channel_map) {
const pa_sample_spec *default_sample_spec,
const pa_channel_map *default_channel_map) {
pa_droid_stream *s = NULL;
pa_droid_input_stream *input = NULL;
pa_assert(hw_module);
pa_assert(requested_sample_spec);
pa_assert(requested_channel_map);
pa_assert(default_sample_spec);
pa_assert(default_channel_map);
if (hw_module->state.active_input) {
pa_log("Opening input stream while there is already active input stream.");
return NULL;
}
s = droid_stream_new(hw_module);
s = droid_stream_new(hw_module, hw_module->enabled_module->inputs);
s->input = input = droid_input_stream_new();
s->input->default_sample_spec = *default_sample_spec;
s->input->default_channel_map = *default_channel_map;
if (!pa_droid_stream_reconfigure_input(s, requested_sample_spec, requested_channel_map)) {
if (!pa_droid_stream_reconfigure_input(s, default_sample_spec, default_channel_map)) {
pa_droid_stream_unref(s);
s = NULL;
} else

6
src/common/include/droid/droid-util.h
View file

@ -116,6 +116,8 @@ struct pa_droid_output_stream {
struct pa_droid_input_stream {
struct audio_stream_in *stream;
pa_sample_spec default_sample_spec;
pa_channel_map default_channel_map;
pa_sample_spec sample_spec;
pa_channel_map channel_map;
pa_sample_spec req_sample_spec;
@ -306,8 +308,8 @@ int pa_droid_stream_set_route(pa_droid_stream *s, audio_devices_t device);
/* Open input stream with currently active routing, sample_spec and channel_map
* are requests and may change when opening the stream. */
pa_droid_stream *pa_droid_open_input_stream(pa_droid_hw_module *hw_module,
const pa_sample_spec *requested_sample_spec,
const pa_channel_map *requested_channel_map);
const pa_sample_spec *default_sample_spec,
const pa_channel_map *default_channel_map);
bool pa_droid_stream_reconfigure_input(pa_droid_stream *s,
const pa_sample_spec *requested_sample_spec,
const pa_channel_map *requested_channel_map);