From patchwork Mon Jun 1 13:23:41 2015 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: 479034 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 1E836140F90 for ; Mon, 1 Jun 2015 23:24:59 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=JW1Kltd1; dkim-atps=neutral Received: from localhost ([::1]:52486 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzPi5-00041J-77 for incoming@patchwork.ozlabs.org; Mon, 01 Jun 2015 09:24:57 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54221) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzPhP-0002mU-E7 for qemu-devel@nongnu.org; Mon, 01 Jun 2015 09:24:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YzPhL-0007h1-SN for qemu-devel@nongnu.org; Mon, 01 Jun 2015 09:24:15 -0400 Received: from mail-wi0-x22d.google.com ([2a00:1450:400c:c05::22d]:36811) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YzPhL-0007gq-Hg for qemu-devel@nongnu.org; Mon, 01 Jun 2015 09:24:11 -0400 Received: by wibdq8 with SMTP id dq8so29223414wib.1 for ; Mon, 01 Jun 2015 06:24:11 -0700 (PDT) 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=6OXOSPdiDKYEcnXjkbdNrJ8YEruz/bvoBJ4dYgSf4+Y=; b=JW1Kltd1CyAS+HUf7yQU75xQSD0BslyUoVUGZyE9VbDcux9BiXXOOXqWzSF9Z97gXx xuMym21u/v47p/LdGltsAGaLxsj4GJFlKIqf0ZV3j3/dNUAxFxz53DgNff3BjO9wsWyV fpxECdRYxvlW6JVhblCOB5IvFbB90M8Cf/QUri4h/IZSSuX8ozKIQiHU9SAinZkxE3yZ Iv1VKWRgoNY7AM2I/0rLsx27IkPl+WeaOrvigXjC6xk2iU5LqHPtxPNOMkmg0QQDH1mB WhvE12fEH5sBRDPTW44Vyv/Oxm+LdyJEQdLTQSPX+sHtCljgxwzqdwOZmsE1j+fvLAo8 DyoQ== X-Received: by 10.194.5.103 with SMTP id r7mr40072533wjr.47.1433165051010; Mon, 01 Jun 2015 06:24:11 -0700 (PDT) Received: from nullptr.home.dirty-ice.org (212-40-90-210.pool.digikabel.hu. [212.40.90.210]) by mx.google.com with ESMTPSA id js3sm21917842wjc.5.2015.06.01.06.24.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jun 2015 06:24:10 -0700 (PDT) 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: Mon, 1 Jun 2015 15:23:41 +0200 Message-Id: <1330de7efe444d3afa00676f51dcaa364541a049.1433164051.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.4.2 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::22d Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 03/12] audio: remove sdl backend 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 It's broken and we have native drivers for almost all platforms. Signed-off-by: Kővágó, Zoltán --- audio/Makefile.objs | 3 - audio/audio_int.h | 1 - audio/sdlaudio.c | 458 ---------------------------------------------------- configure | 24 ++- 4 files changed, 11 insertions(+), 475 deletions(-) delete mode 100644 audio/sdlaudio.c diff --git a/audio/Makefile.objs b/audio/Makefile.objs index b4c0608..3c84972 100644 --- a/audio/Makefile.objs +++ b/audio/Makefile.objs @@ -1,5 +1,4 @@ common-obj-y = audio.o noaudio.o wavaudio.o mixeng.o -common-obj-$(CONFIG_SDL) += sdlaudio.o common-obj-$(CONFIG_OSS) += ossaudio.o common-obj-$(CONFIG_SPICE) += spiceaudio.o common-obj-$(CONFIG_COREAUDIO) += coreaudio.o @@ -10,5 +9,3 @@ common-obj-$(CONFIG_WINWAVE) += winwaveaudio.o common-obj-$(CONFIG_AUDIO_PT_INT) += audio_pt_int.o common-obj-$(CONFIG_AUDIO_WIN_INT) += audio_win_int.o common-obj-y += wavcapture.o - -sdlaudio.o-cflags := $(SDL_CFLAGS) diff --git a/audio/audio_int.h b/audio/audio_int.h index 7445602..d593879 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -204,7 +204,6 @@ struct AudioState { extern struct audio_driver no_audio_driver; extern struct audio_driver oss_audio_driver; -extern struct audio_driver sdl_audio_driver; extern struct audio_driver wav_audio_driver; extern struct audio_driver alsa_audio_driver; extern struct audio_driver coreaudio_audio_driver; diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c deleted file mode 100644 index d24daa5..0000000 --- a/audio/sdlaudio.c +++ /dev/null @@ -1,458 +0,0 @@ -/* - * QEMU SDL audio driver - * - * Copyright (c) 2004-2005 Vassili Karpov (malc) - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -#include -#include -#include "qemu-common.h" -#include "audio.h" - -#ifndef _WIN32 -#ifdef __sun__ -#define _POSIX_PTHREAD_SEMANTICS 1 -#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) -#include -#endif -#endif - -#define AUDIO_CAP "sdl" -#include "audio_int.h" - -typedef struct SDLVoiceOut { - HWVoiceOut hw; - int live; - int rpos; - int decr; -} SDLVoiceOut; - -static struct { - int nb_samples; -} conf = { - .nb_samples = 1024 -}; - -static struct SDLAudioState { - int exit; - SDL_mutex *mutex; - SDL_sem *sem; - int initialized; -} glob_sdl; -typedef struct SDLAudioState SDLAudioState; - -static void GCC_FMT_ATTR (1, 2) sdl_logerr (const char *fmt, ...) -{ - va_list ap; - - va_start (ap, fmt); - AUD_vlog (AUDIO_CAP, fmt, ap); - va_end (ap); - - AUD_log (AUDIO_CAP, "Reason: %s\n", SDL_GetError ()); -} - -static int sdl_lock (SDLAudioState *s, const char *forfn) -{ - if (SDL_LockMutex (s->mutex)) { - sdl_logerr ("SDL_LockMutex for %s failed\n", forfn); - return -1; - } - return 0; -} - -static int sdl_unlock (SDLAudioState *s, const char *forfn) -{ - if (SDL_UnlockMutex (s->mutex)) { - sdl_logerr ("SDL_UnlockMutex for %s failed\n", forfn); - return -1; - } - return 0; -} - -static int sdl_post (SDLAudioState *s, const char *forfn) -{ - if (SDL_SemPost (s->sem)) { - sdl_logerr ("SDL_SemPost for %s failed\n", forfn); - return -1; - } - return 0; -} - -static int sdl_wait (SDLAudioState *s, const char *forfn) -{ - if (SDL_SemWait (s->sem)) { - sdl_logerr ("SDL_SemWait for %s failed\n", forfn); - return -1; - } - return 0; -} - -static int sdl_unlock_and_post (SDLAudioState *s, const char *forfn) -{ - if (sdl_unlock (s, forfn)) { - return -1; - } - - return sdl_post (s, forfn); -} - -static int aud_to_sdlfmt (audfmt_e fmt) -{ - switch (fmt) { - case AUD_FMT_S8: - return AUDIO_S8; - - case AUD_FMT_U8: - return AUDIO_U8; - - case AUD_FMT_S16: - return AUDIO_S16LSB; - - case AUD_FMT_U16: - return AUDIO_U16LSB; - - default: - dolog ("Internal logic error: Bad audio format %d\n", fmt); -#ifdef DEBUG_AUDIO - abort (); -#endif - return AUDIO_U8; - } -} - -static int sdl_to_audfmt(int sdlfmt, audfmt_e *fmt, int *endianness) -{ - switch (sdlfmt) { - case AUDIO_S8: - *endianness = 0; - *fmt = AUD_FMT_S8; - break; - - case AUDIO_U8: - *endianness = 0; - *fmt = AUD_FMT_U8; - break; - - case AUDIO_S16LSB: - *endianness = 0; - *fmt = AUD_FMT_S16; - break; - - case AUDIO_U16LSB: - *endianness = 0; - *fmt = AUD_FMT_U16; - break; - - case AUDIO_S16MSB: - *endianness = 1; - *fmt = AUD_FMT_S16; - break; - - case AUDIO_U16MSB: - *endianness = 1; - *fmt = AUD_FMT_U16; - break; - - default: - dolog ("Unrecognized SDL audio format %d\n", sdlfmt); - return -1; - } - - return 0; -} - -static int sdl_open (SDL_AudioSpec *req, SDL_AudioSpec *obt) -{ - int status; -#ifndef _WIN32 - int err; - sigset_t new, old; - - /* Make sure potential threads created by SDL don't hog signals. */ - err = sigfillset (&new); - if (err) { - dolog ("sdl_open: sigfillset failed: %s\n", strerror (errno)); - return -1; - } - err = pthread_sigmask (SIG_BLOCK, &new, &old); - if (err) { - dolog ("sdl_open: pthread_sigmask failed: %s\n", strerror (err)); - return -1; - } -#endif - - status = SDL_OpenAudio (req, obt); - if (status) { - sdl_logerr ("SDL_OpenAudio failed\n"); - } - -#ifndef _WIN32 - err = pthread_sigmask (SIG_SETMASK, &old, NULL); - if (err) { - dolog ("sdl_open: pthread_sigmask (restore) failed: %s\n", - strerror (errno)); - /* We have failed to restore original signal mask, all bets are off, - so exit the process */ - exit (EXIT_FAILURE); - } -#endif - return status; -} - -static void sdl_close (SDLAudioState *s) -{ - if (s->initialized) { - sdl_lock (s, "sdl_close"); - s->exit = 1; - sdl_unlock_and_post (s, "sdl_close"); - SDL_PauseAudio (1); - SDL_CloseAudio (); - s->initialized = 0; - } -} - -static void sdl_callback (void *opaque, Uint8 *buf, int len) -{ - SDLVoiceOut *sdl = opaque; - SDLAudioState *s = &glob_sdl; - HWVoiceOut *hw = &sdl->hw; - int samples = len >> hw->info.shift; - - if (s->exit) { - return; - } - - while (samples) { - int to_mix, decr; - - /* dolog ("in callback samples=%d\n", samples); */ - sdl_wait (s, "sdl_callback"); - if (s->exit) { - return; - } - - if (sdl_lock (s, "sdl_callback")) { - return; - } - - if (audio_bug (AUDIO_FUNC, sdl->live < 0 || sdl->live > hw->samples)) { - dolog ("sdl->live=%d hw->samples=%d\n", - sdl->live, hw->samples); - return; - } - - if (!sdl->live) { - goto again; - } - - /* dolog ("in callback live=%d\n", live); */ - to_mix = audio_MIN (samples, sdl->live); - decr = to_mix; - while (to_mix) { - int chunk = audio_MIN (to_mix, hw->samples - hw->rpos); - struct st_sample *src = hw->mix_buf + hw->rpos; - - /* dolog ("in callback to_mix %d, chunk %d\n", to_mix, chunk); */ - hw->clip (buf, src, chunk); - sdl->rpos = (sdl->rpos + chunk) % hw->samples; - to_mix -= chunk; - buf += chunk << hw->info.shift; - } - samples -= decr; - sdl->live -= decr; - sdl->decr += decr; - - again: - if (sdl_unlock (s, "sdl_callback")) { - return; - } - } - /* dolog ("done len=%d\n", len); */ -} - -static int sdl_write_out (SWVoiceOut *sw, void *buf, int len) -{ - return audio_pcm_sw_write (sw, buf, len); -} - -static int sdl_run_out (HWVoiceOut *hw, int live) -{ - int decr; - SDLVoiceOut *sdl = (SDLVoiceOut *) hw; - SDLAudioState *s = &glob_sdl; - - if (sdl_lock (s, "sdl_run_out")) { - return 0; - } - - if (sdl->decr > live) { - ldebug ("sdl->decr %d live %d sdl->live %d\n", - sdl->decr, - live, - sdl->live); - } - - decr = audio_MIN (sdl->decr, live); - sdl->decr -= decr; - - sdl->live = live - decr; - hw->rpos = sdl->rpos; - - if (sdl->live > 0) { - sdl_unlock_and_post (s, "sdl_run_out"); - } - else { - sdl_unlock (s, "sdl_run_out"); - } - return decr; -} - -static void sdl_fini_out (HWVoiceOut *hw) -{ - (void) hw; - - sdl_close (&glob_sdl); -} - -static int sdl_init_out (HWVoiceOut *hw, struct audsettings *as) -{ - SDLVoiceOut *sdl = (SDLVoiceOut *) hw; - SDLAudioState *s = &glob_sdl; - SDL_AudioSpec req, obt; - int endianness; - int err; - audfmt_e effective_fmt; - struct audsettings obt_as; - - req.freq = as->freq; - req.format = aud_to_sdlfmt (as->fmt); - req.channels = as->nchannels; - req.samples = conf.nb_samples; - req.callback = sdl_callback; - req.userdata = sdl; - - if (sdl_open (&req, &obt)) { - return -1; - } - - err = sdl_to_audfmt(obt.format, &effective_fmt, &endianness); - if (err) { - sdl_close (s); - return -1; - } - - obt_as.freq = obt.freq; - obt_as.nchannels = obt.channels; - obt_as.fmt = effective_fmt; - obt_as.endianness = endianness; - - audio_pcm_init_info (&hw->info, &obt_as); - hw->samples = obt.samples; - - s->initialized = 1; - s->exit = 0; - SDL_PauseAudio (0); - return 0; -} - -static int sdl_ctl_out (HWVoiceOut *hw, int cmd, ...) -{ - (void) hw; - - switch (cmd) { - case VOICE_ENABLE: - SDL_PauseAudio (0); - break; - - case VOICE_DISABLE: - SDL_PauseAudio (1); - break; - } - return 0; -} - -static void *sdl_audio_init (void) -{ - SDLAudioState *s = &glob_sdl; - - if (SDL_InitSubSystem (SDL_INIT_AUDIO)) { - sdl_logerr ("SDL failed to initialize audio subsystem\n"); - return NULL; - } - - s->mutex = SDL_CreateMutex (); - if (!s->mutex) { - sdl_logerr ("Failed to create SDL mutex\n"); - SDL_QuitSubSystem (SDL_INIT_AUDIO); - return NULL; - } - - s->sem = SDL_CreateSemaphore (0); - if (!s->sem) { - sdl_logerr ("Failed to create SDL semaphore\n"); - SDL_DestroyMutex (s->mutex); - SDL_QuitSubSystem (SDL_INIT_AUDIO); - return NULL; - } - - return s; -} - -static void sdl_audio_fini (void *opaque) -{ - SDLAudioState *s = opaque; - sdl_close (s); - SDL_DestroySemaphore (s->sem); - SDL_DestroyMutex (s->mutex); - SDL_QuitSubSystem (SDL_INIT_AUDIO); -} - -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, - .run_out = sdl_run_out, - .write = sdl_write_out, - .ctl_out = sdl_ctl_out, -}; - -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, - .can_be_default = 1, - .max_voices_out = 1, - .max_voices_in = 0, - .voice_size_out = sizeof (SDLVoiceOut), - .voice_size_in = 0 -}; diff --git a/configure b/configure index cdece43..154ecbe 100755 --- a/configure +++ b/configure @@ -562,24 +562,24 @@ case $targetos in CYGWIN*) mingw32="yes" QEMU_CFLAGS="-mno-cygwin $QEMU_CFLAGS" - audio_possible_drivers="winwave sdl" + audio_possible_drivers="winwave" audio_drv_list="winwave" ;; MINGW32*) mingw32="yes" - audio_possible_drivers="winwave dsound sdl" + audio_possible_drivers="winwave dsound" audio_drv_list="winwave" ;; GNU/kFreeBSD) bsd="yes" audio_drv_list="oss" - audio_possible_drivers="oss sdl pa" + audio_possible_drivers="oss pa" ;; FreeBSD) bsd="yes" make="${MAKE-gmake}" audio_drv_list="oss" - audio_possible_drivers="oss sdl pa" + audio_possible_drivers="oss pa" # needed for kinfo_getvmmap(3) in libutil.h LIBS="-lutil $LIBS" netmap="" # enable netmap autodetect @@ -589,22 +589,20 @@ DragonFly) bsd="yes" make="${MAKE-gmake}" audio_drv_list="oss" - audio_possible_drivers="oss sdl pa" + audio_possible_drivers="oss pa" HOST_VARIANT_DIR="dragonfly" ;; NetBSD) bsd="yes" make="${MAKE-gmake}" audio_drv_list="oss" - audio_possible_drivers="oss sdl" + audio_possible_drivers="oss" oss_lib="-lossaudio" HOST_VARIANT_DIR="netbsd" ;; OpenBSD) bsd="yes" make="${MAKE-gmake}" - audio_drv_list="sdl" - audio_possible_drivers="sdl" HOST_VARIANT_DIR="openbsd" ;; Darwin) @@ -617,7 +615,7 @@ Darwin) fi cocoa="yes" audio_drv_list="coreaudio" - audio_possible_drivers="coreaudio sdl" + audio_possible_drivers="coreaudio" LDFLAGS="-framework CoreFoundation -framework IOKit $LDFLAGS" libs_softmmu="-F/System/Library/Frameworks -framework Cocoa -framework IOKit $libs_softmmu" # Disable attempts to use ObjectiveC features in os/object.h since they @@ -651,7 +649,7 @@ SunOS) if test -f /usr/include/sys/soundcard.h ; then audio_drv_list="oss" fi - audio_possible_drivers="oss sdl" + audio_possible_drivers="oss" # needed for CMSG_ macros in sys/socket.h QEMU_CFLAGS="-D_XOPEN_SOURCE=600 $QEMU_CFLAGS" # needed for TIOCWIN* defines in termios.h @@ -672,7 +670,7 @@ Haiku) ;; *) audio_drv_list="oss" - audio_possible_drivers="oss alsa sdl pa" + audio_possible_drivers="oss alsa pa" linux="yes" linux_user="yes" kvm="yes" @@ -2630,8 +2628,8 @@ for drv in $audio_drv_list; do libs_softmmu="$oss_lib $libs_softmmu" ;; - sdl|wav) - # XXX: Probes for CoreAudio, DirectSound, SDL(?) + wav) + # XXX: Probes for CoreAudio, DirectSound ;; winwave)