From patchwork Sun Dec 23 20:51:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 10741899 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C88B96C2 for ; Sun, 23 Dec 2018 21:37:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B5B732877F for ; Sun, 23 Dec 2018 21:37:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A788628793; Sun, 23 Dec 2018 21:37:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.7 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1BAA22877F for ; Sun, 23 Dec 2018 21:37:06 +0000 (UTC) Received: from localhost ([127.0.0.1]:60078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbBQn-0001Po-Cn for patchwork-qemu-devel@patchwork.kernel.org; Sun, 23 Dec 2018 16:37:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbAju-0007ch-A8 for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbAjs-00028M-DX for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:46 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43039) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbAjs-00025J-5I for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:44 -0500 Received: by mail-wr1-x444.google.com with SMTP id r10so10087896wrs.10 for ; Sun, 23 Dec 2018 12:52:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M7msQeFIeK8RPDjcHTtd5tP//OSPSScp7Hf0dkBVVdg=; b=KzLdZA/3G3zEAZQNhrNmyApB6U2fBzvZMMigoArEB/ysisYAzfB+oq6uZrkchByEL/ LI4yauIEliqezN/rbTM5qk8+j58EIufpS02fo/OYsALgwGUMW05t0/pivML0z2YcgTh9 rS3EB4wqz7Zw9ubZmUYPiyCA+68fqR8Qlbgun8NxXBqfZ3GHruuTacVWzeDKjYYh1BcT 3UPbkxA2rz9EymFbhWJtAtMTGhCjS8JUJnn9DY1CVanwZaQIBoTU+NKtWKCLFXy8ylS8 KLY/abezlxrh9sUw/vk7FbLbHjY/vDZayqgS09EM7UNjso0wsnArWExKLSk9siIvyKe8 scSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M7msQeFIeK8RPDjcHTtd5tP//OSPSScp7Hf0dkBVVdg=; b=lcTOV3nt7c0OzIVL0AWfuSKttaB5bE07KB0IW1sPXdQINWoYGNaMj+rNO7I4lP7wUR 8i4o9x+mUHAi3GI/kFYy9FOMQcWD5JLrYqs/bYwqYUsmCBTqzNjn0kUdObICLho205mK +aDJDiWeb/E5q9VL0LG0R5pUfzOpWpgceheW9dkJ6Vhqu0NeamrHts+wD0Sb8forUcRS QxF9wNnCKMpvvNE/FsZyIlItOh0T4L6nrGULlh8jHfu8UQqYK98g6aki7an6LUBbk/xN r4uj0yHn0t9B5FmfYWNgJVzP3mxUqZzN+x6vD1i3Hrf6BRyjdPhsWSACJDFenK3jopn/ Karw== X-Gm-Message-State: AJcUukdykQHQ3JKecaahBZOlWYTBu7l4ZQJOwFb8OIwBfj0jyozlxC7I OgYuPAv0ZK+21ejqY1aQ4BbCj7rwzqM= X-Google-Smtp-Source: ALg8bN5eUVS2SDnE8Q78oIGSqaNWx++5uIc64R4nyaWsau/T5kpY7vfhV7HrlqaLpWvIJhGYkt98Ig== X-Received: by 2002:a5d:454f:: with SMTP id p15mr10183387wrr.39.1545598362913; Sun, 23 Dec 2018 12:52:42 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-24a3-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:24a3::5]) by smtp.gmail.com with ESMTPSA id g198sm25456920wmd.23.2018.12.23.12.52.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 12:52:42 -0800 (PST) From: " =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= " X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Sun, 23 Dec 2018 21:51:51 +0100 Message-Id: <801e931cea3505400b3262dc2d170e2ce6dde2fc.1545598229.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v2 15/52] wavaudio: port to -audiodev config X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Kővágó, Zoltán --- audio/audio_legacy.c | 10 ++++++++ audio/wavaudio.c | 58 +++++++------------------------------------- 2 files changed, 19 insertions(+), 49 deletions(-) diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c index 6d95b761b8..71bbda04e2 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -110,6 +110,14 @@ SimpleEnvMap sdl_map[] = { { /* End of list */ } }; +SimpleEnvMap wav_map[] = { + { "QEMU_WAV_FREQUENCY", "out.frequency" }, + { "QEMU_WAV_FORMAT", "out.format", ENV_TRANSFORM_FMT }, + { "QEMU_WAV_DAC_FIXED_CHANNELS", "out.channels" }, + { "QEMU_WAV_PATH", "path" }, + { /* End of list */ } +}; + static unsigned long long toull(const char *str) { unsigned long long ret; @@ -290,6 +298,8 @@ static void legacy_opt(const char *drv) handle_env_opts(opts, pa_map); } else if (strcmp(drv, "sdl") == 0) { handle_env_opts(opts, sdl_map); + } else if (strcmp(drv, "wav") == 0) { + handle_env_opts(opts, wav_map); } } diff --git a/audio/wavaudio.c b/audio/wavaudio.c index 9eff3555b3..214e30ccd9 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -24,6 +24,7 @@ #include "qemu/osdep.h" #include "qemu/host-utils.h" #include "qemu/timer.h" +#include "qapi/opts-visitor.h" #include "audio.h" #define AUDIO_CAP "wav" @@ -37,11 +38,6 @@ typedef struct WAVVoiceOut { int total_samples; } WAVVoiceOut; -typedef struct { - struct audsettings settings; - const char *wav_path; -} WAVConf; - static int wav_run_out (HWVoiceOut *hw, int live) { WAVVoiceOut *wav = (WAVVoiceOut *) hw; @@ -112,8 +108,10 @@ static int wav_init_out(HWVoiceOut *hw, struct audsettings *as, 0x02, 0x00, 0x44, 0xac, 0x00, 0x00, 0x10, 0xb1, 0x02, 0x00, 0x04, 0x00, 0x10, 0x00, 0x64, 0x61, 0x74, 0x61, 0x00, 0x00, 0x00, 0x00 }; - WAVConf *conf = drv_opaque; - struct audsettings wav_as = conf->settings; + Audiodev *dev = drv_opaque; + AudiodevWavOptions *wopts = &dev->u.wav; + struct audsettings wav_as = audiodev_to_audsettings(dev->out); + const char *wav_path = wopts->has_path ? wopts->path : "qemu.wav"; stereo = wav_as.nchannels == 2; switch (wav_as.fmt) { @@ -154,10 +152,10 @@ static int wav_init_out(HWVoiceOut *hw, struct audsettings *as, le_store (hdr + 28, hw->info.freq << (bits16 + stereo), 4); le_store (hdr + 32, 1 << (bits16 + stereo), 2); - wav->f = fopen (conf->wav_path, "wb"); + wav->f = fopen(wav_path, "wb"); if (!wav->f) { dolog ("Failed to open wave file `%s'\nReason: %s\n", - conf->wav_path, strerror (errno)); + wav_path, strerror(errno)); g_free (wav->pcm_buf); wav->pcm_buf = NULL; return -1; @@ -225,54 +223,17 @@ static int wav_ctl_out (HWVoiceOut *hw, int cmd, ...) return 0; } -static WAVConf glob_conf = { - .settings.freq = 44100, - .settings.nchannels = 2, - .settings.fmt = AUDIO_FORMAT_S16, - .wav_path = "qemu.wav" -}; - static void *wav_audio_init(Audiodev *dev) { - WAVConf *conf = g_malloc(sizeof(WAVConf)); - *conf = glob_conf; - return conf; + assert(dev->driver == AUDIODEV_DRIVER_WAV); + return dev; } static void wav_audio_fini (void *opaque) { ldebug ("wav_fini"); - g_free(opaque); } -static struct audio_option wav_options[] = { - { - .name = "FREQUENCY", - .tag = AUD_OPT_INT, - .valp = &glob_conf.settings.freq, - .descr = "Frequency" - }, - { - .name = "FORMAT", - .tag = AUD_OPT_FMT, - .valp = &glob_conf.settings.fmt, - .descr = "Format" - }, - { - .name = "DAC_FIXED_CHANNELS", - .tag = AUD_OPT_INT, - .valp = &glob_conf.settings.nchannels, - .descr = "Number of channels (1 - mono, 2 - stereo)" - }, - { - .name = "PATH", - .tag = AUD_OPT_STR, - .valp = &glob_conf.wav_path, - .descr = "Path to wave file" - }, - { /* End of list */ } -}; - static struct audio_pcm_ops wav_pcm_ops = { .init_out = wav_init_out, .fini_out = wav_fini_out, @@ -284,7 +245,6 @@ static struct audio_pcm_ops wav_pcm_ops = { static struct audio_driver wav_audio_driver = { .name = "wav", .descr = "WAV renderer http://wikipedia.org/wiki/WAV", - .options = wav_options, .init = wav_audio_init, .fini = wav_audio_fini, .pcm_ops = &wav_pcm_ops,