From patchwork Tue Mar 13 15:20:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 146439 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 9B959B6EEC for ; Wed, 14 Mar 2012 03:13:44 +1100 (EST) Received: from localhost ([::1]:41607 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7TYf-0003nV-Ac for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2012 11:22:41 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37858) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7TY4-0002SJ-LH for qemu-devel@nongnu.org; Tue, 13 Mar 2012 11:22:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7TXi-0003HF-DU for qemu-devel@nongnu.org; Tue, 13 Mar 2012 11:22:04 -0400 Received: from mail-ey0-f173.google.com ([209.85.215.173]:37138) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7TXi-00038q-1U for qemu-devel@nongnu.org; Tue, 13 Mar 2012 11:21:42 -0400 Received: by mail-ey0-f173.google.com with SMTP id f11so352200eaa.4 for ; Tue, 13 Mar 2012 08:21:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=+KCCoQCmpSCsZEC9Ejdwj6nR6MdDCE43UArhoENnU60=; b=IYAaFlBQfvMnjwBo+O6EQxIX4iNzkMyCUgmVeCIemq1PsYs7p+6tvDsqW8uhhgfpBf F4i0dE/iB2mHdmJlDE+3tTP7f6vQgDR5pnMgM9AiIuH6+gI1LtpuEbBO3svz4Mtffmd4 +XHil7f939Gp1lpSKdeZv2UiYjmhGXcr2vzND1+lyd4yR8u6KuG9itaiZXa5iETdIVVC K59FHbdbnzeE3WFqbRYAWy6qmtXUS9SJesDbcfntYfZJ2juDC8B6bCCFj1G9A3TqcBog hIblTdqzmcILn8vVVsJl4ZGpnk804YJYqTZnXTOmpbIQFY42Zwm8Ihhh0cNoCHQfGOL+ 2CNA== Received: by 10.14.95.135 with SMTP id p7mr2491454eef.62.1331652101158; Tue, 13 Mar 2012 08:21:41 -0700 (PDT) Received: from localhost (254.pool85-58-48.dynamic.orange.es. [85.58.48.254]) by mx.google.com with ESMTPS id v15sm3006909eem.1.2012.03.13.08.21.37 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Mar 2012 08:21:40 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2012 16:20:55 +0100 Message-Id: <1331652059-10090-8-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1331652059-10090-1-git-send-email-marcandre.lureau@redhat.com> References: <1331652059-10090-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.215.173 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , dnb@redhat.com, dlaor@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH v4 07/11] Do not use pa_simple PulseAudio API X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Unfortunately, pa_simple is a limited API which doesn't let us retrieve the associated pa_stream. It is needed to control the volume of the stream. In v4: - add missing braces Signed-off-by: Marc-André Lureau --- audio/paaudio.c | 377 +++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 339 insertions(+), 38 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index d1f3912..6f50c1c 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -2,8 +2,7 @@ #include "qemu-common.h" #include "audio.h" -#include -#include +#include #define AUDIO_CAP "pulseaudio" #include "audio_int.h" @@ -15,7 +14,7 @@ typedef struct { int live; int decr; int rpos; - pa_simple *s; + pa_stream *stream; void *pcm_buf; struct audio_pt pt; } PAVoiceOut; @@ -26,17 +25,23 @@ typedef struct { int dead; int incr; int wpos; - pa_simple *s; + pa_stream *stream; void *pcm_buf; struct audio_pt pt; + const void *read_data; + size_t read_index, read_length; } PAVoiceIn; -static struct { +typedef struct { int samples; char *server; char *sink; char *source; -} conf = { + pa_threaded_mainloop *mainloop; + pa_context *context; +} paaudio; + +static paaudio glob_paaudio = { .samples = 4096, }; @@ -51,6 +56,126 @@ static void GCC_FMT_ATTR (2, 3) qpa_logerr (int err, const char *fmt, ...) AUD_log (AUDIO_CAP, "Reason: %s\n", pa_strerror (err)); } +#define CHECK_SUCCESS_GOTO(c, rerror, expression, label) \ + do { \ + if (!(expression)) { \ + if (rerror) { \ + *(rerror) = pa_context_errno ((c)->context); \ + } \ + goto label; \ + } \ + } while (0); + +#define CHECK_DEAD_GOTO(c, stream, rerror, label) \ + do { \ + if (!(c)->context || !PA_CONTEXT_IS_GOOD (pa_context_get_state((c)->context)) || \ + !(stream) || !PA_STREAM_IS_GOOD (pa_stream_get_state ((stream)))) { \ + if (((c)->context && pa_context_get_state ((c)->context) == PA_CONTEXT_FAILED) || \ + ((stream) && pa_stream_get_state ((stream)) == PA_STREAM_FAILED)) { \ + if (rerror) { \ + *(rerror) = pa_context_errno ((c)->context); \ + } \ + } else { \ + if (rerror) { \ + *(rerror) = PA_ERR_BADSTATE; \ + } \ + } \ + goto label; \ + } \ + } while (0); + +static int qpa_simple_read (PAVoiceIn *p, void *data, size_t length, int *rerror) +{ + paaudio *g = &glob_paaudio; + + pa_threaded_mainloop_lock (g->mainloop); + + CHECK_DEAD_GOTO (g, p->stream, rerror, unlock_and_fail); + + while (length > 0) { + size_t l; + + while (!p->read_data) { + int r; + + r = pa_stream_peek (p->stream, &p->read_data, &p->read_length); + CHECK_SUCCESS_GOTO (g, rerror, r == 0, unlock_and_fail); + + if (!p->read_data) { + pa_threaded_mainloop_wait (g->mainloop); + CHECK_DEAD_GOTO (g, p->stream, rerror, unlock_and_fail); + } else { + p->read_index = 0; + } + } + + l = p->read_length < length ? p->read_length : length; + memcpy (data, (const uint8_t *) p->read_data+p->read_index, l); + + data = (uint8_t *) data + l; + length -= l; + + p->read_index += l; + p->read_length -= l; + + if (!p->read_length) { + int r; + + r = pa_stream_drop (p->stream); + p->read_data = NULL; + p->read_length = 0; + p->read_index = 0; + + CHECK_SUCCESS_GOTO (g, rerror, r == 0, unlock_and_fail); + } + } + + pa_threaded_mainloop_unlock (g->mainloop); + return 0; + +unlock_and_fail: + pa_threaded_mainloop_unlock (g->mainloop); + return -1; +} + +static int qpa_simple_write (PAVoiceOut *p, const void *data, size_t length, int *rerror) +{ + paaudio *g = &glob_paaudio; + + pa_threaded_mainloop_lock (g->mainloop); + + CHECK_DEAD_GOTO (g, p->stream, rerror, unlock_and_fail); + + while (length > 0) { + size_t l; + int r; + + while (!(l = pa_stream_writable_size (p->stream))) { + pa_threaded_mainloop_wait (g->mainloop); + CHECK_DEAD_GOTO (g, p->stream, rerror, unlock_and_fail); + } + + CHECK_SUCCESS_GOTO (g, rerror, l != (size_t) -1, unlock_and_fail); + + if (l > length) { + l = length; + } + + r = pa_stream_write (p->stream, data, l, NULL, 0LL, PA_SEEK_RELATIVE); + CHECK_SUCCESS_GOTO (g, rerror, r >= 0, unlock_and_fail); + + data = (const uint8_t *) data + l; + length -= l; + } + + pa_threaded_mainloop_unlock (g->mainloop); + return 0; + +unlock_and_fail: + pa_threaded_mainloop_unlock (g->mainloop); + return -1; +} + static void *qpa_thread_out (void *arg) { PAVoiceOut *pa = arg; @@ -77,7 +202,7 @@ static void *qpa_thread_out (void *arg) } } - decr = to_mix = audio_MIN (pa->live, conf.samples >> 2); + decr = to_mix = audio_MIN (pa->live, glob_paaudio.samples >> 2); rpos = pa->rpos; if (audio_pt_unlock (&pa->pt, AUDIO_FUNC)) { @@ -91,8 +216,8 @@ static void *qpa_thread_out (void *arg) hw->clip (pa->pcm_buf, src, chunk); - if (pa_simple_write (pa->s, pa->pcm_buf, - chunk << hw->info.shift, &error) < 0) { + if (qpa_simple_write (pa, pa->pcm_buf, + chunk << hw->info.shift, &error) < 0) { qpa_logerr (error, "pa_simple_write failed\n"); return NULL; } @@ -169,7 +294,7 @@ static void *qpa_thread_in (void *arg) } } - incr = to_grab = audio_MIN (pa->dead, conf.samples >> 2); + incr = to_grab = audio_MIN (pa->dead, glob_paaudio.samples >> 2); wpos = pa->wpos; if (audio_pt_unlock (&pa->pt, AUDIO_FUNC)) { @@ -181,8 +306,8 @@ static void *qpa_thread_in (void *arg) int chunk = audio_MIN (to_grab, hw->samples - wpos); void *buf = advance (pa->pcm_buf, wpos); - if (pa_simple_read (pa->s, buf, - chunk << hw->info.shift, &error) < 0) { + if (qpa_simple_read (pa, buf, + chunk << hw->info.shift, &error) < 0) { qpa_logerr (error, "pa_simple_read failed\n"); return NULL; } @@ -283,6 +408,109 @@ static audfmt_e pa_to_audfmt (pa_sample_format_t fmt, int *endianness) } } +static void context_state_cb (pa_context *c, void *userdata) +{ + paaudio *g = &glob_paaudio; + + switch (pa_context_get_state(c)) { + case PA_CONTEXT_READY: + case PA_CONTEXT_TERMINATED: + case PA_CONTEXT_FAILED: + pa_threaded_mainloop_signal (g->mainloop, 0); + break; + + case PA_CONTEXT_UNCONNECTED: + case PA_CONTEXT_CONNECTING: + case PA_CONTEXT_AUTHORIZING: + case PA_CONTEXT_SETTING_NAME: + break; + } +} + +static void stream_state_cb (pa_stream *s, void * userdata) +{ + paaudio *g = &glob_paaudio; + + switch (pa_stream_get_state (s)) { + + case PA_STREAM_READY: + case PA_STREAM_FAILED: + case PA_STREAM_TERMINATED: + pa_threaded_mainloop_signal (g->mainloop, 0); + break; + + case PA_STREAM_UNCONNECTED: + case PA_STREAM_CREATING: + break; + } +} + +static void stream_request_cb (pa_stream *s, size_t length, void *userdata) +{ + paaudio *g = &glob_paaudio; + + pa_threaded_mainloop_signal (g->mainloop, 0); +} + +static pa_stream *qpa_simple_new ( + const char *server, + const char *name, + pa_stream_direction_t dir, + const char *dev, + const char *stream_name, + const pa_sample_spec *ss, + const pa_channel_map *map, + const pa_buffer_attr *attr, + int *rerror) +{ + paaudio *g = &glob_paaudio; + int r; + pa_stream *stream; + + pa_threaded_mainloop_lock (g->mainloop); + + stream = pa_stream_new (g->context, name, ss, map); + if (!stream) { + goto fail; + } + + pa_stream_set_state_callback (stream, stream_state_cb, g); + pa_stream_set_read_callback (stream, stream_request_cb, g); + pa_stream_set_write_callback (stream, stream_request_cb, g); + + if (dir == PA_STREAM_PLAYBACK) { + r = pa_stream_connect_playback (stream, dev, attr, + PA_STREAM_INTERPOLATE_TIMING + |PA_STREAM_ADJUST_LATENCY + |PA_STREAM_AUTO_TIMING_UPDATE, NULL, NULL); + } else { + r = pa_stream_connect_record (stream, dev, attr, + PA_STREAM_INTERPOLATE_TIMING + |PA_STREAM_ADJUST_LATENCY + |PA_STREAM_AUTO_TIMING_UPDATE); + } + + if (r < 0) { + goto fail; + } + + pa_threaded_mainloop_unlock (g->mainloop); + + return stream; + +fail: + pa_threaded_mainloop_unlock (g->mainloop); + + if (stream) { + pa_stream_unref (stream); + } + + qpa_logerr (pa_context_errno (g->context), + "stream_new() failed\n"); + + return NULL; +} + static int qpa_init_out (HWVoiceOut *hw, struct audsettings *as) { int error; @@ -306,24 +534,24 @@ static int qpa_init_out (HWVoiceOut *hw, struct audsettings *as) obt_as.fmt = pa_to_audfmt (ss.format, &obt_as.endianness); - pa->s = pa_simple_new ( - conf.server, + pa->stream = qpa_simple_new ( + glob_paaudio.server, "qemu", PA_STREAM_PLAYBACK, - conf.sink, + glob_paaudio.sink, "pcm.playback", &ss, NULL, /* channel map */ &ba, /* buffering attributes */ &error ); - if (!pa->s) { + if (!pa->stream) { qpa_logerr (error, "pa_simple_new for playback failed\n"); goto fail1; } audio_pcm_init_info (&hw->info, &obt_as); - hw->samples = conf.samples; + hw->samples = glob_paaudio.samples; pa->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift); pa->rpos = hw->rpos; if (!pa->pcm_buf) { @@ -342,8 +570,10 @@ static int qpa_init_out (HWVoiceOut *hw, struct audsettings *as) g_free (pa->pcm_buf); pa->pcm_buf = NULL; fail2: - pa_simple_free (pa->s); - pa->s = NULL; + if (pa->stream) { + pa_stream_unref (pa->stream); + pa->stream = NULL; + } fail1: return -1; } @@ -361,24 +591,24 @@ static int qpa_init_in (HWVoiceIn *hw, struct audsettings *as) obt_as.fmt = pa_to_audfmt (ss.format, &obt_as.endianness); - pa->s = pa_simple_new ( - conf.server, + pa->stream = qpa_simple_new ( + glob_paaudio.server, "qemu", PA_STREAM_RECORD, - conf.source, + glob_paaudio.source, "pcm.capture", &ss, NULL, /* channel map */ NULL, /* buffering attributes */ &error ); - if (!pa->s) { + if (!pa->stream) { qpa_logerr (error, "pa_simple_new for capture failed\n"); goto fail1; } audio_pcm_init_info (&hw->info, &obt_as); - hw->samples = conf.samples; + hw->samples = glob_paaudio.samples; pa->pcm_buf = audio_calloc (AUDIO_FUNC, hw->samples, 1 << hw->info.shift); pa->wpos = hw->wpos; if (!pa->pcm_buf) { @@ -397,8 +627,10 @@ static int qpa_init_in (HWVoiceIn *hw, struct audsettings *as) g_free (pa->pcm_buf); pa->pcm_buf = NULL; fail2: - pa_simple_free (pa->s); - pa->s = NULL; + if (pa->stream) { + pa_stream_unref (pa->stream); + pa->stream = NULL; + } fail1: return -1; } @@ -413,9 +645,9 @@ static void qpa_fini_out (HWVoiceOut *hw) audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC); audio_pt_join (&pa->pt, &ret, AUDIO_FUNC); - if (pa->s) { - pa_simple_free (pa->s); - pa->s = NULL; + if (pa->stream) { + pa_stream_unref (pa->stream); + pa->stream = NULL; } audio_pt_fini (&pa->pt, AUDIO_FUNC); @@ -433,9 +665,9 @@ static void qpa_fini_in (HWVoiceIn *hw) audio_pt_unlock_and_signal (&pa->pt, AUDIO_FUNC); audio_pt_join (&pa->pt, &ret, AUDIO_FUNC); - if (pa->s) { - pa_simple_free (pa->s); - pa->s = NULL; + if (pa->stream) { + pa_stream_unref (pa->stream); + pa->stream = NULL; } audio_pt_fini (&pa->pt, AUDIO_FUNC); @@ -460,37 +692,106 @@ static int qpa_ctl_in (HWVoiceIn *hw, int cmd, ...) /* common */ static void *qpa_audio_init (void) { - return &conf; + paaudio *g = &glob_paaudio; + + g->mainloop = pa_threaded_mainloop_new (); + if (!g->mainloop) { + goto fail; + } + + g->context = pa_context_new (pa_threaded_mainloop_get_api (g->mainloop), glob_paaudio.server); + if (!g->context) { + goto fail; + } + + pa_context_set_state_callback (g->context, context_state_cb, g); + + if (pa_context_connect (g->context, glob_paaudio.server, 0, NULL) < 0) { + qpa_logerr (pa_context_errno (g->context), + "pa_context_connect() failed\n"); + goto fail; + } + + pa_threaded_mainloop_lock (g->mainloop); + + if (pa_threaded_mainloop_start (g->mainloop) < 0) { + goto unlock_and_fail; + } + + for (;;) { + pa_context_state_t state; + + state = pa_context_get_state (g->context); + + if (state == PA_CONTEXT_READY) { + break; + } + + if (!PA_CONTEXT_IS_GOOD (state)) { + qpa_logerr (pa_context_errno (g->context), + "Wrong context state\n"); + goto unlock_and_fail; + } + + /* Wait until the context is ready */ + pa_threaded_mainloop_wait (g->mainloop); + } + + pa_threaded_mainloop_unlock (g->mainloop); + + return &glob_paaudio; + +unlock_and_fail: + pa_threaded_mainloop_unlock (g->mainloop); +fail: + AUD_log (AUDIO_CAP, "Failed to initialize PA context"); + return NULL; } static void qpa_audio_fini (void *opaque) { - (void) opaque; + paaudio *g = opaque; + + if (g->mainloop) { + pa_threaded_mainloop_stop (g->mainloop); + } + + if (g->context) { + pa_context_disconnect (g->context); + pa_context_unref (g->context); + g->context = NULL; + } + + if (g->mainloop) { + pa_threaded_mainloop_free (g->mainloop); + } + + g->mainloop = NULL; } struct audio_option qpa_options[] = { { .name = "SAMPLES", .tag = AUD_OPT_INT, - .valp = &conf.samples, + .valp = &glob_paaudio.samples, .descr = "buffer size in samples" }, { .name = "SERVER", .tag = AUD_OPT_STR, - .valp = &conf.server, + .valp = &glob_paaudio.server, .descr = "server address" }, { .name = "SINK", .tag = AUD_OPT_STR, - .valp = &conf.sink, + .valp = &glob_paaudio.sink, .descr = "sink device name" }, { .name = "SOURCE", .tag = AUD_OPT_STR, - .valp = &conf.source, + .valp = &glob_paaudio.source, .descr = "source device name" }, { /* End of list */ }