From patchwork Thu Jan 14 13:45:21 2016 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: 567406 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F374414029E for ; Fri, 15 Jan 2016 00:47:12 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=tTc0dXAX; dkim-atps=neutral Received: from localhost ([::1]:42517 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiF4-0002Rg-MA for incoming@patchwork.ozlabs.org; Thu, 14 Jan 2016 08:47:10 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35397) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiED-00013x-Gr for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJiEC-0003Ns-BL for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:17 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:35666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJiEC-0003Nn-3d for qemu-devel@nongnu.org; Thu, 14 Jan 2016 08:46:16 -0500 Received: by mail-wm0-x242.google.com with SMTP id f206so43692514wmf.2 for ; Thu, 14 Jan 2016 05:46:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=H/FT/mRMW++6n8LN58d/BVNRoC26bN5owIoTJwk5i60=; b=tTc0dXAXWU88/uHbeL0pggMi+WZDtpQlvlHTOtwIxL7AdDW/j9wJsCu4iQMEYtQtFl YnQr29B3H+TihEcsQIQhBOQVjdQUZIKy2JIdUnEGmYpH+He0gzBcU/cAICBhwFLt+8mm R6tyM75XtHDbhEZuQnq6gf6GXICLjW/Pyv84PkXOmQ9BlOxdaWDNqYsC+GBPJNZSfJc+ oUp71tOHWGRi6Q2c2Q+ZqwtijHnz7beKvbHk6L96UNvjzLJ+ifJ6j9erx3L1DQ+WUNly gd6Tu9u/LDPPs9zociZeUrsP8uDhkpzOhwDsMhPAPhGvRCC3OPjnNr3JPuGsNr+6skW2 3Kuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=H/FT/mRMW++6n8LN58d/BVNRoC26bN5owIoTJwk5i60=; b=HhXLsy8QujmWJx0A7dsclxOE4F1x9GL0z1uIRjKpzqZtp+/RU1ZkH0YmZcpXchkBDb oNitvzUX2qHx30JZrVJtbobBdtsFuiccvnLpneybJ2g9ozAMFbky0tAIDCisx1A33UC3 jmUmDe3Er3UeflkbdDg8NTJ+tcShNm1JNTHb9fANZgqYlxHHUS4ewcs8L3eHFviMK/7s 8VumLxvVIvoHOwDAqSvhCC6mk9yhJdwVOmQnN3NAtwddaNlIkTiff2xmQWbjFPVH/ZdN 3rmo4bMM22XXFBa7Xavea3TaU5Tknk+E1onpdRMGUwuLI4g08rV/xmyJbAsCT1ugNrms sosw== X-Gm-Message-State: ALoCoQmjn63X3j8ihvecQMkz2k4nJv+HG5+nwZ0uyEymJd3uwz/+ICtxwcCe3OpbSkhEEmlIOHv/sgDHYEOnV+sxhLbxvUyT2Q== X-Received: by 10.28.228.87 with SMTP id b84mr30848770wmh.81.1452779175585; Thu, 14 Jan 2016 05:46:15 -0800 (PST) Received: from nullptr.home.dirty-ice.org (188-143-126-18.pool.digikabel.hu. [188.143.126.18]) by smtp.gmail.com with ESMTPSA id 79sm7398061wmo.7.2016.01.14.05.46.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jan 2016 05:46:15 -0800 (PST) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= To: qemu-devel@nongnu.org Date: Thu, 14 Jan 2016 14:45:21 +0100 Message-Id: X-Mailer: git-send-email 2.7.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::242 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 08/51] coreaudio: port to -audiodev config 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 Signed-off-by: Kővágó, Zoltán --- audio/audio_legacy.c | 10 ++++++++++ audio/coreaudio.c | 47 ++++++++++------------------------------------- 2 files changed, 20 insertions(+), 37 deletions(-) diff --git a/audio/audio_legacy.c b/audio/audio_legacy.c index bc830c5..4be972e 100644 --- a/audio/audio_legacy.c +++ b/audio/audio_legacy.c @@ -58,6 +58,14 @@ SimpleEnvMap alsa_map[] = { { /* End of list */ } }; +SimpleEnvMap coreaudio_map[] = { + { "QEMU_COREAUDIO_BUFFER_SIZE", "buffer-len", + ENV_TRANSFORM_FRAMES_TO_USECS_OUT }, + { "QEMU_COREAUDIO_BUFFER_COUNT", "buffer-count" }, + + { /* End of list */ } +}; + static unsigned long long toull(const char *str) { unsigned long long ret; @@ -228,6 +236,8 @@ static void legacy_opt(const char *drv) if (strcmp(drv, "alsa") == 0) { handle_env_opts(opts, alsa_map); handle_alsa(opts); + } else if (strcmp(drv, "coreaudio") == 0) { + handle_env_opts(opts, coreaudio_map); } } diff --git a/audio/coreaudio.c b/audio/coreaudio.c index f927c0f..46438a2 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -38,11 +38,6 @@ static int isAtexit; -typedef struct { - int buffer_frames; - int nbuffers; -} CoreaudioConf; - typedef struct coreaudioVoiceOut { HWVoiceOut hw; pthread_mutex_t mutex; @@ -514,7 +509,9 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as, int err; const char *typ = "playback"; AudioValueRange frameRange; - CoreaudioConf *conf = drv_opaque; + Audiodev *dev = drv_opaque; + AudiodevPerDirectionOptions *pdo = dev->out; + int frames; /* create mutex */ err = pthread_mutex_init(&core->mutex, NULL); @@ -545,16 +542,17 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as, return -1; } - if (frameRange.mMinimum > conf->buffer_frames) { + frames = audio_buffer_frames(pdo, as, 11610); + if (frameRange.mMinimum > frames) { core->audioDevicePropertyBufferFrameSize = (UInt32) frameRange.mMinimum; dolog ("warning: Upsizing Buffer Frames to %f\n", frameRange.mMinimum); } - else if (frameRange.mMaximum < conf->buffer_frames) { + else if (frameRange.mMaximum < frames) { core->audioDevicePropertyBufferFrameSize = (UInt32) frameRange.mMaximum; dolog ("warning: Downsizing Buffer Frames to %f\n", frameRange.mMaximum); } else { - core->audioDevicePropertyBufferFrameSize = conf->buffer_frames; + core->audioDevicePropertyBufferFrameSize = frames; } /* set Buffer Frame Size */ @@ -575,7 +573,8 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as, "Could not get device buffer frame size\n"); return -1; } - hw->samples = conf->nbuffers * core->audioDevicePropertyBufferFrameSize; + hw->samples = (pdo->has_buffer_count ? pdo->buffer_count : 4) * + core->audioDevicePropertyBufferFrameSize; /* get StreamFormat */ status = coreaudio_get_streamformat(core->outputDeviceID, @@ -687,41 +686,16 @@ static int coreaudio_ctl_out (HWVoiceOut *hw, int cmd, ...) return 0; } -static CoreaudioConf glob_conf = { - .buffer_frames = 512, - .nbuffers = 4, -}; - static void *coreaudio_audio_init(Audiodev *dev) { - CoreaudioConf *conf = g_malloc(sizeof(CoreaudioConf)); - *conf = glob_conf; - atexit(coreaudio_atexit); - return conf; + return dev; } static void coreaudio_audio_fini (void *opaque) { - g_free(opaque); } -static struct audio_option coreaudio_options[] = { - { - .name = "BUFFER_SIZE", - .tag = AUD_OPT_INT, - .valp = &glob_conf.buffer_frames, - .descr = "Size of the buffer in frames" - }, - { - .name = "BUFFER_COUNT", - .tag = AUD_OPT_INT, - .valp = &glob_conf.nbuffers, - .descr = "Number of buffers" - }, - { /* End of list */ } -}; - static struct audio_pcm_ops coreaudio_pcm_ops = { .init_out = coreaudio_init_out, .fini_out = coreaudio_fini_out, @@ -733,7 +707,6 @@ static struct audio_pcm_ops coreaudio_pcm_ops = { struct audio_driver coreaudio_audio_driver = { .name = "coreaudio", .descr = "CoreAudio http://developer.apple.com/audio/coreaudio.html", - .options = coreaudio_options, .init = coreaudio_audio_init, .fini = coreaudio_audio_fini, .pcm_ops = &coreaudio_pcm_ops,