Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp395071ybg; Wed, 10 Jun 2020 03:42:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxvgqMLKLcoWnv6sbbq421VCTv/S6+BzGH8AevBNr/VG6ZtfAjHPzqOiEAnweCmnJtAO/ID X-Received: by 2002:a05:6402:155:: with SMTP id s21mr1843601edu.144.1591785765182; Wed, 10 Jun 2020 03:42:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591785765; cv=none; d=google.com; s=arc-20160816; b=09JjErJIEYe/dt1IjoepMw2e23ptMDrveWTaSsJ1bhyRbpeTAfxmntB2CFI79NFuqj kC9pZcoZ5agvHAkL/fpe78MaPnciSP54K66o1hKsWvWNtEAkhTRzRI0QrBnbQ5FxYwTw ECAgVjPDFw8tTvncpNhUt5Wac5eGn+7yxuqheVxCchFPrJqxPYPvf+P8V9KdL9VFJtP6 EI1Po6J2kffkYtoDBZXDJy0PiA3CZJZQxwTpQAnzlOCVvklBe9ClOlzXi7qa1iKiYWAr 5pS/7yNHUJ7lGKopfeo7C0Jo1kzvzGaaWA9KguFqONMRWcbe4u626ouxdzPEP2fi0hzw 9siQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature:dkim-filter; bh=EW5ZZRE11geM839WuxiRNw/v/ifrFWfnEj6JsntviJU=; b=PWetpDUmqMQEfECCKfcv07pez/aLF7JVQs2ibrY4qAhdWs3XsVGWeEUYskBFIOCG9D hu+B2fvfStKUlYb12ddk9mv/w6P9lxZMaZ0fkNE9oPewzv1JYvcoUocGxLw8FhzRXrpP vExYhz9hc9H6uv3QHpzgaRuc+tBa4FRkQjT5oih6G2E3qPgfYZUIXjk9mV1+Vo5ELSJr GpvrUG4Gw5bhbjce1OnWJ0A56gOLOI3DO7YypZO5HH7mTrF11JA8ip7guPHHD6qFCqvx WBBZ2cJHipCqhDvq2E8x1MJcaR07/lCGNIphOsH46YR5QgyV7ynbbkWHo8ct3QXeYum0 BhWA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@perex.cz header.s=default header.b=Q8uprEIr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=perex.cz Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dn16si15358906ejc.427.2020.06.10.03.42.22; Wed, 10 Jun 2020 03:42:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@perex.cz header.s=default header.b=Q8uprEIr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=perex.cz Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728304AbgFJKkT (ORCPT + 99 others); Wed, 10 Jun 2020 06:40:19 -0400 Received: from mail1.perex.cz ([77.48.224.245]:38358 "EHLO mail1.perex.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728149AbgFJKkR (ORCPT ); Wed, 10 Jun 2020 06:40:17 -0400 Received: from mail1.perex.cz (localhost [127.0.0.1]) by smtp1.perex.cz (Perex's E-mail Delivery System) with ESMTP id C6155A0040; Wed, 10 Jun 2020 12:40:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.perex.cz C6155A0040 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=perex.cz; s=default; t=1591785614; bh=EW5ZZRE11geM839WuxiRNw/v/ifrFWfnEj6JsntviJU=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=Q8uprEIrtzo6p9TBtk05Tgqmlw5MpoKSgDfXteNJ2w7ho4BQPot0luBb61kw0zexl oFUAW3dSAnHJTMREJUK5zd1DfTEfLl1VroTitDNKRjbIPoY05xxtHLfG+o7mCIT4MC polnbaCshEUPoajBxDsohkZy22K7WR9+uNFnJmGg= Received: from p50.perex-int.cz (unknown [192.168.100.94]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: perex) by mail1.perex.cz (Perex's E-mail Delivery System) with ESMTPSA; Wed, 10 Jun 2020 12:40:08 +0200 (CEST) Subject: Re: [RFC PATCH] ALSA: compress: Fix gapless playback state machine To: Srinivas Kandagatla , vkoul@kernel.org Cc: tiwai@suse.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, broonie@kernel.org References: <20200610100729.362-1-srinivas.kandagatla@linaro.org> From: Jaroslav Kysela Message-ID: <817d009e-fa09-e897-cfc3-997bf1dd5e30@perex.cz> Date: Wed, 10 Jun 2020 12:40:08 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.8.0 MIME-Version: 1.0 In-Reply-To: <20200610100729.362-1-srinivas.kandagatla@linaro.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dne 10. 06. 20 v 12:07 Srinivas Kandagatla napsal(a): > For gapless playback call to snd_compr_drain_notify() after > partial drain should put the state to SNDRV_PCM_STATE_RUNNING > rather than SNDRV_PCM_STATE_SETUP as the driver is ready to > process the buffers for new track. > > With existing code, if we are playing 3 tracks in gapless, after > partial drain finished on previous track 1 the state is set to > SNDRV_PCM_STATE_SETUP which is then moved to SNDRV_PCM_STATE_PREPARED > after data write. With this state calls to snd_compr_next_track() and > few other calls will fail as they expect the state to be in > SNDRV_PCM_STATE_RUNNING. > > Here is the sequence of events and state transitions: > > 1. set_params (Track 1), state = SNDRV_PCM_STATE_SETUP > 2. set_metadata (Track 1), no state change, state = SNDRV_PCM_STATE_SETUP > 3. fill and trigger start (Track 1), state = SNDRV_PCM_STATE_RUNNING > 4. set_next_track (Track 2), state = SNDRV_PCM_STATE_RUNNING > 5. partial_drain (Track 1), state = SNDRV_PCM_STATE_SETUP > 6 snd_compr_drain_notify (Track 1), state = SNDRV_PCM_STATE_SETUP > 7. fill data (Track 2), state = SNDRV_PCM_STATE_PREPARED > 8. set_metadata (Track 3), no state change, state = SNDRV_PCM_STATE_PREPARED > 9. set_next_track (Track 3), !! FAILURE as state != SNDRV_PCM_STATE_RUNNING The snd_compr_drain_notify() is called only from snd_compr_stop(). Something is missing in this sequence? Jaroslav > > Fixes: f44f2a5417b2 ("ALSA: compress: fix drain calls blocking other compress functions (v6)") > Signed-off-by: Srinivas Kandagatla > --- > > I wonder who did gapless work on upstream so far? > > include/sound/compress_driver.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h > index 6ce8effa0b12..eabac33864c2 100644 > --- a/include/sound/compress_driver.h > +++ b/include/sound/compress_driver.h > @@ -182,7 +182,7 @@ static inline void snd_compr_drain_notify(struct snd_compr_stream *stream) > if (snd_BUG_ON(!stream)) > return; > > - stream->runtime->state = SNDRV_PCM_STATE_SETUP; > + stream->runtime->state = SNDRV_PCM_STATE_RUNNING; > > wake_up(&stream->runtime->sleep); > } > -- Jaroslav Kysela Linux Sound Maintainer; ALSA Project; Red Hat, Inc.