diff options
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/map-file | 2 | ||||
-rw-r--r-- | src/modules/module-alsa-sink.c | 43 | ||||
-rw-r--r-- | src/modules/module-alsa-source.c | 44 | ||||
-rw-r--r-- | src/modules/module-null-sink.c | 18 | ||||
-rw-r--r-- | src/modules/module-pipe-source.c | 5 | ||||
-rw-r--r-- | src/modules/module-sine-source.c | 335 | ||||
-rw-r--r-- | src/modules/module-sine.c | 4 | ||||
-rw-r--r-- | src/pulse/introspect.c | 10 | ||||
-rw-r--r-- | src/pulse/introspect.h | 2 | ||||
-rw-r--r-- | src/pulse/volume.c | 43 | ||||
-rw-r--r-- | src/pulse/volume.h | 20 | ||||
-rw-r--r-- | src/pulsecore/cli-text.c | 30 | ||||
-rw-r--r-- | src/pulsecore/protocol-native.c | 7 | ||||
-rw-r--r-- | src/pulsecore/sample-util.c | 27 | ||||
-rw-r--r-- | src/pulsecore/sample-util.h | 2 | ||||
-rw-r--r-- | src/pulsecore/sink.c | 12 | ||||
-rw-r--r-- | src/pulsecore/sink.h | 2 | ||||
-rw-r--r-- | src/pulsecore/source.c | 4 | ||||
-rw-r--r-- | src/pulsecore/source.h | 2 | ||||
-rw-r--r-- | src/pulsecore/tagstruct.c | 38 | ||||
-rw-r--r-- | src/pulsecore/tagstruct.h | 6 |
22 files changed, 601 insertions, 61 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 608e6786..dd9035b5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -847,6 +847,7 @@ modlibexec_LTLIBRARIES += \ module-cli-protocol-tcp.la \ module-simple-protocol-tcp.la \ module-null-sink.la \ + module-sine-source.la \ module-detect.la \ module-volume-restore.la \ module-device-restore.la \ @@ -1024,6 +1025,7 @@ SYMDEF_FILES = \ modules/module-tunnel-sink-symdef.h \ modules/module-tunnel-source-symdef.h \ modules/module-null-sink-symdef.h \ + modules/module-sine-source-symdef.h \ modules/module-esound-sink-symdef.h \ modules/module-zeroconf-publish-symdef.h \ modules/module-zeroconf-discover-symdef.h \ @@ -1179,6 +1181,10 @@ module_null_sink_la_SOURCES = modules/module-null-sink.c module_null_sink_la_LDFLAGS = $(MODULE_LDFLAGS) module_null_sink_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la +module_sine_source_la_SOURCES = modules/module-sine-source.c +module_sine_source_la_LDFLAGS = -module -avoid-version +module_sine_source_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la + # Couplings module_combine_la_SOURCES = modules/module-combine.c diff --git a/src/map-file b/src/map-file index ca523b91..82b9c386 100644 --- a/src/map-file +++ b/src/map-file @@ -234,6 +234,7 @@ pa_sw_volume_divide; pa_sw_volume_from_dB; pa_sw_volume_from_linear; pa_sw_volume_multiply; +pa_sw_volume_snprint_dB; pa_sw_volume_to_dB; pa_sw_volume_to_linear; pa_threaded_mainloop_accept; @@ -259,6 +260,7 @@ pa_usec_to_bytes; pa_utf8_filter; pa_utf8_to_locale; pa_utf8_valid; +pa_volume_snprint; pa_xfree; pa_xmalloc; pa_xmalloc0; diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c index 95a8c972..f9fb9bd5 100644 --- a/src/modules/module-alsa-sink.c +++ b/src/modules/module-alsa-sink.c @@ -599,9 +599,9 @@ static int update_sw_params(struct userdata *u) { u->hwbuf_unused_frames = (snd_pcm_sframes_t) (PA_LIKELY(b < u->hwbuf_size) ? ((u->hwbuf_size - b) / u->frame_size) : 0); - - fix_tsched_watermark(u); } + + fix_tsched_watermark(u); } pa_log_debug("hwbuf_unused_frames=%lu", (unsigned long) u->hwbuf_unused_frames); @@ -1506,28 +1506,35 @@ int pa__init(pa_module*m) { suitable = TRUE; } - if (snd_mixer_selem_get_playback_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0) - pa_log_info("Mixer doesn't support dB information."); - else { + if (suitable) { + if (snd_mixer_selem_get_playback_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0) + pa_log_info("Mixer doesn't support dB information."); + else { #ifdef HAVE_VALGRIND_MEMCHECK_H - VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_min, sizeof(u->hw_dB_min)); - VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max)); + VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_min, sizeof(u->hw_dB_min)); + VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max)); #endif - if (u->hw_dB_min >= u->hw_dB_max) - pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); - else { - pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); - u->hw_dB_supported = TRUE; + if (u->hw_dB_min >= u->hw_dB_max) + pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); + else { + pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); + u->hw_dB_supported = TRUE; + + if (u->hw_dB_max > 0) { + u->sink->base_volume = pa_sw_volume_from_dB(- (double) u->hw_dB_max/100.0); + pa_log_info("Fixing base volume to %0.2f dB", pa_sw_volume_to_dB(u->sink->base_volume)); + } else + pa_log_info("No particular base volume set, fixing to 0 dB"); + } } - } - if (suitable && - !u->hw_dB_supported && - u->hw_volume_max - u->hw_volume_min < 3) { + if (!u->hw_dB_supported && + u->hw_volume_max - u->hw_volume_min < 3) { - pa_log_info("Device doesn't do dB volume and has less than 4 volume levels. Falling back to software volume control."); - suitable = FALSE; + pa_log_info("Device doesn't do dB volume and has less than 4 volume levels. Falling back to software volume control."); + suitable = FALSE; + } } if (suitable) { diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c index b6c6ed1a..a6e4c907 100644 --- a/src/modules/module-alsa-source.c +++ b/src/modules/module-alsa-source.c @@ -545,9 +545,9 @@ static int update_sw_params(struct userdata *u) { u->hwbuf_unused_frames = (snd_pcm_sframes_t) (PA_LIKELY(b < u->hwbuf_size) ? ((u->hwbuf_size - b) / u->frame_size) : 0); - - fix_tsched_watermark(u); } + + fix_tsched_watermark(u); } pa_log_debug("hwbuf_unused_frames=%lu", (unsigned long) u->hwbuf_unused_frames); @@ -1328,28 +1328,36 @@ int pa__init(pa_module*m) { suitable = TRUE; } - if (snd_mixer_selem_get_capture_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0) - pa_log_info("Mixer doesn't support dB information."); - else { + if (suitable) { + if (snd_mixer_selem_get_capture_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0) + pa_log_info("Mixer doesn't support dB information."); + else { #ifdef HAVE_VALGRIND_MEMCHECK_H - VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_min, sizeof(u->hw_dB_min)); - VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max)); + VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_min, sizeof(u->hw_dB_min)); + VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max)); #endif - if (u->hw_dB_min >= u->hw_dB_max) - pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); - else { - pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); - u->hw_dB_supported = TRUE; + if (u->hw_dB_min >= u->hw_dB_max) + pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); + else { + pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); + u->hw_dB_supported = TRUE; + + if (u->hw_dB_max > 0) { + u->source->base_volume = pa_sw_volume_from_dB(- (double) u->hw_dB_max/100.0); + pa_log_info("Fixing base volume to %0.2f dB", pa_sw_volume_to_dB(u->source->base_volume)); + } else + pa_log_info("No particular base volume set, fixing to 0 dB"); + + } } - } - if (suitable && - !u->hw_dB_supported && - u->hw_volume_max - u->hw_volume_min < 3) { + if (!u->hw_dB_supported && + u->hw_volume_max - u->hw_volume_min < 3) { - pa_log_info("Device has less than 4 volume levels. Falling back to software volume control."); - suitable = FALSE; + pa_log_info("Device has less than 4 volume levels. Falling back to software volume control."); + suitable = FALSE; + } } if (suitable) { diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c index 470c622e..daf9767c 100644 --- a/src/modules/module-null-sink.c +++ b/src/modules/module-null-sink.c @@ -73,8 +73,6 @@ struct userdata { pa_thread_mq thread_mq; pa_rtpoll *rtpoll; - size_t block_size; - pa_usec_t block_usec; pa_usec_t timestamp; }; @@ -89,7 +87,13 @@ static const char* const valid_modargs[] = { NULL }; -static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { +static int sink_process_msg( + pa_msgobject *o, + int code, + void *data, + int64_t offset, + pa_memchunk *chunk) { + struct userdata *u = PA_SINK(o)->userdata; switch (code) { @@ -104,7 +108,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse pa_usec_t now; now = pa_rtclock_usec(); - *((pa_usec_t*) data) = u->timestamp > now ? u->timestamp - now : 0; + *((pa_usec_t*) data) = u->timestamp > now ? u->timestamp - now : 0ULL; return 0; } @@ -117,10 +121,12 @@ static void sink_update_requested_latency_cb(pa_sink *s) { struct userdata *u; pa_sink_assert_ref(s); - u = s->userdata; - pa_assert(u); + pa_assert_se(u = s->userdata); u->block_usec = pa_sink_get_requested_latency_within_thread(s); + + if (u->block_usec == (pa_usec_t) -1) + u->block_usec = s->thread_info.max_latency; } static void process_rewind(struct userdata *u, pa_usec_t now) { diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c index e6437a05..77310cab 100644 --- a/src/modules/module-pipe-source.c +++ b/src/modules/module-pipe-source.c @@ -226,10 +226,9 @@ int pa__init(pa_module*m) { goto fail; } - u = pa_xnew0(struct userdata, 1); + m->userdata = u = pa_xnew0(struct userdata, 1); u->core = m->core; u->module = m; - m->userdata = u; pa_memchunk_reset(&u->memchunk); u->rtpoll = pa_rtpoll_new(); pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); @@ -264,7 +263,7 @@ int pa__init(pa_module*m) { pa_source_new_data_set_sample_spec(&data, &ss); pa_source_new_data_set_channel_map(&data, &map); - u->source = pa_source_new(m->core, &data, 0); + u->source = pa_source_new(m->core, &data, PA_SOURCE_LATENCY); pa_source_new_data_done(&data); if (!u->source) { diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c new file mode 100644 index 00000000..dcc34162 --- /dev/null +++ b/src/modules/module-sine-source.c @@ -0,0 +1,335 @@ +/*** + This file is part of PulseAudio. + + Copyright 2008 Lennart Poettering + + PulseAudio is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + PulseAudio is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with PulseAudio; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdlib.h> +#include <sys/stat.h> +#include <stdio.h> +#include <errno.h> +#include <string.h> +#include <fcntl.h> +#include <unistd.h> +#include <limits.h> +#include <sys/ioctl.h> +#include <sys/poll.h> + +#include <pulse/xmalloc.h> +#include <pulse/timeval.h> + +#include <pulsecore/core-error.h> +#include <pulsecore/source.h> +#include <pulsecore/module.h> +#include <pulsecore/core-util.h> +#include <pulsecore/modargs.h> +#include <pulsecore/log.h> +#include <pulsecore/thread.h> +#include <pulsecore/thread-mq.h> +#include <pulsecore/rtpoll.h> +#include <pulsecore/rtclock.h> + +#include "module-sine-source-symdef.h" + +PA_MODULE_AUTHOR("Lennart Poettering"); +PA_MODULE_DESCRIPTION("Sine wave generator source"); +PA_MODULE_VERSION(PACKAGE_VERSION); +PA_MODULE_LOAD_ONCE(FALSE); +PA_MODULE_USAGE( + "rate=<sample rate> " + "source_name=<name for the source> " + "frequency=<frequency in Hz>"); + +#define DEFAULT_SOURCE_NAME "sine_input" +#define MAX_LATENCY_USEC (PA_USEC_PER_SEC * 2) + +struct userdata { + pa_core *core; + pa_module *module; + pa_source *source; + + pa_thread *thread; + pa_thread_mq thread_mq; + pa_rtpoll *rtpoll; + + pa_memchunk memchunk; + size_t peek_index; + + pa_usec_t block_usec; /* how much to push at once */ + pa_usec_t timestamp; /* when to push next */ +}; + +static const char* const valid_modargs[] = { + "rate", + "source_name", + "frequency", + NULL +}; + +static int source_process_msg( + pa_msgobject *o, + int code, + void *data, + int64_t offset, + pa_memchunk *chunk) { + + struct userdata *u = PA_SOURCE(o)->userdata; + + switch (code) { + + case PA_SINK_MESSAGE_SET_STATE: + + if (PA_PTR_TO_UINT(data) == PA_SINK_RUNNING) + u->timestamp = pa_rtclock_usec(); + + break; + + case PA_SOURCE_MESSAGE_GET_LATENCY: { + pa_usec_t now, left_to_fill; + + now = pa_rtclock_usec(); + left_to_fill = u->timestamp > now ? u->timestamp - now : 0ULL; + + *((pa_usec_t*) data) = u->block_usec > left_to_fill ? u->block_usec - left_to_fill : 0ULL; + + return 0; + } + } + + return pa_source_process_msg(o, code, data, offset, chunk); +} + +static void source_update_requested_latency_cb(pa_source *s) { + struct userdata *u; + + pa_source_assert_ref(s); + pa_assert_se(u = s->userdata); + + u->block_usec = pa_source_get_requested_latency_within_thread(s); + + if (u->block_usec == (pa_usec_t) -1) + u->block_usec = s->thread_info.max_latency; + + pa_log("new block msec = %lu", (unsigned long) (u->block_usec / PA_USEC_PER_MSEC)); +} + +static void process_render(struct userdata *u, pa_usec_t now) { + pa_assert(u); + + while (u->timestamp < now + u->block_usec) { + pa_memchunk chunk; + size_t k; + + k = pa_usec_to_bytes_round_up(now + u->block_usec - u->timestamp, &u->source->sample_spec); + + chunk.memblock = u->memchunk.memblock; + chunk.index = u->peek_index; + chunk.length = PA_MIN(u->memchunk.length - u->peek_index, k); + + pa_log_debug("posting %lu", (unsigned long) chunk.length); + pa_source_post(u->source, &chunk); + pa_memchunk_dump_to_file(&chunk, "sine"); + + u->peek_index += chunk.length; + while (u->peek_index >= u->memchunk.length) + u->peek_index -= u->memchunk.length; + + u->timestamp += pa_bytes_to_usec(chunk.length, &u->source->sample_spec); + } +} + +static void thread_func(void *userdata) { + struct userdata *u = userdata; + + pa_assert(u); + + pa_log_debug("Thread starting up"); + + pa_thread_mq_install(&u->thread_mq); + pa_rtpoll_install(u->rtpoll); + + u->timestamp = pa_rtclock_usec(); + + for (;;) { + int ret; + + if (PA_SOURCE_IS_OPENED(u->source->thread_info.state)) { + pa_usec_t now; + + now = pa_rtclock_usec(); + + if (u->timestamp <= now) + process_render(u, now); + + pa_rtpoll_set_timer_absolute(u->rtpoll, u->timestamp); + } else + pa_rtpoll_set_timer_disabled(u->rtpoll); + + /* Hmm, nothing to do. Let's sleep */ + if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) + goto fail; + + if (ret == 0) + goto finish; + } + +fail: + /* If this was no regular exit from the loop we have to continue + * processing messages until we received PA_MESSAGE_SHUTDOWN */ + pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); + pa_asyncmsgq_wait_for(u->thread_mq.inq, PA_MESSAGE_SHUTDOWN); + +finish: + pa_log_debug("Thread shutting down"); +} + +static void calc_sine(float *f, size_t l, double freq) { + size_t i; + + l /= sizeof(float); + + for (i = 0; i < l; i++) + f[i] = (float) sin((double) i/(double)l*M_PI*2*freq)/2; +} + +int pa__init(pa_module*m) { + struct userdata *u; + pa_modargs *ma; + pa_source_new_data data; + uint32_t frequency; + pa_sample_spec ss; + void *p; + + pa_assert(m); + + if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { + pa_log("failed to parse module arguments."); + goto fail; + } + + ss.format = PA_SAMPLE_FLOAT32; + ss.channels = 1; + ss.rate = 44100; + + if (pa_modargs_get_value_u32(ma, "rate", &ss.rate) < 0 || ss.rate <= 1) { + pa_log("Invalid rate specification"); + goto fail; + } + + frequency = 440; + if (pa_modargs_get_value_u32(ma, "frequency", &frequency) < 0 || frequency < 1 || frequency > ss.rate/2) { + pa_log("Invalid frequency specification"); + goto fail; + } + + m->userdata = u = pa_xnew0(struct userdata, 1); + u->core = m->core; + u->module = m; + u->rtpoll = pa_rtpoll_new(); + pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); + + u->peek_index = 0; + pa_memchunk_reset(&u->memchunk); + u->memchunk.memblock = pa_memblock_new(m->core->mempool, (size_t) -1); + u->memchunk.length = pa_frame_align(pa_memblock_get_length(u->memchunk.memblock), &ss); + + p = pa_memblock_acquire(u->memchunk.memblock); + calc_sine(p, u->memchunk.length, + (double) frequency * (double) pa_bytes_to_usec(u->memchunk.length, &ss) / (double) PA_USEC_PER_SEC); + pa_memblock_release(u->memchunk.memblock); + + pa_source_new_data_init(&data); + data.driver = __FILE__; + data.module = m; + pa_source_new_data_set_name(&data, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME)); + pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Sine source at %u Hz", (unsigned) frequency); + pa_proplist_sets(data.proplist, PA_PROP_DEVICE_CLASS, "abstract"); + pa_proplist_setf(data.proplist, "sine.hz", "%u", frequency); + pa_source_new_data_set_sample_spec(&data, &ss); + + u->source = pa_source_new(m->core, &data, PA_SOURCE_LATENCY); + pa_source_new_data_done(&data); + + if (!u->source) { + pa_log("Failed to create source."); + goto fail; + } + + u->source->parent.process_msg = source_process_msg; + u->source->update_requested_latency = source_update_requested_latency_cb; + u->source->userdata = u; + + pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); + pa_source_set_rtpoll(u->source, u->rtpoll); + + pa_source_set_latency_range(u->source, (pa_usec_t) -1, MAX_LATENCY_USEC); + u->block_usec = u->source->thread_info.max_latency; + + if (!(u->thread = pa_thread_new(thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } + + pa_source_put(u->source); + + pa_modargs_free(ma); + + return 0; + +fail: + if (ma) + pa_modargs_free(ma); + + pa__done(m); + + return -1; +} + +void pa__done(pa_module*m) { + struct userdata *u; + + pa_assert(m); + + if (!(u = m->userdata)) + return; + + if (u->source) + pa_source_unlink(u->source); + + if (u->thread) { + pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); + pa_thread_free(u->thread); + } + + pa_thread_mq_done(&u->thread_mq); + + if (u->source) + pa_source_unref(u->source); + + if (u->memchunk.memblock) + pa_memblock_unref(u->memchunk.memblock); + + if (u->rtpoll) + pa_rtpoll_free(u->rtpoll); + + pa_xfree(u); +} diff --git a/src/modules/module-sine.c b/src/modules/module-sine.c index 21565cc4..4ee46880 100644 --- a/src/modules/module-sine.c +++ b/src/modules/module-sine.c @@ -41,7 +41,9 @@ PA_MODULE_AUTHOR("Lennart Poettering"); PA_MODULE_DESCRIPTION("Sine wave generator"); PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(FALSE); -PA_MODULE_USAGE("sink=<sink to connect to> frequency=<frequency in Hz>"); +PA_MODULE_USAGE( + "sink=<sink to connect to> " + "frequency=<frequency in Hz>"); struct userdata { pa_core *core; diff --git a/src/pulse/introspect.c b/src/pulse/introspect.c index 38091581..5b905b7d 100644 --- a/src/pulse/introspect.c +++ b/src/pulse/introspect.c @@ -154,6 +154,7 @@ static void context_get_sink_info_callback(pa_pdispatch *pd, uint32_t command, u memset(&i, 0, sizeof(i)); i.proplist = pa_proplist_new(); + i.base_volume = PA_VOLUME_NORM; if (pa_tagstruct_getu32(t, &i.index) < 0 || pa_tagstruct_gets(t, &i.name) < 0 || @@ -170,7 +171,9 @@ static void context_get_sink_info_callback(pa_pdispatch *pd, uint32_t command, u pa_tagstruct_getu32(t, &flags) < 0 || (o->context->version >= 13 && (pa_tagstruct_get_proplist(t, i.proplist) < 0 || - pa_tagstruct_get_usec(t, &i.configured_latency) < 0))) { + pa_tagstruct_get_usec(t, &i.configured_latency) < 0)) || + (o->context->version >= 14 && + pa_tagstruct_get_volume(t, &i.base_volume) < 0)) { pa_context_fail(o->context, PA_ERR_PROTOCOL); pa_proplist_free(i.proplist); @@ -275,6 +278,7 @@ static void context_get_source_info_callback(pa_pdispatch *pd, uint32_t command, memset(&i, 0, sizeof(i)); i.proplist = pa_proplist_new(); + i.base_volume = PA_VOLUME_NORM; if (pa_tagstruct_getu32(t, &i.index) < 0 || pa_tagstruct_gets(t, &i.name) < 0 || @@ -291,7 +295,9 @@ static void context_get_source_info_callback(pa_pdispatch *pd, uint32_t command, pa_tagstruct_getu32(t, &flags) < 0 || (o->context->version >= 13 && (pa_tagstruct_get_proplist(t, i.proplist) < 0 || - pa_tagstruct_get_usec(t, &i.configured_latency) < 0))) { + pa_tagstruct_get_usec(t, &i.configured_latency) < 0)) || + (o->context->version >= 14 && + pa_tagstruct_get_volume(t, &i.base_volume) < 0)) { pa_context_fail(o->context, PA_ERR_PROTOCOL); pa_proplist_free(i.proplist); diff --git a/src/pulse/introspect.h b/src/pulse/introspect.h index 087bd9f9..b409cadb 100644 --- a/src/pulse/introspect.h +++ b/src/pulse/introspect.h @@ -231,6 +231,7 @@ typedef struct pa_sink_info { pa_sink_flags_t flags; /**< Flags */ pa_proplist *proplist; /**< Property list \since 0.9.11 */ pa_usec_t configured_latency; /**< The latency this device has been configured to. \since 0.9.11 */ + pa_volume_t base_volume; /**< Some kind of "base" volume that refers to unamplified/unattenuated volume in the context of the output device. \since 0.9.14 */ } pa_sink_info; /** Callback prototype for pa_context_get_sink_info_by_name() and friends */ @@ -286,6 +287,7 @@ typedef struct pa_source_info { pa_source_flags_t flags; /**< Flags */ pa_proplist *proplist; /**< Property list \since 0.9.11 */ pa_usec_t configured_latency; /**< The latency this device has been configured to. \since 0.9.11 */ + pa_volume_t base_volume; /**< Some kind of "base" volume that refers to unamplified/unattenuated volume in the context of the input device. \since 0.9.14 */ } pa_source_info; /** Callback prototype for pa_context_get_source_info_by_name() and friends */ diff --git a/src/pulse/volume.c b/src/pulse/volume.c index 99a85f44..ace5c4d6 100644 --- a/src/pulse/volume.c +++ b/src/pulse/volume.c @@ -179,6 +179,21 @@ char *pa_cvolume_snprint(char *s, size_t l, const pa_cvolume *c) { return s; } +char *pa_volume_snprint(char *s, size_t l, pa_volume_t v) { + pa_assert(s); + pa_assert(l > 0); + + pa_init_i18n(); + + if (v == (pa_volume_t) -1) { + pa_snprintf(s, l, _("(invalid)")); + return s; + } + + pa_snprintf(s, l, "%3u%%", (v*100)/PA_VOLUME_NORM); + return s; +} + char *pa_sw_cvolume_snprint_dB(char *s, size_t l, const pa_cvolume *c) { unsigned channel; pa_bool_t first = TRUE; @@ -198,10 +213,12 @@ char *pa_sw_cvolume_snprint_dB(char *s, size_t l, const pa_cvolume *c) { *(e = s) = 0; for (channel = 0; channel < c->channels && l > 1; channel++) { + double f = pa_sw_volume_to_dB(c->values[channel]); + l -= pa_snprintf(e, l, "%s%u: %0.2f dB", - first ? "" : " ", - channel, - pa_sw_volume_to_dB(c->values[channel])); + first ? "" : " ", + channel, + isinf(f) < 0 || f <= -USER_DECIBEL_RANGE ? -INFINITY : f); e = strchr(e, 0); first = FALSE; @@ -210,6 +227,26 @@ char *pa_sw_cvolume_snprint_dB(char *s, size_t l, const pa_cvolume *c) { return s; } +char *pa_sw_volume_snprint_dB(char *s, size_t l, pa_volume_t v) { + double f; + + pa_assert(s); + pa_assert(l > 0); + + pa_init_i18n(); + + if (v == (pa_volume_t) -1) { + pa_snprintf(s, l, _("(invalid)")); + return s; + } + + f = pa_sw_volume_to_dB(v); + pa_snprintf(s, l, "%0.2f dB", + isinf(f) < 0 || f <= -USER_DECIBEL_RANGE ? -INFINITY : f); + + return s; +} + /** Return non-zero if the volume of all channels is equal to the specified value */ int pa_cvolume_channels_equal_to(const pa_cvolume *a, pa_volume_t v) { unsigned c; diff --git a/src/pulse/volume.h b/src/pulse/volume.h index 75051af5..5815c906 100644 --- a/src/pulse/volume.h +++ b/src/pulse/volume.h @@ -150,6 +150,26 @@ char *pa_cvolume_snprint(char *s, size_t l, const pa_cvolume *c); /** Pretty print a volume structure but show dB values. \since 0.9.13 */ char *pa_sw_cvolume_snprint_dB(char *s, size_t l, const pa_cvolume *c); +/** Maximum length of the strings returned by + * pa_volume_snprint(). Please note that this value can change with + * any release without warning and without being considered API or ABI + * breakage. You should not use this definition anywhere where it + * might become part of an ABI. \since 0.9.14 */ +#define PA_VOLUME_SNPRINT_MAX 10 + +/** Pretty print a volume \since 0.9.14 */ +char *pa_volume_snprint(char *s, size_t l, pa_volume_t v); + +/** Maximum length of the strings returned by + * pa_volume_snprint_dB(). Please note that this value can change with + * any release without warning and without being considered API or ABI + * breakage. You should not use this definition anywhere where it + * might become part of an ABI. \since 0.9.14 */ +#define PA_SW_VOLUME_SNPRINT_DB_MAX 10 + +/** Pretty print a volume but show dB values. \since 0.9.14 */ +char *pa_sw_volume_snprint_dB(char *s, size_t l, pa_volume_t v); + /** Return the average volume of all channels */ pa_volume_t pa_cvolume_avg(const pa_cvolume *a) PA_GCC_PURE; diff --git a/src/pulsecore/cli-text.c b/src/pulsecore/cli-text.c index 7bbc2660..362a9791 100644 --- a/src/pulsecore/cli-text.c +++ b/src/pulsecore/cli-text.c @@ -115,7 +115,12 @@ char *pa_sink_list_to_string(pa_core *c) { pa_strbuf_printf(s, "%u sink(s) available.\n", pa_idxset_size(c->sinks)); for (sink = pa_idxset_first(c->sinks, &idx); sink; sink = pa_idxset_next(c->sinks, &idx)) { - char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], *t; + char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], + cv[PA_CVOLUME_SNPRINT_MAX], + cvdb[PA_SW_CVOLUME_SNPRINT_DB_MAX], + v[PA_VOLUME_SNPRINT_MAX], + vdb[PA_SW_VOLUME_SNPRINT_DB_MAX], + cm[PA_CHANNEL_MAP_SNPRINT_MAX], *t; pa_usec_t min_latency, max_latency; pa_sink_get_latency_range(sink, &min_latency, &max_latency); @@ -127,7 +132,8 @@ char *pa_sink_list_to_string(pa_core *c) { "\tdriver: <%s>\n" "\tflags: %s%s%s%s%s%s\n" "\tstate: %s\n" - "\tvolume: %s\n" + "\tvolume: %s%s%s\n" + "\tbase volume: %s%s%s\n" "\tmuted: %s\n" "\tcurrent latency: %0.2f ms\n" "\tconfigured latency: %0.2f ms; range is %0.2f .. %0.2f ms\n" @@ -150,6 +156,11 @@ char *pa_sink_list_to_string(pa_core *c) { sink->flags & PA_SINK_LATENCY ? "LATENCY " : "", state_table[pa_sink_get_state(sink)], pa_cvolume_snprint(cv, sizeof(cv), pa_sink_get_volume(sink, FALSE)), + sink->flags & PA_SINK_DECIBEL_VOLUME ? "\n\t " : "", + sink->flags & PA_SINK_DECIBEL_VOLUME ? pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), pa_sink_get_volume(sink, FALSE)) : "", + pa_volume_snprint(v, sizeof(v), sink->base_volume), + sink->flags & PA_SINK_DECIBEL_VOLUME ? "\n\t " : "", + sink->flags & PA_SINK_DECIBEL_VOLUME ? pa_sw_volume_snprint_dB(vdb, sizeof(vdb), sink->base_volume) : "", pa_yes_no(pa_sink_get_mute(sink, FALSE)), (double) pa_sink_get_latency(sink) / (double) PA_USEC_PER_MSEC, (double) pa_sink_get_requested_latency(sink) / (double) PA_USEC_PER_MSEC, @@ -192,7 +203,12 @@ char *pa_source_list_to_string(pa_core *c) { pa_strbuf_printf(s, "%u source(s) available.\n", pa_idxset_size(c->sources)); for (source = pa_idxset_first(c->sources, &idx); source; source = pa_idxset_next(c->sources, &idx)) { - char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], cm[PA_CHANNEL_MAP_SNPRINT_MAX], cv[PA_CVOLUME_SNPRINT_MAX], *t; + char ss[PA_SAMPLE_SPEC_SNPRINT_MAX], + cv[PA_CVOLUME_SNPRINT_MAX], + cvdb[PA_SW_CVOLUME_SNPRINT_DB_MAX], + v[PA_VOLUME_SNPRINT_MAX], + vdb[PA_SW_VOLUME_SNPRINT_DB_MAX], + cm[PA_CHANNEL_MAP_SNPRINT_MAX], *t; pa_usec_t min_latency, max_latency; pa_source_get_latency_range(source, &min_latency, &max_latency); @@ -204,7 +220,8 @@ char *pa_source_list_to_string(pa_core *c) { "\tdriver: <%s>\n" "\tflags: %s%s%s%s%s%s\n" "\tstate: %s\n" - "\tvolume: %s\n" + "\tvolume: %s%s%s\n" + "\tbase volume: %s%s%s\n" "\tmuted: %s\n" "\tcurrent latency: %0.2f ms\n" "\tconfigured latency: %0.2f ms; range is %0.2f .. %0.2f ms\n" @@ -225,6 +242,11 @@ char *pa_source_list_to_string(pa_core *c) { source->flags & PA_SOURCE_LATENCY ? "LATENCY " : "", state_table[pa_source_get_state(source)], pa_cvolume_snprint(cv, sizeof(cv), pa_source_get_volume(source, FALSE)), + source->flags & PA_SOURCE_DECIBEL_VOLUME ? "\n\t " : "", + source->flags & PA_SOURCE_DECIBEL_VOLUME ? pa_sw_cvolume_snprint_dB(cvdb, sizeof(cvdb), pa_source_get_volume(source, FALSE)) : "", + pa_volume_snprint(v, sizeof(v), source->base_volume), + source->flags & PA_SOURCE_DECIBEL_VOLUME ? "\n\t " : "", + source->flags & PA_SOURCE_DECIBEL_VOLUME ? pa_sw_volume_snprint_dB(vdb, sizeof(vdb), source->base_volume) : "", pa_yes_no(pa_source_get_mute(source, FALSE)), (double) pa_source_get_latency(source) / PA_USEC_PER_MSEC, (double) pa_source_get_requested_latency(source) / PA_USEC_PER_MSEC, diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 56e86cb4..fa3e3f8d 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -2677,6 +2677,9 @@ static void sink_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_sin pa_tagstruct_put_proplist(t, sink->proplist); pa_tagstruct_put_usec(t, pa_sink_get_requested_latency(sink)); } + + if (c->version >= 14) + pa_tagstruct_put_volume(t, sink->base_volume); } static void source_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_source *source) { @@ -2708,8 +2711,10 @@ static void source_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_s pa_tagstruct_put_proplist(t, source->proplist); pa_tagstruct_put_usec(t, pa_source_get_requested_latency(source)); } -} + if (c->version >= 14) + pa_tagstruct_put_volume(t, source->base_volume); +} static void client_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_client *client) { pa_assert(t); diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c index 9f0f795c..414c1c81 100644 --- a/src/pulsecore/sample-util.c +++ b/src/pulsecore/sample-util.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> +#include <stdio.h> #include <liboil/liboilfuncs.h> #include <liboil/liboil.h> @@ -987,3 +988,29 @@ size_t pa_usec_to_bytes_round_up(pa_usec_t t, const pa_sample_spec *spec) { return (size_t) u; } + +void pa_memchunk_dump_to_file(pa_memchunk *c, const char *fn) { + FILE *f; + void *p; + + pa_assert(c); + pa_assert(fn); + + /* Only for debugging purposes */ + + f = fopen(fn, "a"); + + if (!f) { + pa_log_warn("Failed to open '%s': %s", fn, pa_cstrerror(errno)); + return; + } + + p = pa_memblock_acquire(c->memblock); + + if (fwrite((uint8_t*) p + c->index, 1, c->length, f) != c->length) + pa_log_warn("Failed to write to '%s': %s", fn, pa_cstrerror(errno)); + + pa_memblock_release(c->memblock); + + fclose(f); +} diff --git a/src/pulsecore/sample-util.h b/src/pulsecore/sample-util.h index 2fe2c81d..36d19e48 100644 --- a/src/pulsecore/sample-util.h +++ b/src/pulsecore/sample-util.h @@ -81,4 +81,6 @@ void pa_sample_clamp(pa_sample_format_t format, void *dst, size_t dstr, const vo pa_usec_t pa_bytes_to_usec_round_up(uint64_t length, const pa_sample_spec *spec); size_t pa_usec_to_bytes_round_up(pa_usec_t t, const pa_sample_spec *spec); +void pa_memchunk_dump_to_file(pa_memchunk *c, const char *fn); + #endif diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c index 1580cf2e..a4d993cd 100644 --- a/src/pulsecore/sink.c +++ b/src/pulsecore/sink.c @@ -191,6 +191,7 @@ pa_sink* pa_sink_new( s->n_corked = 0; s->volume = data->volume; + s->base_volume = PA_VOLUME_NORM; s->muted = data->muted; s->refresh_volume = s->refresh_muted = FALSE; @@ -239,7 +240,7 @@ pa_sink* pa_sink_new( pa_proplist_setf(source_data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Monitor of %s", dn ? dn : s->name); pa_proplist_sets(source_data.proplist, PA_PROP_DEVICE_CLASS, "monitor"); - s->monitor_source = pa_source_new(core, &source_data, 0); + s->monitor_source = pa_source_new(core, &source_data, PA_SOURCE_LATENCY); pa_source_new_data_done(&source_data); @@ -835,6 +836,9 @@ pa_usec_t pa_sink_get_latency(pa_sink *s) { if (!PA_SINK_IS_OPENED(s->state)) return 0; + if (!(s->flags & PA_SINK_LATENCY)) + return 0; + pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL) == 0); return usec; @@ -1161,7 +1165,8 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse size_t sink_nbytes, total_nbytes; /* Get the latency of the sink */ - if (PA_MSGOBJECT(s)->process_msg(PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL) < 0) + if (!(s->flags & PA_SINK_LATENCY) || + PA_MSGOBJECT(s)->process_msg(PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL) < 0) usec = 0; sink_nbytes = pa_usec_to_bytes(usec, &s->sample_spec); @@ -1220,7 +1225,8 @@ int pa_sink_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offse size_t nbytes; /* Get the latency of the sink */ - if (PA_MSGOBJECT(s)->process_msg(PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL) < 0) + if (!(s->flags & PA_SINK_LATENCY) || + PA_MSGOBJECT(s)->process_msg(PA_MSGOBJECT(s), PA_SINK_MESSAGE_GET_LATENCY, &usec, 0, NULL) < 0) usec = 0; nbytes = pa_usec_to_bytes(usec, &s->sample_spec); diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h index c5a73214..254be3b0 100644 --- a/src/pulsecore/sink.h +++ b/src/pulsecore/sink.h @@ -81,6 +81,8 @@ struct pa_sink { pa_cvolume volume; pa_bool_t muted; + pa_volume_t base_volume; /* shall be constant */ + pa_bool_t refresh_volume:1; pa_bool_t refresh_muted:1; diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c index f113e295..815ec271 100644 --- a/src/pulsecore/source.c +++ b/src/pulsecore/source.c @@ -185,6 +185,7 @@ pa_source* pa_source_new( s->volume = data->volume; s->muted = data->muted; s->refresh_volume = s->refresh_muted = FALSE; + s->base_volume = PA_VOLUME_NORM; reset_callbacks(s); s->userdata = NULL; @@ -500,6 +501,9 @@ pa_usec_t pa_source_get_latency(pa_source *s) { if (!PA_SOURCE_IS_OPENED(s->state)) return 0; + if (!(s->flags & PA_SOURCE_LATENCY)) + return 0; + pa_assert_se(pa_asyncmsgq_send(s->asyncmsgq, PA_MSGOBJECT(s), PA_SOURCE_MESSAGE_GET_LATENCY, &usec, 0, NULL) == 0); return usec; diff --git a/src/pulsecore/source.h b/src/pulsecore/source.h index aaf904b4..b93e4ad0 100644 --- a/src/pulsecore/source.h +++ b/src/pulsecore/source.h @@ -84,6 +84,8 @@ struct pa_source { pa_cvolume volume; pa_bool_t muted; + pa_volume_t base_volume; /* shall be constant */ + pa_bool_t refresh_volume:1; pa_bool_t refresh_muted:1; diff --git a/src/pulsecore/tagstruct.c b/src/pulsecore/tagstruct.c index 62a30144..330b7596 100644 --- a/src/pulsecore/tagstruct.c +++ b/src/pulsecore/tagstruct.c @@ -254,6 +254,17 @@ void pa_tagstruct_put_cvolume(pa_tagstruct *t, const pa_cvolume *cvolume) { } } +void pa_tagstruct_put_volume(pa_tagstruct *t, pa_volume_t vol) { + uint32_t u; + pa_assert(t); + + extend(t, 5); + t->data[t->length] = PA_TAG_VOLUME; + u = htonl((uint32_t) vol); + memcpy(t->data+t->length+1, &u, 4); + t->length += 5; +} + void pa_tagstruct_put_proplist(pa_tagstruct *t, pa_proplist *p) { void *state = NULL; pa_assert(t); @@ -555,6 +566,25 @@ int pa_tagstruct_get_cvolume(pa_tagstruct *t, pa_cvolume *cvolume) { return 0; } +int pa_tagstruct_get_volume(pa_tagstruct*t, pa_volume_t *vol) { + uint32_t u; + + pa_assert(t); + pa_assert(vol); + + if (t->rindex+5 > t->length) + return -1; + + if (t->data[t->rindex] != PA_TAG_VOLUME) + return -1; + + memcpy(&u, t->data+t->rindex+1, 4); + *vol = (pa_volume_t) ntohl(u); + + t->rindex += 5; + return 0; +} + int pa_tagstruct_get_proplist(pa_tagstruct *t, pa_proplist *p) { size_t saved_rindex; @@ -663,6 +693,10 @@ void pa_tagstruct_put(pa_tagstruct *t, ...) { pa_tagstruct_put_cvolume(t, va_arg(va, pa_cvolume *)); break; + case PA_TAG_VOLUME: + pa_tagstruct_put_volume(t, va_arg(va, pa_volume_t)); + break; + case PA_TAG_PROPLIST: pa_tagstruct_put_proplist(t, va_arg(va, pa_proplist *)); break; @@ -738,6 +772,10 @@ int pa_tagstruct_get(pa_tagstruct *t, ...) { ret = pa_tagstruct_get_cvolume(t, va_arg(va, pa_cvolume *)); break; + case PA_TAG_VOLUME: + ret = pa_tagstruct_get_volume(t, va_arg(va, pa_volume_t *)); + break; + case PA_TAG_PROPLIST: ret = pa_tagstruct_get_proplist(t, va_arg(va, pa_proplist *)); break; diff --git a/src/pulsecore/tagstruct.h b/src/pulsecore/tagstruct.h index e7d07054..19288eeb 100644 --- a/src/pulsecore/tagstruct.h +++ b/src/pulsecore/tagstruct.h @@ -54,7 +54,8 @@ enum { PA_TAG_USEC = 'U' /* 64bit unsigned */, PA_TAG_CHANNEL_MAP = 'm', PA_TAG_CVOLUME = 'v', - PA_TAG_PROPLIST = 'P' + PA_TAG_PROPLIST = 'P', + PA_TAG_VOLUME = 'V' }; pa_tagstruct *pa_tagstruct_new(const uint8_t* data, size_t length); @@ -79,6 +80,7 @@ void pa_tagstruct_put_usec(pa_tagstruct*t, pa_usec_t u); void pa_tagstruct_put_channel_map(pa_tagstruct *t, const pa_channel_map *map); void pa_tagstruct_put_cvolume(pa_tagstruct *t, const pa_cvolume *cvolume); void pa_tagstruct_put_proplist(pa_tagstruct *t, pa_proplist *p); +void pa_tagstruct_put_volume(pa_tagstruct *t, pa_volume_t volume); int pa_tagstruct_get(pa_tagstruct *t, ...); @@ -95,6 +97,6 @@ int pa_tagstruct_get_usec(pa_tagstruct*t, pa_usec_t *u); int pa_tagstruct_get_channel_map(pa_tagstruct *t, pa_channel_map *map); int pa_tagstruct_get_cvolume(pa_tagstruct *t, pa_cvolume *v); int pa_tagstruct_get_proplist(pa_tagstruct *t, pa_proplist *p); - +int pa_tagstruct_get_volume(pa_tagstruct *t, pa_volume_t *v); #endif |