From patchwork Tue Jan 10 06:34:09 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: 9506607 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 65E6E601E9 for ; Tue, 10 Jan 2017 07:32:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 590B81FF8F for ; Tue, 10 Jan 2017 07:32:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4B80B27FBC; Tue, 10 Jan 2017 07:32:43 +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 6DDA81FF8F for ; Tue, 10 Jan 2017 07:32:41 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9C1852672C5; Tue, 10 Jan 2017 08:32:38 +0100 (CET) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 121E7267329; Tue, 10 Jan 2017 08:30: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 E963B2672B0; Tue, 10 Jan 2017 07:34:21 +0100 (CET) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by alsa0.perex.cz (Postfix) with ESMTP id 350EE2671B9; Tue, 10 Jan 2017 07:34:17 +0100 (CET) Received: by mail-wm0-f66.google.com with SMTP id r126so7035262wmr.3; Mon, 09 Jan 2017 22:34:17 -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=s+s9X/FkIzEpSQZS/+CFLvPxWJBY5MGSKwSyOLFxzjwbA7gvbnOAKnl31PnyLcfarF 6Y7/6qBbc0XgOtbLKAZH6VN8kMjEbRPJQ9ifMMmyjO2gNJM9EVFtZqifmpPspkDMzxhH m62AjQS3a3g/Ef6Ae7EDvLK803rHgJQPExTNQIiq6LquxP7C4a+QtDgst4cnj+MFRj52 /9C2zSCncQGq2aMjcDnqAUApCUj6RV196uBBfqn9TmS8GpoGJAdcYvD2GRK+7DPxYn+c eJrCH1sliansmT2zNzuFdpolN9tI4GZv9ssLI8u2iZUG+gEwfwLg0OjhvLnWx/8K6/Fs vszQ== 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=ckzVrJyuBWMzNdDz2ET55rdcjmqCYdSt9ZlqhDYr/5JwFnOK7IYdktDhJ7Tc2GKms0 kdv00pOFCsqjBbFMEgOzNh8/YbgF8MZOa1M+oDb7pXNNzavKptbrIIDM9M65u6Cexd5D RujLTJjtDbsjb5X51POkFeFCXf/fYHmdwOGPM2wHLrYT6g11/EY6muIPXnzRsr4mUHHr bhR0RBDaRCpg6GUkIEDnEuIGnqzjHM5gBj7UeCYaGf6D2iLQKv2QjAzJzDdqs0rC310b M2TXSp3bSfUqrSaX720vccg4R2yyGottVqbEnTB8frnOF9hvWp9d+o4zBTM8OlEFoV/X lt7A== X-Gm-Message-State: AIkVDXIPYc7kVA4nkgS3lh7YeG79XkKbMXd5Ry1igM8/+vXWkSsg64RxvP7EZBTp0tbX/A== X-Received: by 10.28.126.18 with SMTP id z18mr6951648wmc.87.1484030056731; Mon, 09 Jan 2017 22:34:16 -0800 (PST) Received: from msutar-VirtualBox.inp.mentorg.com ([139.181.35.34]) by smtp.gmail.com with ESMTPSA id c133sm1914892wme.12.2017.01.09.22.34.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jan 2017 22:34:16 -0800 (PST) From: sutar.mounesh@gmail.com To: patch@alsa-project.org Date: Tue, 10 Jan 2017 12:04:09 +0530 Message-Id: <1484030049-11232-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 4/4] 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); }