X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmodules%2Falsa%2Falsa-source.c;h=58f00f7a01e5a64d65431132edb50825d9f20a36;hb=0f44b1e820c1744bfb46d37e87b71d64109c4374;hp=616215e9583f887949e8e9d8ade11f6026fd820f;hpb=8417cac4f6c8036d6ce65efa3df6ae8477f8e3e2;p=platform%2Fupstream%2Fpulseaudio.git diff --git a/src/modules/alsa/alsa-source.c b/src/modules/alsa/alsa-source.c index 616215e..58f00f7 100644 --- a/src/modules/alsa/alsa-source.c +++ b/src/modules/alsa/alsa-source.c @@ -137,6 +137,9 @@ struct userdata { pa_hook_slot *reserve_slot; pa_reserve_monitor_wrapper *monitor; pa_hook_slot *monitor_slot; + + /* ucm context */ + pa_alsa_ucm_mapping_context *ucm_context; }; static void userdata_free(struct userdata *u); @@ -145,6 +148,8 @@ static pa_hook_result_t reserve_cb(pa_reserve_wrapper *r, void *forced, struct u pa_assert(r); pa_assert(u); + pa_log_debug("Suspending source %s, because another application requested us to release the device.", u->source->name); + if (pa_source_suspend(u->source, TRUE, PA_SUSPEND_APPLICATION) < 0) return PA_HOOK_CANCEL; @@ -207,14 +212,17 @@ static int reserve_init(struct userdata *u, const char *dname) { } static pa_hook_result_t monitor_cb(pa_reserve_monitor_wrapper *w, void* busy, struct userdata *u) { - pa_bool_t b; - pa_assert(w); pa_assert(u); - b = PA_PTR_TO_UINT(busy) && !u->reserve; + if (PA_PTR_TO_UINT(busy) && !u->reserve) { + pa_log_debug("Suspending source %s, because another application is blocking the access to the device.", u->source->name); + pa_source_suspend(u->source, true, PA_SUSPEND_APPLICATION); + } else { + pa_log_debug("Resuming source %s, because other applications aren't blocking access to the device any more.", u->source->name); + pa_source_suspend(u->source, false, PA_SUSPEND_APPLICATION); + } - pa_source_suspend(u->source, b, PA_SUSPEND_APPLICATION); return PA_HOOK_OK; } @@ -764,6 +772,7 @@ static void update_smoother(struct userdata *u) { int err; pa_usec_t now1 = 0, now2; snd_pcm_status_t *status; + snd_htimestamp_t htstamp = { 0, 0 }; snd_pcm_status_alloca(&status); @@ -772,18 +781,13 @@ static void update_smoother(struct userdata *u) { /* Let's update the time smoother */ - if (PA_UNLIKELY((err = pa_alsa_safe_delay(u->pcm_handle, &delay, u->hwbuf_size, &u->source->sample_spec, TRUE)) < 0)) { + if (PA_UNLIKELY((err = pa_alsa_safe_delay(u->pcm_handle, status, &delay, u->hwbuf_size, &u->source->sample_spec, TRUE)) < 0)) { pa_log_warn("Failed to get delay: %s", pa_alsa_strerror(err)); return; } - if (PA_UNLIKELY((err = snd_pcm_status(u->pcm_handle, status)) < 0)) - pa_log_warn("Failed to get timestamp: %s", pa_alsa_strerror(err)); - else { - snd_htimestamp_t htstamp = { 0, 0 }; - snd_pcm_status_get_htstamp(status, &htstamp); - now1 = pa_timespec_load(&htstamp); - } + snd_pcm_status_get_htstamp(status, &htstamp); + now1 = pa_timespec_load(&htstamp); /* Hmm, if the timestamp is 0, then it wasn't set and we take the current time */ if (now1 <= 0) @@ -1353,6 +1357,16 @@ static void mixer_volume_init(struct userdata *u) { } } +static int source_set_port_ucm_cb(pa_source *s, pa_device_port *p) { + struct userdata *u = s->userdata; + + pa_assert(u); + pa_assert(p); + pa_assert(u->ucm_context); + + return pa_alsa_ucm_set_port(u->ucm_context, p, FALSE); +} + static int source_set_port_cb(pa_source *s, pa_device_port *p) { struct userdata *u = s->userdata; pa_alsa_port_data *data; @@ -1364,13 +1378,10 @@ static int source_set_port_cb(pa_source *s, pa_device_port *p) { data = PA_DEVICE_PORT_DATA(p); pa_assert_se(u->mixer_path = data->path); - pa_alsa_path_select(u->mixer_path, u->mixer_handle, s->muted); + pa_alsa_path_select(u->mixer_path, data->setting, u->mixer_handle, s->muted); mixer_volume_init(u); - if (data->setting) - pa_alsa_setting_select(data->setting, u->mixer_handle); - if (s->set_mute) s->set_mute(s); if (s->flags & PA_SOURCE_DEFERRED_VOLUME) { @@ -1441,7 +1452,7 @@ static void thread_func(void *userdata) { for (;;) { int ret; - pa_usec_t rtpoll_sleep = 0; + pa_usec_t rtpoll_sleep = 0, real_sleep; #ifdef DEBUG_TIMING pa_log_debug("Loop"); @@ -1505,8 +1516,10 @@ static void thread_func(void *userdata) { } } - if (rtpoll_sleep > 0) + if (rtpoll_sleep > 0) { pa_rtpoll_set_timer_relative(u->rtpoll, rtpoll_sleep); + real_sleep = pa_rtclock_now(); + } else pa_rtpoll_set_timer_disabled(u->rtpoll); @@ -1514,6 +1527,18 @@ static void thread_func(void *userdata) { if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) goto fail; + if (rtpoll_sleep > 0) { + real_sleep = pa_rtclock_now() - real_sleep; +#ifdef DEBUG_TIMING + pa_log_debug("Expected sleep: %0.2fms, real sleep: %0.2fms (diff %0.2f ms)", + (double) rtpoll_sleep / PA_USEC_PER_MSEC, (double) real_sleep / PA_USEC_PER_MSEC, + (double) ((int64_t) real_sleep - (int64_t) rtpoll_sleep) / PA_USEC_PER_MSEC); +#endif + if (u->use_tsched && real_sleep > rtpoll_sleep + u->tsched_watermark) + pa_log_info("Scheduling delay of %0.2fms, you might want to investigate this to improve latency...", + (double) (real_sleep - rtpoll_sleep) / PA_USEC_PER_MSEC); + } + if (u->source->flags & PA_SOURCE_DEFERRED_VOLUME) pa_source_volume_change_apply(u->source, NULL); @@ -1642,10 +1667,7 @@ static int setup_mixer(struct userdata *u, pa_bool_t ignore_dB) { data = PA_DEVICE_PORT_DATA(u->source->active_port); u->mixer_path = data->path; - pa_alsa_path_select(data->path, u->mixer_handle, u->source->muted); - - if (data->setting) - pa_alsa_setting_select(data->setting, u->mixer_handle); + pa_alsa_path_select(data->path, data->setting, u->mixer_handle, u->source->muted); } else { @@ -1655,10 +1677,7 @@ static int setup_mixer(struct userdata *u, pa_bool_t ignore_dB) { if (u->mixer_path) { /* Hmm, we have only a single path, then let's activate it */ - pa_alsa_path_select(u->mixer_path, u->mixer_handle, u->source->muted); - - if (u->mixer_path->settings) - pa_alsa_setting_select(u->mixer_path->settings, u->mixer_handle); + pa_alsa_path_select(u->mixer_path, u->mixer_path->settings, u->mixer_handle, u->source->muted); } else return 0; } @@ -1710,7 +1729,7 @@ static int setup_mixer(struct userdata *u, pa_bool_t ignore_dB) { pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, pa_card *card, pa_alsa_mapping *mapping) { struct userdata *u = NULL; - const char *dev_id = NULL; + const char *dev_id = NULL, *key, *mod_name; pa_sample_spec ss; uint32_t alternate_sample_rate; pa_channel_map map; @@ -1720,6 +1739,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p pa_bool_t use_mmap = TRUE, b, use_tsched = TRUE, d, ignore_dB = FALSE, namereg_fail = FALSE, deferred_volume = FALSE, fixed_latency_range = FALSE; pa_source_new_data data; pa_alsa_profile_set *profile_set = NULL; + void *state = NULL; pa_assert(m); pa_assert(ma); @@ -1809,6 +1829,10 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p TRUE); u->smoother_interval = SMOOTHER_MIN_INTERVAL; + /* use ucm */ + if (mapping && mapping->ucm_context.ucm) + u->ucm_context = &mapping->ucm_context; + dev_id = pa_modargs_get_value( ma, "device_id", pa_modargs_get_value(ma, "device", DEFAULT_DEVICE)); @@ -1831,6 +1855,13 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p goto fail; } + if ((mod_name = pa_proplist_gets(mapping->proplist, PA_ALSA_PROP_UCM_MODIFIER))) { + if (snd_use_case_set(u->ucm_context->ucm->ucm_mgr, "_enamod", mod_name) < 0) + pa_log("Failed to enable ucm modifier %s", mod_name); + else + pa_log_debug("Enabled ucm modifier %s", mod_name); + } + if (!(u->pcm_handle = pa_alsa_open_by_device_id_mapping( dev_id, &u->device_name, @@ -1896,7 +1927,7 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p pa_log_info("Disabling latency range changes on overrun"); } - u->rates = pa_alsa_get_supported_rates(u->pcm_handle); + u->rates = pa_alsa_get_supported_rates(u->pcm_handle, ss.rate); if (!u->rates) { pa_log_error("Failed to find any supported sample rates."); goto fail; @@ -1905,7 +1936,8 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p /* ALSA might tweak the sample spec, so recalculate the frame size */ frame_size = pa_frame_size(&ss); - find_mixer(u, mapping, pa_modargs_get_value(ma, "control", NULL), ignore_dB); + if (!u->ucm_context) + find_mixer(u, mapping, pa_modargs_get_value(ma, "control", NULL), ignore_dB); pa_source_new_data_init(&data); data.driver = driver; @@ -1938,6 +1970,9 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p if (mapping) { pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_NAME, mapping->name); pa_proplist_sets(data.proplist, PA_PROP_DEVICE_PROFILE_DESCRIPTION, mapping->description); + + while ((key = pa_proplist_iterate(mapping->proplist, &state))) + pa_proplist_sets(data.proplist, key, pa_proplist_gets(mapping->proplist, key)); } pa_alsa_init_description(data.proplist); @@ -1951,7 +1986,9 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p goto fail; } - if (u->mixer_path_set) + if (u->ucm_context) + pa_alsa_ucm_add_ports(&data.ports, data.proplist, u->ucm_context, FALSE, card); + else if (u->mixer_path_set) pa_alsa_add_ports(&data, u->mixer_path_set, card); u->source = pa_source_new(m->core, &data, PA_SOURCE_HARDWARE|PA_SOURCE_LATENCY|(u->use_tsched ? PA_SOURCE_DYNAMIC_LATENCY : 0)); @@ -1978,7 +2015,10 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p if (u->use_tsched) u->source->update_requested_latency = source_update_requested_latency_cb; u->source->set_state = source_set_state_cb; - u->source->set_port = source_set_port_cb; + if (u->ucm_context) + u->source->set_port = source_set_port_ucm_cb; + else + u->source->set_port = source_set_port_cb; if (u->source->alternate_sample_rate) u->source->update_rate = source_update_rate_cb; u->source->userdata = u; @@ -2010,7 +2050,10 @@ pa_source *pa_alsa_source_new(pa_module *m, pa_modargs *ma, const char*driver, p if (update_sw_params(u) < 0) goto fail; - if (setup_mixer(u, ignore_dB) < 0) + if (u->ucm_context) { + if (u->source->active_port && pa_alsa_ucm_set_port(u->ucm_context, u->source->active_port, FALSE) < 0) + goto fail; + } else if (setup_mixer(u, ignore_dB) < 0) goto fail; pa_alsa_dump(PA_LOG_DEBUG, u->pcm_handle);