From patchwork Sun Dec 23 20:51:49 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: 1018136 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=208.118.235.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="pRDvuj/z"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43NFzV6PHmz9sDL for ; Mon, 24 Dec 2018 08:36:06 +1100 (AEDT) Received: from localhost ([127.0.0.1]:60073 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbBPo-0000wl-Pb for incoming@patchwork.ozlabs.org; Sun, 23 Dec 2018 16:36:04 -0500 Received: from eggs.gnu.org ([208.118.235.92]:52183) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gbAjs-0007XS-8q for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gbAjr-000233-2K for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:44 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:36981) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gbAjq-00020G-PL for qemu-devel@nongnu.org; Sun, 23 Dec 2018 15:52:42 -0500 Received: by mail-wr1-x442.google.com with SMTP id s12so10090931wrt.4 for ; Sun, 23 Dec 2018 12:52:42 -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=8GUx8AhdRd4T/lz27VOZ17VoHctMlkxhmlrzIsMKO3o=; b=pRDvuj/zksaDZ0dqjKH4VqsgizZZnnRUQpqRv1CUlhhHN2O6BMGkksIGei4PGGmXj+ YoJqfOrgrmyz7EfPD65sCL6bSIFvkN+2s63G+qDXyf3/doowIdBWre7ViMcFcJKDdnuo /qhlKiHU6JdcSZDNFulEYSRgkwk08OSpJNXhFKoeN+DKhbohmkZEHuwa1/Wrq9rG3FLy Pp2wfVKc4haBD1iwwmoRHsp51goOCuZkkM9S4lBEYzmbzXUvan5vVxeZH+E0tiAwHedt B2ivIg8Wu8Ronj5gGLmxX+ulE3ATJZnHx9xeSBjIF2DZIICHwXphI7Jc87CTqExKvMrL Fc+Q== 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=8GUx8AhdRd4T/lz27VOZ17VoHctMlkxhmlrzIsMKO3o=; b=IcePsFnxpjwc/RQno+JnyfCuedXExM/6Ki4Y6pr9dMc+UaIJ3PrxGLHrWVEzW82JxK /+aXMW8Qxb304UwKd1L0M6m9AU10+W/XuiUgQfMtAuZrRwBm1EU6m+d4Y70rFHoz6zz0 9LmBhUGtbXDmSGI3WuwzUO3GDkHSsAD+rNifMHqxYp+RjIgAmgMDX5wGEtHUAi9I5Q8w ZtFJ8pUmkx/lJqinfLegGHt7GFT4eiVkwch8t7jtc/hDFJfjS71FAL52/pPfwzFrVvHQ QZVGcBQPL0LyG3090zDvvMto3V2n0K5LGyNGRwu5fSO5Y23Wua8pRx05h4I16ejAwodi c2vw== X-Gm-Message-State: AJcUukcrRKHT4KbppwKtEEWQDGtWgXgHbNTKUpO3bhrhB0vjnzLxauv3 eL/HrhGoG9DS41QQ4TlOYxNZkFoaHSY= X-Google-Smtp-Source: ALg8bN6yGPJ18SEdV+wMqW3PA4WKRZ1E8/rdJeQMOgeIFZDTCP8MfmhJvUBpEAMe2P6V/G7Ukgda9A== X-Received: by 2002:adf:9542:: with SMTP id 60mr9357984wrs.60.1545598361573; Sun, 23 Dec 2018 12:52:41 -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.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 12:52:41 -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: Sun, 23 Dec 2018 21:51:49 +0100 Message-Id: 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::442 Subject: [Qemu-devel] [PATCH v2 13/52] sdlaudio: 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 | 7 +++++++ audio/sdlaudio.c | 22 ++++------------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c index 1f99d21803..6d95b761b8 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -105,6 +105,11 @@ SimpleEnvMap pa_map[] = { { /* End of list */ } }; +SimpleEnvMap sdl_map[] = { + { "QEMU_SDL_SAMPLES", "buffer-len", ENV_TRANSFORM_SAMPLES_TO_USECS_OUT }, + { /* End of list */ } +}; + static unsigned long long toull(const char *str) { unsigned long long ret; @@ -283,6 +288,8 @@ static void legacy_opt(const char *drv) handle_env_opts(opts, oss_map); } else if (strcmp(drv, "pa") == 0) { handle_env_opts(opts, pa_map); + } else if (strcmp(drv, "sdl") == 0) { + handle_env_opts(opts, sdl_map); } } diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index 097841fde1..cf6ac19927 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -49,12 +49,6 @@ typedef struct SDLVoiceOut { int decr; } SDLVoiceOut; -static struct { - int nb_samples; -} conf = { - .nb_samples = 1024 -}; - static struct SDLAudioState { int exit; #if USE_SEMAPHORE @@ -63,6 +57,7 @@ static struct SDLAudioState { #endif int initialized; bool driver_created; + Audiodev *dev; } glob_sdl; typedef struct SDLAudioState SDLAudioState; @@ -392,7 +387,7 @@ static int sdl_init_out(HWVoiceOut *hw, struct audsettings *as, req.freq = as->freq; req.format = aud_to_sdlfmt (as->fmt); req.channels = as->nchannels; - req.samples = conf.nb_samples; + req.samples = audio_buffer_samples(s->dev->out, as, 11610); req.callback = sdl_callback; req.userdata = sdl; @@ -467,6 +462,7 @@ static void *sdl_audio_init(Audiodev *dev) #endif s->driver_created = true; + s->dev = dev; return s; } @@ -480,18 +476,9 @@ static void sdl_audio_fini (void *opaque) #endif SDL_QuitSubSystem (SDL_INIT_AUDIO); s->driver_created = false; + s->dev = NULL; } -static struct audio_option sdl_options[] = { - { - .name = "SAMPLES", - .tag = AUD_OPT_INT, - .valp = &conf.nb_samples, - .descr = "Size of SDL buffer in samples" - }, - { /* End of list */ } -}; - static struct audio_pcm_ops sdl_pcm_ops = { .init_out = sdl_init_out, .fini_out = sdl_fini_out, @@ -503,7 +490,6 @@ static struct audio_pcm_ops sdl_pcm_ops = { static struct audio_driver sdl_audio_driver = { .name = "sdl", .descr = "SDL http://www.libsdl.org", - .options = sdl_options, .init = sdl_audio_init, .fini = sdl_audio_fini, .pcm_ops = &sdl_pcm_ops,