From patchwork Mon Feb 27 15:11:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 9593527 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A1E72604AB for ; Mon, 27 Feb 2017 15:53:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 910232848D for ; Mon, 27 Feb 2017 15:53:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82C7728488; Mon, 27 Feb 2017 15:53:39 +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=-6.9 required=2.0 tests=BAYES_00,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 D802628488 for ; Mon, 27 Feb 2017 15:53:38 +0000 (UTC) Received: from localhost ([::1]:53847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciNcH-0005wr-SQ for patchwork-qemu-devel@patchwork.kernel.org; Mon, 27 Feb 2017 10:53:37 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49635) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ciMxg-00038F-5q for qemu-devel@nongnu.org; Mon, 27 Feb 2017 10:11:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ciMxe-0005Bv-52 for qemu-devel@nongnu.org; Mon, 27 Feb 2017 10:11:40 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36754) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ciMxd-0005Bc-Sf for qemu-devel@nongnu.org; Mon, 27 Feb 2017 10:11:38 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1E1E1209233 for ; Mon, 27 Feb 2017 15:11:38 +0000 (UTC) Received: from nilsson.home.kraxel.org (ovpn-116-35.ams2.redhat.com [10.36.116.35]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v1RFBYOK010401; Mon, 27 Feb 2017 10:11:35 -0500 Received: by nilsson.home.kraxel.org (Postfix, from userid 500) id 2EE9880855; Mon, 27 Feb 2017 16:11:33 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Mon, 27 Feb 2017 16:11:31 +0100 Message-Id: <1488208291-14775-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1488208291-14775-1-git-send-email-kraxel@redhat.com> References: <1488208291-14775-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 27 Feb 2017 15:11:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/3] audio/sdlaudio: Allow audio playback with SDL2 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: Thomas Huth , Gerd Hoffmann Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Thomas Huth When compiling with SDL2, the semaphore trick used in sdlaudio.c does not work - QEMU locks up completely in this case. To avoid the hang and get at least some audio playback up and running (it's a little bit crackling, but better than nothing), we can use the SDL locking functions SDL_LockAudio() and SDL_UnlockAudio() to sync with the sound playback thread instead. Signed-off-by: Thomas Huth Message-id: 1485852398-2327-1-git-send-email-thuth@redhat.com Signed-off-by: Gerd Hoffmann --- audio/sdlaudio.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index db69fe1..e8d91d2 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -38,10 +38,14 @@ #define AUDIO_CAP "sdl" #include "audio_int.h" +#define USE_SEMAPHORE (SDL_MAJOR_VERSION < 2) + typedef struct SDLVoiceOut { HWVoiceOut hw; int live; +#if USE_SEMAPHORE int rpos; +#endif int decr; } SDLVoiceOut; @@ -53,8 +57,10 @@ static struct { static struct SDLAudioState { int exit; +#if USE_SEMAPHORE SDL_mutex *mutex; SDL_sem *sem; +#endif int initialized; bool driver_created; } glob_sdl; @@ -73,31 +79,45 @@ static void GCC_FMT_ATTR (1, 2) sdl_logerr (const char *fmt, ...) static int sdl_lock (SDLAudioState *s, const char *forfn) { +#if USE_SEMAPHORE if (SDL_LockMutex (s->mutex)) { sdl_logerr ("SDL_LockMutex for %s failed\n", forfn); return -1; } +#else + SDL_LockAudio(); +#endif + return 0; } static int sdl_unlock (SDLAudioState *s, const char *forfn) { +#if USE_SEMAPHORE if (SDL_UnlockMutex (s->mutex)) { sdl_logerr ("SDL_UnlockMutex for %s failed\n", forfn); return -1; } +#else + SDL_UnlockAudio(); +#endif + return 0; } static int sdl_post (SDLAudioState *s, const char *forfn) { +#if USE_SEMAPHORE if (SDL_SemPost (s->sem)) { sdl_logerr ("SDL_SemPost for %s failed\n", forfn); return -1; } +#endif + return 0; } +#if USE_SEMAPHORE static int sdl_wait (SDLAudioState *s, const char *forfn) { if (SDL_SemWait (s->sem)) { @@ -106,6 +126,7 @@ static int sdl_wait (SDLAudioState *s, const char *forfn) } return 0; } +#endif static int sdl_unlock_and_post (SDLAudioState *s, const char *forfn) { @@ -246,6 +267,7 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) int to_mix, decr; /* dolog ("in callback samples=%d\n", samples); */ +#if USE_SEMAPHORE sdl_wait (s, "sdl_callback"); if (s->exit) { return; @@ -264,6 +286,11 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) if (!sdl->live) { goto again; } +#else + if (s->exit || !sdl->live) { + break; + } +#endif /* dolog ("in callback live=%d\n", live); */ to_mix = audio_MIN (samples, sdl->live); @@ -274,7 +301,11 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) /* dolog ("in callback to_mix %d, chunk %d\n", to_mix, chunk); */ hw->clip (buf, src, chunk); +#if USE_SEMAPHORE sdl->rpos = (sdl->rpos + chunk) % hw->samples; +#else + hw->rpos = (hw->rpos + chunk) % hw->samples; +#endif to_mix -= chunk; buf += chunk << hw->info.shift; } @@ -282,12 +313,21 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) sdl->live -= decr; sdl->decr += decr; +#if USE_SEMAPHORE again: if (sdl_unlock (s, "sdl_callback")) { return; } +#endif } /* dolog ("done len=%d\n", len); */ + +#if (SDL_MAJOR_VERSION >= 2) + /* SDL2 does not clear the remaining buffer for us, so do it on our own */ + if (samples) { + memset(buf, 0, samples << hw->info.shift); + } +#endif } static int sdl_write_out (SWVoiceOut *sw, void *buf, int len) @@ -315,8 +355,12 @@ static int sdl_run_out (HWVoiceOut *hw, int live) decr = audio_MIN (sdl->decr, live); sdl->decr -= decr; +#if USE_SEMAPHORE sdl->live = live - decr; hw->rpos = sdl->rpos; +#else + sdl->live = live; +#endif if (sdl->live > 0) { sdl_unlock_and_post (s, "sdl_run_out"); @@ -405,6 +449,7 @@ static void *sdl_audio_init (void) return NULL; } +#if USE_SEMAPHORE s->mutex = SDL_CreateMutex (); if (!s->mutex) { sdl_logerr ("Failed to create SDL mutex\n"); @@ -419,6 +464,7 @@ static void *sdl_audio_init (void) SDL_QuitSubSystem (SDL_INIT_AUDIO); return NULL; } +#endif s->driver_created = true; return s; @@ -428,8 +474,10 @@ static void sdl_audio_fini (void *opaque) { SDLAudioState *s = opaque; sdl_close (s); +#if USE_SEMAPHORE SDL_DestroySemaphore (s->sem); SDL_DestroyMutex (s->mutex); +#endif SDL_QuitSubSystem (SDL_INIT_AUDIO); s->driver_created = false; }