OSDN Git Service

pcm: direct: don't return bogus buffer levels in xrun state
authorAndreas Pape <apape@de.adit-jv.com>
Tue, 10 Jan 2017 06:34:09 +0000 (12:04 +0530)
committerTakashi Iwai <tiwai@suse.de>
Tue, 10 Jan 2017 08:24:39 +0000 (09:24 +0100)
Signed-off-by: Andreas Pape <apape@de.adit-jv.com>
Signed-off-by: Mounesh Sutar <mounesh_sutar@mentor.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
src/pcm/pcm_dmix.c
src/pcm/pcm_dshare.c
src/pcm/pcm_dsnoop.c

index 6664210..2ef6159 100644 (file)
@@ -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);
 }
 
index fdc95e3..331f799 100644 (file)
@@ -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);
 }
 
index a148771..539b671 100644 (file)
@@ -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);
 }