From nobody Fri Nov 7 04:14:04 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547682748970404.00511573193285; Wed, 16 Jan 2019 15:52:28 -0800 (PST) Received: from localhost ([127.0.0.1]:34710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjuyx-00072w-Pa for importer@patchew.org; Wed, 16 Jan 2019 18:52:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gjul3-0004M2-BB for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gjukx-0003GA-WC for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:38:01 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:36102) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gjuku-00036U-1Z for qemu-devel@nongnu.org; Wed, 16 Jan 2019 18:37:57 -0500 Received: by mail-wr1-x442.google.com with SMTP id u4so8967667wrp.3 for ; Wed, 16 Jan 2019 15:37:52 -0800 (PST) Received: from nullptr.home.dirty-ice.org (2a01-036c-0113-e4b0-0000-0000-0000-0005.pool6.digikabel.hu. [2a01:36c:113:e4b0::5]) by smtp.gmail.com with ESMTPSA id s66sm30760437wmf.34.2019.01.16.15.37.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jan 2019 15:37:50 -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=GKC4rdOIBB1pc4GkZxpNaZxDUvN/m8N0JZIr8gTmDkk=; b=UMagP2WABuRf0+g9UIzbW54Jk7n/90EQYsfzmEnoinDY8OhbdOSul6Ki00Zk0ODvak 7u4Oj5lExgOKFfGanv1t0RluEI7TreQrLxs3v3RvVO3/lBNVutM+iOJvn++73MDCeYpB WYCNL8RxP4c7NdokJ6L/9ZSj7oF4PdPQh3X6eo17Q1FzXxO32gpLtGXgQMNgxVkHnlDJ Gts2zsd360pGAGTR63lw0KJ/K9wA/E5KMmwNzeH5WzYYLhn/G/5eodZ3yLiD3xE4Mk55 vicnRMbqW3pWZx0x8dCP6Hh4Z3DlD/HuXMXDoAm/OCgise4nPsV6xC3BIZMT9p0J8ean gEwQ== 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=GKC4rdOIBB1pc4GkZxpNaZxDUvN/m8N0JZIr8gTmDkk=; b=Y9r1q41PNH4zyA0olmKnZGLHgqUv3uY5T3GQXQUSz2uaAuVdB4Z/hAfeGeejDh8BQD VqYKTyxBsLjnbtC0POPnMB1p6ir7eVClSkH1/lz1o7H7MIHqojFWV3S8QxmBLAKyXp8x Y5RLP2fx03yJhGUnbQnvyH5wF3SgLxJ4I7UFQ7U2eOsZeiG7xA7wAUv8XNw4PEfpz17z TKneBS1OeQXJNGagov22jL8RGyz8uHNc2G2mtkcSopoD7QZooJq1Lhw1MEfdmweOBfLP DN01GkZVQJRk0+n4r/DgbuaM+u3Wr/9dfFlQBScXjKaPh5H0EUpDIHU0tkTdVKaaFTky gMsQ== X-Gm-Message-State: AJcUukczmsY5jxsrevKqDRngkEQHw67We45iIYgZ3X/gzzLPPZFGqz8b 4FHiuEH/m7Sx1VQwnToBx2y7NB2tRy8= X-Google-Smtp-Source: ALg8bN4a55kR4YagYRf1rsScaVkojxUrSho84jRrvpFslfFQzCSlacFQmEAJfLm84jaAxpcuhsUVaw== X-Received: by 2002:adf:9361:: with SMTP id 88mr9222316wro.204.1547681871178; Wed, 16 Jan 2019 15:37:51 -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, 17 Jan 2019 00:37:01 +0100 Message-Id: <49e0438fd738f019fa5b96941afe40ff247b132e.1547681517.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v3 28/50] coreaudio: port to the new audio backend api 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Signed-off-by: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n --- audio/coreaudio.c | 130 ++++++++++++++++++++++++---------------------- 1 file changed, 69 insertions(+), 61 deletions(-) diff --git a/audio/coreaudio.c b/audio/coreaudio.c index 646aea06a0..e32c5b62fd 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -43,9 +43,6 @@ typedef struct coreaudioVoiceOut { UInt32 audioDevicePropertyBufferFrameSize; AudioStreamBasicDescription outputStreamBasicDescription; AudioDeviceIOProcID ioprocid; - size_t live; - size_t decr; - size_t rpos; } coreaudioVoiceOut; =20 #if MAC_OS_X_VERSION_MAX_ALLOWED >=3D MAC_OS_X_VERSION_10_6 @@ -397,31 +394,29 @@ static int coreaudio_unlock (coreaudioVoiceOut *core,= const char *fn_name) return 0; } =20 -static size_t coreaudio_run_out(HWVoiceOut *hw, size_t live) -{ - size_t decr; - coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hw; - - if (coreaudio_lock (core, "coreaudio_run_out")) { - return 0; +#define COREAUDIO_WRAPPER_FUNC(name, ret_type, args_decl, args) \ + static ret_type glue(coreaudio_, name)args_decl \ + { \ + coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hw; \ + ret_type ret; \ + \ + if (coreaudio_lock(core, "coreaudio_" #name)) { \ + return 0; \ + } \ + \ + ret =3D glue(audio_generic_, name)args; \ + \ + coreaudio_unlock(core, "coreaudio_" #name); \ + return ret; \ } - - if (core->decr > live) { - ldebug ("core->decr %d live %d core->live %d\n", - core->decr, - live, - core->live); - } - - decr =3D MIN (core->decr, live); - core->decr -=3D decr; - - core->live =3D live - decr; - hw->rpos =3D core->rpos; - - coreaudio_unlock (core, "coreaudio_run_out"); - return decr; -} +COREAUDIO_WRAPPER_FUNC(get_buffer_out, void *, (HWVoiceOut *hw, size_t *si= ze), + (hw, size)) +COREAUDIO_WRAPPER_FUNC(put_buffer_out_nowrite, size_t, + (HWVoiceOut *hw, void *buf, size_t size), + (hw, buf, size)) +COREAUDIO_WRAPPER_FUNC(write, size_t, (HWVoiceOut *hw, void *buf, size_t s= ize), + (hw, buf, size)) +#undef COREAUDIO_WRAPPER_FUNC =20 /* callback to feed audiooutput buffer */ static OSStatus audioDeviceIOProc( @@ -433,19 +428,11 @@ static OSStatus audioDeviceIOProc( const AudioTimeStamp* inOutputTime, void* hwptr) { - UInt32 frame, frameCount; - float *out =3D outOutputData->mBuffers[0].mData; + UInt32 frameCount, pending_frames; + void *out =3D outOutputData->mBuffers[0].mData; HWVoiceOut *hw =3D hwptr; coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hwptr; - int rpos, live; - struct st_sample *src; -#ifndef FLOAT_MIXENG -#ifdef RECIPROCAL - const float scale =3D 1.f / UINT_MAX; -#else - const float scale =3D UINT_MAX; -#endif -#endif + size_t len; =20 if (coreaudio_lock (core, "audioDeviceIOProc")) { inInputTime =3D 0; @@ -453,42 +440,51 @@ static OSStatus audioDeviceIOProc( } =20 frameCount =3D core->audioDevicePropertyBufferFrameSize; - live =3D core->live; + pending_frames =3D hw->pending_emul >> hw->info.shift; =20 /* if there are not enough samples, set signal and return */ - if (live < frameCount) { + if (pending_frames < frameCount) { inInputTime =3D 0; coreaudio_unlock (core, "audioDeviceIOProc(empty)"); return 0; } =20 - rpos =3D core->rpos; - src =3D hw->mix_buf + rpos; + len =3D frameCount << hw->info.shift; + while (len) { + size_t write_len; + ssize_t start =3D ((ssize_t) hw->pos_emul) - hw->pending_emul; + if (start < 0) { + start +=3D hw->size_emul; + } + assert(start >=3D 0 && start < hw->size_emul); =20 - /* fill buffer */ - for (frame =3D 0; frame < frameCount; frame++) { -#ifdef FLOAT_MIXENG - *out++ =3D src[frame].l; /* left channel */ - *out++ =3D src[frame].r; /* right channel */ -#else -#ifdef RECIPROCAL - *out++ =3D src[frame].l * scale; /* left channel */ - *out++ =3D src[frame].r * scale; /* right channel */ -#else - *out++ =3D src[frame].l / scale; /* left channel */ - *out++ =3D src[frame].r / scale; /* right channel */ -#endif -#endif + write_len =3D MIN(MIN(hw->pending_emul, len), + hw->size_emul - start); + + memcpy(out, hw->buf_emul + start, write_len); + hw->pending_emul -=3D write_len; + len -=3D write_len; + out +=3D write_len; } =20 - rpos =3D (rpos + frameCount) % hw->samples; - core->decr +=3D frameCount; - core->rpos =3D rpos; - coreaudio_unlock (core, "audioDeviceIOProc"); return 0; } =20 +static UInt32 coreaudio_get_flags(struct audio_pcm_info *info, + struct audsettings *as) +{ + UInt32 flags =3D info->sign ? kAudioFormatFlagIsSignedInteger : 0; + if (as->endianness) { /* 0 =3D little, 1 =3D big */ + flags |=3D kAudioFormatFlagIsBigEndian; + } + + if (flags =3D=3D 0) { /* must not be 0 */ + flags =3D kAudioFormatFlagsAreAllClear; + } + return flags; +} + static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv_opaque) { @@ -576,6 +572,16 @@ static int coreaudio_init_out(HWVoiceOut *hw, struct a= udsettings *as, =20 /* set Samplerate */ core->outputStreamBasicDescription.mSampleRate =3D (Float64) as->freq; + core->outputStreamBasicDescription.mFormatID =3D kAudioFormatLinearPCM; + core->outputStreamBasicDescription.mFormatFlags =3D + coreaudio_get_flags(&hw->info, as); + core->outputStreamBasicDescription.mBytesPerPacket =3D + core->outputStreamBasicDescription.mBytesPerFrame =3D + hw->info.nchannels * hw->info.bits / 8; + core->outputStreamBasicDescription.mFramesPerPacket =3D 1; + core->outputStreamBasicDescription.mChannelsPerFrame =3D hw->info.ncha= nnels; + core->outputStreamBasicDescription.mBitsPerChannel =3D hw->info.bits; + status =3D coreaudio_set_streamformat(core->outputDeviceID, &core->outputStreamBasicDescriptio= n); if (status !=3D kAudioHardwareNoError) { @@ -686,7 +692,9 @@ static void coreaudio_audio_fini (void *opaque) static struct audio_pcm_ops coreaudio_pcm_ops =3D { .init_out =3D coreaudio_init_out, .fini_out =3D coreaudio_fini_out, - .run_out =3D coreaudio_run_out, + .write =3D coreaudio_write, + .get_buffer_out =3D coreaudio_get_buffer_out, + .put_buffer_out =3D coreaudio_put_buffer_out_nowrite, .ctl_out =3D coreaudio_ctl_out }; =20 --=20 2.20.1