From patchwork Sat Mar 11 12:08:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Volker_R=C3=BCmelin?= X-Patchwork-Id: 13170809 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4B520C61DA4 for ; Sat, 11 Mar 2023 12:09:37 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pay1d-0002g3-Kr; Sat, 11 Mar 2023 07:08:37 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pay1b-0002fi-BW for qemu-devel@nongnu.org; Sat, 11 Mar 2023 07:08:35 -0500 Received: from mailout10.t-online.de ([194.25.134.21]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pay1Z-0007Wy-45 for qemu-devel@nongnu.org; Sat, 11 Mar 2023 07:08:35 -0500 Received: from fwd84.dcpf.telekom.de (fwd84.aul.t-online.de [10.223.144.110]) by mailout10.t-online.de (Postfix) with SMTP id 578B91527A; Sat, 11 Mar 2023 13:08:29 +0100 (CET) Received: from linpower.localnet ([79.208.22.72]) by fwd84.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1pay1S-0wFtOj0; Sat, 11 Mar 2023 13:08:26 +0100 Received: by linpower.localnet (Postfix, from userid 1000) id 1A582200474; Sat, 11 Mar 2023 13:08:26 +0100 (CET) From: =?utf-8?q?Volker_R=C3=BCmelin?= To: Dorinda Bassey , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , Gerd Hoffmann Cc: Markus Armbruster , Christian Schoenebeck , Paolo Bonzini , wtaymans@redhat.com, qemu-devel@nongnu.org Subject: [PATCH] DO-NOT-MERGE: pipewire sample code Date: Sat, 11 Mar 2023 13:08:26 +0100 Message-Id: <20230311120826.5584-1-vr_qemu@t-online.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1678536506-519B8A0B-02E9087F/0/0 CLEAN NORMAL X-TOI-MSGID: 1341f7e4-c7b1-48c9-b114-bb7cabd8ee0e Received-SPF: none client-ip=194.25.134.21; envelope-from=volker.ruemelin@t-online.de; helo=mailout10.t-online.de X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Based-on: <20230306171020.381116-1-dbassey@redhat.com> ([PATCH v7] audio/pwaudio.c: Add Pipewire audio backend for QEMU) This is sample code for the review of the pipewire backed. The code actually works. An email with explanations for the changes will follow. Signed-off-by: Volker Rümelin --- audio/pwaudio.c | 67 +++++++++++++++++++++++++++++++++---------------- qapi/audio.json | 10 +++----- 2 files changed, 49 insertions(+), 28 deletions(-) diff --git a/audio/pwaudio.c b/audio/pwaudio.c index d357761152..8e2a38938f 100644 --- a/audio/pwaudio.c +++ b/audio/pwaudio.c @@ -23,7 +23,6 @@ #define AUDIO_CAP "pipewire" #define RINGBUFFER_SIZE (1u << 22) #define RINGBUFFER_MASK (RINGBUFFER_SIZE - 1) -#define BUFFER_SAMPLES 512 #include "audio_int.h" @@ -48,6 +47,7 @@ typedef struct PWVoice { struct pw_stream *stream; struct spa_hook stream_listener; struct spa_audio_info_raw info; + uint32_t highwater_mark; uint32_t frame_size; struct spa_ringbuffer ring; uint8_t buffer[RINGBUFFER_SIZE]; @@ -82,7 +82,7 @@ playback_on_process(void *data) void *p; struct pw_buffer *b; struct spa_buffer *buf; - uint32_t n_frames, req, index, n_bytes; + uint32_t req, index, n_bytes; int32_t avail; if (!v->stream) { @@ -105,8 +105,7 @@ playback_on_process(void *data) if (req == 0) { req = 4096 * v->frame_size; } - n_frames = SPA_MIN(req, buf->datas[0].maxsize); - n_bytes = n_frames * v->frame_size; + n_bytes = SPA_MIN(req, buf->datas[0].maxsize); /* get no of available bytes to read data from buffer */ @@ -270,6 +269,30 @@ done_unlock: return l; } +static size_t qpw_buffer_get_free(HWVoiceOut *hw) +{ + PWVoiceOut *pw = (PWVoiceOut *)hw; + PWVoice *v = &pw->v; + pwaudio *c = v->g; + const char *error = NULL; + int32_t filled, avail; + uint32_t index; + + pw_thread_loop_lock(c->thread_loop); + if (pw_stream_get_state(v->stream, &error) != PW_STREAM_STATE_STREAMING) { + /* wait for stream to become ready */ + avail = 0; + goto done_unlock; + } + + filled = spa_ringbuffer_get_write_index(&v->ring, &index); + avail = v->highwater_mark - filled; + +done_unlock: + pw_thread_loop_unlock(c->thread_loop); + return avail; +} + static size_t qpw_write(HWVoiceOut *hw, void *data, size_t len) { @@ -277,20 +300,18 @@ qpw_write(HWVoiceOut *hw, void *data, size_t len) PWVoice *v = &pw->v; pwaudio *c = v->g; const char *error = NULL; - const int periods = 3; - size_t l; int32_t filled, avail; uint32_t index; pw_thread_loop_lock(c->thread_loop); if (pw_stream_get_state(v->stream, &error) != PW_STREAM_STATE_STREAMING) { /* wait for stream to become ready */ - l = 0; + len = 0; goto done_unlock; } - filled = spa_ringbuffer_get_write_index(&v->ring, &index); - avail = BUFFER_SAMPLES * v->frame_size * periods - filled; + filled = spa_ringbuffer_get_write_index(&v->ring, &index); + avail = v->highwater_mark - filled; trace_pw_write(filled, avail, index, len); @@ -312,11 +333,10 @@ qpw_write(HWVoiceOut *hw, void *data, size_t len) index & RINGBUFFER_MASK, data, len); index += len; spa_ringbuffer_write_update(&v->ring, index); - l = len; done_unlock: pw_thread_loop_unlock(c->thread_loop); - return l; + return len; } static int @@ -420,8 +440,13 @@ create_stream(pwaudio *c, PWVoice *v, const char *name) const struct spa_pod *params[2]; uint8_t buffer[1024]; struct spa_pod_builder b; + struct pw_properties *props; - v->stream = pw_stream_new(c->core, name, NULL); + props = pw_properties_new(NULL, NULL); + pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%" PRIu64 "/%u", + (uint64_t)v->g->dev->timer_period * v->info.rate + * 3 / 4 / 1000000, v->info.rate); + v->stream = pw_stream_new(c->core, name, props); if (v->stream == NULL) { goto error; @@ -563,7 +588,11 @@ qpw_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque) audio_pcm_init_info(&hw->info, &obt_as); /* report the buffer size to qemu */ - hw->samples = BUFFER_SAMPLES; + hw->samples = audio_buffer_frames( + qapi_AudiodevPipewirePerDirectionOptions_base(ppdo), &obt_as, 46440); + v->highwater_mark = MIN(RINGBUFFER_SIZE, + (ppdo->has_latency ? ppdo->latency : 46440) + * (uint64_t)v->info.rate / 1000000 * v->frame_size); pw_thread_loop_unlock(c->thread_loop); return 0; @@ -606,7 +635,8 @@ qpw_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) audio_pcm_init_info(&hw->info, &obt_as); /* report the buffer size to qemu */ - hw->samples = BUFFER_SAMPLES; + hw->samples = audio_buffer_frames( + qapi_AudiodevPipewirePerDirectionOptions_base(ppdo), &obt_as, 46440); pw_thread_loop_unlock(c->thread_loop); return 0; @@ -695,15 +725,8 @@ qpw_audio_init(Audiodev *dev) pw = g_new0(pwaudio, 1); pw_init(NULL, NULL); - AudiodevPipewireOptions *popts; trace_pw_audio_init("Initialize Pipewire context\n"); assert(dev->driver == AUDIODEV_DRIVER_PIPEWIRE); - popts = &dev->u.pipewire; - - if (!popts->has_latency) { - popts->has_latency = true; - popts->latency = 15000; - } pw->dev = dev; pw->thread_loop = pw_thread_loop_new("Pipewire thread loop", NULL); @@ -781,7 +804,7 @@ static struct audio_pcm_ops qpw_pcm_ops = { .init_out = qpw_init_out, .fini_out = qpw_fini_out, .write = qpw_write, - .buffer_get_free = audio_generic_buffer_get_free, + .buffer_get_free = qpw_buffer_get_free, .run_buffer_out = audio_generic_run_buffer_out, .enable_out = qpw_enable_out, diff --git a/qapi/audio.json b/qapi/audio.json index 9a0d7d9ece..d49a8a670b 100644 --- a/qapi/audio.json +++ b/qapi/audio.json @@ -337,6 +337,7 @@ # create multiple Pipewire devices or run multiple qemu # instances (default: audiodev's id, since 7.1) # +# @latency: Pipewire backend buffer size in microseconds (default 46440) # # Since: 8.0 ## @@ -344,7 +345,8 @@ 'base': 'AudiodevPerDirectionOptions', 'data': { '*name': 'str', - '*stream-name': 'str' } } + '*stream-name': 'str', + '*latency': 'uint32' } } ## # @AudiodevPipewireOptions: @@ -355,16 +357,12 @@ # # @out: options of the playback stream # -# @latency: add latency to playback in microseconds -# (default 15000) -# # Since: 8.0 ## { 'struct': 'AudiodevPipewireOptions', 'data': { '*in': 'AudiodevPipewirePerDirectionOptions', - '*out': 'AudiodevPipewirePerDirectionOptions', - '*latency': 'uint32' } } + '*out': 'AudiodevPipewirePerDirectionOptions' } } ## # @AudiodevSdlPerDirectionOptions: