From patchwork Wed Feb 26 14:54:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Fitzgerald X-Patchwork-Id: 3724421 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BCA27BF13A for ; Wed, 26 Feb 2014 14:54:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC9FD201EF for ; Wed, 26 Feb 2014 14:54:34 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 6D8D7201BA for ; Wed, 26 Feb 2014 14:54:33 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 82AA826573C; Wed, 26 Feb 2014 15:54:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 5CA9A2656B0; Wed, 26 Feb 2014 15:54:20 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id B40432656E9; Wed, 26 Feb 2014 15:54:18 +0100 (CET) Received: from opensource.wolfsonmicro.com (opensource.wolfsonmicro.com [80.75.67.52]) by alsa0.perex.cz (Postfix) with ESMTP id 0AE232656A3 for ; Wed, 26 Feb 2014 15:54:12 +0100 (CET) Received: from opensource.wolfsonmicro.com (opensource [80.75.67.52]) by opensource.wolfsonmicro.com (Postfix) with ESMTPSA id 79A2E3B40EE; Wed, 26 Feb 2014 14:54:11 +0000 (GMT) Date: Wed, 26 Feb 2014 14:54:08 +0000 From: Richard Fitzgerald To: vinod.koul@intel.com Message-ID: <20140226145408.GA2672@opensource.wolfsonmicro.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.17+20080114 (2008-01-14) Cc: tiwai@suse.de, alsa-devel@alsa-project.org, broonie@linaro.org, linux-kernel@vger.kernel.org Subject: [alsa-devel] [PATCH 1/1] ALSA: compress: no need to set metadata before next track X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP The metadata is mainly for MP3 gapless playback, since the MP3 audio stream does not contain enough information to enable gapless. Other audio formats do not necessarily require any additional metadata so we should allow next_track to be called without any metadata. Signed-off-by: Zhao Weijia Signed-off-by: Richard Fitzgerald --- sound/core/compress_offload.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c index 7a20897..5a351c7 100644 --- a/sound/core/compress_offload.c +++ b/sound/core/compress_offload.c @@ -744,12 +744,6 @@ static int snd_compr_next_track(struct snd_compr_stream *stream) if (stream->runtime->state != SNDRV_PCM_STATE_RUNNING) return -EPERM; - /* you can signal next track isf this is intended to be a gapless stream - * and current track metadata is set - */ - if (stream->metadata_set == false) - return -EPERM; - retval = stream->ops->trigger(stream, SND_COMPR_TRIGGER_NEXT_TRACK); if (retval != 0) return retval;