From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F8F6C433E0 for ; Fri, 15 Jan 2021 06:32:34 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C0F6C235DD for ; Fri, 15 Jan 2021 06:32:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C0F6C235DD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:32984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0Ieu-0006FQ-Se for qemu-devel@archiver.kernel.org; Fri, 15 Jan 2021 01:32:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:45686) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0Idy-0005YW-RI for qemu-devel@nongnu.org; Fri, 15 Jan 2021 01:31:34 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:33728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l0Idx-0001PE-4r for qemu-devel@nongnu.org; Fri, 15 Jan 2021 01:31:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610692292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wA/xziN7s06f1d9c6Tcw/vKZSEh9w6RcCMw19+YSr8A=; b=hm0uKGvLzs615KcyNwRMYkFgz2ZwvhFK4Hium3wAkuUH6C2ieeIG1TBZE+7D36D8tvzSrb GU/TB8oHCxO+a0p58EHAycHm1WKYa17Uo3aSVxRNDYwwftFXNrcw4dbsgE6N2DQaqO95EE BM8avnJtKG0e1LRMfadXHJCNXKXjGLs= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-572-d6B1W9RQPPW-_om0VpVH6w-1; Fri, 15 Jan 2021 01:31:30 -0500 X-MC-Unique: d6B1W9RQPPW-_om0VpVH6w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 157A3801F97; Fri, 15 Jan 2021 06:31:29 +0000 (UTC) Received: from thuth.remote.csb (ovpn-112-108.ams2.redhat.com [10.36.112.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED5EA6F7E5; Fri, 15 Jan 2021 06:31:24 +0000 (UTC) Subject: Re: [PATCH 05/23] sdlaudio: always clear the sample buffer To: =?UTF-8?Q?Volker_R=c3=bcmelin?= , Gerd Hoffmann References: <9315afe5-5958-c0b4-ea1e-14769511a9d5@t-online.de> <20210110100239.27588-5-vr_qemu@t-online.de> From: Thomas Huth Message-ID: Date: Fri, 15 Jan 2021 07:31:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.3 MIME-Version: 1.0 In-Reply-To: <20210110100239.27588-5-vr_qemu@t-online.de> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -32 X-Spam_score: -3.3 X-Spam_bar: --- X-Spam_report: (-3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.248, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.237, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: QEMU , =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 10/01/2021 11.02, Volker Rümelin wrote: > Always fill the remaining audio callback buffer with silence. > SDL 2.0 doesn't initialize the audio callback buffer. This was > an incompatible change compared to SDL 1.2. For reference read > the SDL 1.2 to 2.0 migration guide. > > Signed-off-by: Volker Rümelin > --- > audio/sdlaudio.c | 33 ++++++++++++++++----------------- > 1 file changed, 16 insertions(+), 17 deletions(-) > > diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c > index 68126a99ab..79eed23849 100644 > --- a/audio/sdlaudio.c > +++ b/audio/sdlaudio.c > @@ -211,27 +211,26 @@ static void sdl_callback (void *opaque, Uint8 *buf, int len) > SDLAudioState *s = &glob_sdl; > HWVoiceOut *hw = &sdl->hw; > > - if (s->exit) { > - return; > - } > + if (!s->exit) { > > - /* dolog("callback: len=%d avail=%zu\n", len, hw->pending_emul); */ > + /* dolog("callback: len=%d avail=%zu\n", len, hw->pending_emul); */ > > - while (hw->pending_emul && len) { > - size_t write_len; > - ssize_t start = ((ssize_t) hw->pos_emul) - hw->pending_emul; > - if (start < 0) { > - start += hw->size_emul; > - } > - assert(start >= 0 && start < hw->size_emul); > + while (hw->pending_emul && len) { > + size_t write_len; > + ssize_t start = (ssize_t)hw->pos_emul - hw->pending_emul; > + if (start < 0) { > + start += hw->size_emul; > + } > + assert(start >= 0 && start < hw->size_emul); > > - write_len = MIN(MIN(hw->pending_emul, len), > - hw->size_emul - start); > + write_len = MIN(MIN(hw->pending_emul, len), > + hw->size_emul - start); > > - memcpy(buf, hw->buf_emul + start, write_len); > - hw->pending_emul -= write_len; > - len -= write_len; > - buf += write_len; > + memcpy(buf, hw->buf_emul + start, write_len); > + hw->pending_emul -= write_len; > + len -= write_len; > + buf += write_len; > + } > } > > /* clear remaining buffer that we couldn't fill with data */ > Reviewed-by: Thomas Huth