From patchwork Fri Jan 6 08:40:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sutar.mounesh@gmail.com X-Patchwork-Id: 9500281 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 62620606B5 for ; Fri, 6 Jan 2017 09:22:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 572CF283F0 for ; Fri, 6 Jan 2017 09:22:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4BE5428434; Fri, 6 Jan 2017 09:22:04 +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=-1.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73E59283F0 for ; Fri, 6 Jan 2017 09:22:03 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id D33C72671E0; Fri, 6 Jan 2017 10:22:01 +0100 (CET) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id A9C032671BE; Fri, 6 Jan 2017 10:19:41 +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 2AC172671B8; Fri, 6 Jan 2017 09:40:45 +0100 (CET) Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by alsa0.perex.cz (Postfix) with ESMTP id 25C992671A6; Fri, 6 Jan 2017 09:40:41 +0100 (CET) Received: by mail-it0-f68.google.com with SMTP id b123so1464560itb.2; Fri, 06 Jan 2017 00:40:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=+25b3fxowMAxsc1KlDq3GcE/Wwzc6zBvDiYrJoI5PBE=; b=jWKriEyVa53za1+UB4rf67ExEmr0qs4jJbvVx9GCdS09gJ1fXrf2KO0Vij5fokICLz aS9ErB3K5XgRKC2q5drzV++VklcAwJVqSJEWz/zvxaX6Z/FjA7Kh6i7Cim8iw+qPr9Tl hhd4sdISccc8Zutu1jw1KdmFTH5QvaRwu1sI/1dnH9peT3RRCS7qK6mj2peVfT9x4m92 gXCYzezuV7E87ImQyyCqCsxvaNmtiYOzIyrcw4lx4hPzPQgDLxUX9cu1kLvngUR22Lsq S2dMah19nOtRwAQVwDxN766amxh8t/PvY0o49mmq2qPOObziClX+Q5A0x5mgGMrBPNEK Etig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+25b3fxowMAxsc1KlDq3GcE/Wwzc6zBvDiYrJoI5PBE=; b=jZOnAl6WOZcJfOtrBJSdOETGhs+jzN9kxS1VDuLNif0B3zcMFrra8Vd6Pc0iNO0XoA E4z//2JxQzioVqUag1vgZzummuo9K8ROJo9LKsoLeoCnUUmcpdO3MwFNuz3TZJHAigc4 o8OW8tsMgxeUDbsYTWz9aszG+wgJ/e0ritcOiGoSoBdndLHieENZojL0ZhfoQrlUNA3Y qW5omBWVU+5kngGuWE7LO45U9RaeNNJ+W3Tx8TCLynpkLE49loF5dlc+Mc6DpLf4YX4z GLB4B2iSVdqaa6pV8KZyF/DFpLmZ9IsKobgRVqYZnWwddMIeQ5V5hfFO3/lvG75OcDWu GLSA== X-Gm-Message-State: AIkVDXIFUk/i0uaIYV9wjn9ovJzRjPFuF28feksDPtkY8fDeM0/qq12SffFgogz00s39BA== X-Received: by 10.36.137.84 with SMTP id s81mr1484552itd.117.1483692040707; Fri, 06 Jan 2017 00:40:40 -0800 (PST) Received: from msutar-VirtualBox.inp.mentorg.com ([139.181.35.34]) by smtp.gmail.com with ESMTPSA id y72sm21231350ioi.21.2017.01.06.00.40.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Jan 2017 00:40:40 -0800 (PST) From: sutar.mounesh@gmail.com To: patch@alsa-project.org Date: Fri, 6 Jan 2017 14:10:35 +0530 Message-Id: <1483692035-1470-1-git-send-email-sutar.mounesh@gmail.com> X-Mailer: git-send-email 2.7.4 Cc: alsa-devel@alsa-project.org, Andreas Pape , mounesh_sutar@mentor.com Subject: [alsa-devel] [PATCH 6/6 v3] alsa-lib:pcm: don't return bogus buffer levels in xrun state 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: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Andreas Pape Signed-off-by: Andreas Pape Signed-off-by: Mounesh Sutar diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c index 2e7d9d2..1948fa0 100644 --- a/src/pcm/pcm_dmix.c +++ b/src/pcm/pcm_dmix.c @@ -882,6 +882,9 @@ static snd_pcm_sframes_t snd_pcm_dmix_avail_update(snd_pcm_t *pcm) if ((err = snd_pcm_dmix_sync_ptr(pcm)) < 0) return err; } + if (dmix->state == SND_PCM_STATE_XRUN) + return -EPIPE; + return snd_pcm_mmap_playback_avail(pcm); } diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c index 09d165d..cdd1521 100644 --- a/src/pcm/pcm_dshare.c +++ b/src/pcm/pcm_dshare.c @@ -570,6 +570,9 @@ static snd_pcm_sframes_t snd_pcm_dshare_avail_update(snd_pcm_t *pcm) if ((err = snd_pcm_dshare_sync_ptr(pcm)) < 0) return err; } + if (dshare->state == SND_PCM_STATE_XRUN) + return -EPIPE; + return snd_pcm_mmap_playback_avail(pcm); } diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c index 2b0df89..60a5843 100644 --- a/src/pcm/pcm_dsnoop.c +++ b/src/pcm/pcm_dsnoop.c @@ -454,6 +454,9 @@ static snd_pcm_sframes_t snd_pcm_dsnoop_avail_update(snd_pcm_t *pcm) if (err < 0) return err; } + if (dsnoop->state == SND_PCM_STATE_XRUN) + return -EPIPE; + return snd_pcm_mmap_capture_avail(pcm); }