From patchwork Mon Jan 28 22:43:36 2019 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: 1032301 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="exEEWYys"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43pQCM001kz9sDX for ; Tue, 29 Jan 2019 10:03:10 +1100 (AEDT) Received: from localhost ([127.0.0.1]:39904 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goFvo-0005ZA-Q5 for incoming@patchwork.ozlabs.org; Mon, 28 Jan 2019 18:03:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47773) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1goFdE-0007sv-O7 for qemu-devel@nongnu.org; Mon, 28 Jan 2019 17:43:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1goFdA-0003Tt-Jn for qemu-devel@nongnu.org; Mon, 28 Jan 2019 17:43:56 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:34491) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1goFdA-0003T7-Ax for qemu-devel@nongnu.org; Mon, 28 Jan 2019 17:43:52 -0500 Received: by mail-wr1-x443.google.com with SMTP id f7so20038907wrp.1 for ; Mon, 28 Jan 2019 14:43:52 -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=fDUbRGEzdM/MvMErbXLgXMdKX7csRVFoEcdi8p2in3U=; b=exEEWYysR7zHBqiBMr0tibxOU3e2sxbWM2JhSNlRPzXv46Y/lupAUQLX0/xWKtLNbA JVFMIRWblPMmil+es3TDz/PjlD4PD9WtnXE4Ujh8+460wVGq+yGWKAoFn/hKTMRBDPpK 52+Ebakfir7OnWaMS4f5B0WObO25Mot6Pg5GFLuOjrRFr4wypHXCH0vTvhDtZZvKWYST OWeS6j8INWFYA5Wr/a3q9YwNGU2OG0p+N4Jjwr22REDzlDYiiAOsbJkJ6YGU0PlIXUKJ VQtnGCeN5pqtOluMc/RhI6gxpkhm2GPSh5V9QkUxJz+7U3Rt9zgGUB9dzrG+sFggnkBr mwrA== 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=fDUbRGEzdM/MvMErbXLgXMdKX7csRVFoEcdi8p2in3U=; b=C9+Etzb4YPnaoSETzjRW/22G9MTM/ZS35si7KdnR9dsYznUs+IgPLzx9Q4jfiDUaQi d6y90MwvekBuJVVmNsUhs8ZKu1ZRi0ZNVLizf0Wh5FAYMbAv0iPmwHugM+R8Pw597Zvi rgDe5HOqKjVdtYpy8R56xolFltL3J7j5VEY+OgIJi057IFQUKufChZQUJpGzYBj0s5dY k2A16VrTi2J/+uYrla7P2Z9IDLGqMT7YaTr8DcZ1n1kUJ8/1rtAimaDRcttxIce1ddae TNHgpcnelYfa4XdsFo63t6kVUdDYdZjVKcKjsUdfnCn/b0cWUziFo9SPTNW+9X1pRrwz XdSg== X-Gm-Message-State: AJcUukfAIzbToPI4FFZoaW4sFRahUGuWYk+v2HPEVZerc2SWPeIbCnyy cShxZf7FzvePBgPTLFc1hAJcPS2Gc9SfGw== X-Google-Smtp-Source: ALg8bN77eGyR4MCPwjsOjCNTGLTOE+O0mpZqmcIqt0C8E/U5RoGV7VytNbuYv5U0CCGlBoWGRwfm2A== X-Received: by 2002:adf:fd87:: with SMTP id d7mr22662332wrr.74.1548715431032; Mon, 28 Jan 2019 14:43:51 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-2152-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:2152::5]) by smtp.gmail.com with ESMTPSA id k7sm100088187wrl.51.2019.01.28.14.43.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 28 Jan 2019 14:43:50 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Mon, 28 Jan 2019 23:43:36 +0100 Message-Id: <07ff0a573156785125eeed6fa88e7e4982f9443a.1548714862.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::443 Subject: [Qemu-devel] [PATCH v4 13/14] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Kővágó, Zoltán --- audio/audio_legacy.c | 15 ++++++++++++ audio/wavaudio.c | 58 +++++++------------------------------------- 2 files changed, 24 insertions(+), 49 deletions(-) diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c index 214774b947..2c2447176c 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -293,6 +293,17 @@ static void handle_sdl(Audiodev *dev) &dev->out->has_buffer_len, dev->out); } +/* wav */ +static void handle_wav(Audiodev *dev) +{ + get_int("QEMU_WAV_FREQUENCY", + &dev->out->frequency, &dev->out->has_frequency); + get_fmt("QEMU_WAV_FORMAT", &dev->out->format, &dev->out->has_format); + get_int("QEMU_WAV_DAC_FIXED_CHANNELS", + &dev->out->channels, &dev->out->has_channels); + get_str("QEMU_WAV_PATH", &dev->u.wav.path, &dev->u.wav.has_path); +} + /* general */ static void handle_per_direction( AudiodevPerDirectionOptions *pdo, const char *prefix) @@ -360,6 +371,10 @@ static AudiodevListEntry *legacy_opt(const char *drvname) handle_sdl(e->dev); break; + case AUDIODEV_DRIVER_WAV: + handle_wav(e->dev); + break; + default: break; } 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,