From mboxrd@z Thu Jan 1 00:00:00 1970 From: Takashi Iwai Subject: Re: [PATCH v5 01/10] ALSA: core: don't override timestamp unconditionally Date: Mon, 09 Feb 2015 16:05:48 +0100 Message-ID: References: <1423259759-4100-1-git-send-email-pierre-louis.bossart@linux.intel.com> <1423259759-4100-2-git-send-email-pierre-louis.bossart@linux.intel.com> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id D4C9F260415 for ; Mon, 9 Feb 2015 16:05:49 +0100 (CET) In-Reply-To: <1423259759-4100-2-git-send-email-pierre-louis.bossart@linux.intel.com> 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 To: Pierre-Louis Bossart Cc: alsa-devel@alsa-project.org List-Id: alsa-devel@alsa-project.org At Fri, 6 Feb 2015 15:55:50 -0600, Pierre-Louis Bossart wrote: > > timestamp in RUNNING mode is already taken in update_hw_ptr routine, > getting a new timestamp introduces offset between hw_ptr, audio_tstamp > and system time > > Add else condition to read timestamp as fallback and only when > enabled > > Signed-off-by: Pierre-Louis Bossart Applied, thanks. Takashi > --- > sound/core/pcm_native.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c > index ff3abc3..7bbc34d 100644 > --- a/sound/core/pcm_native.c > +++ b/sound/core/pcm_native.c > @@ -720,8 +720,11 @@ int snd_pcm_status(struct snd_pcm_substream *substream, > runtime->status->audio_tstamp; > goto _tstamp_end; > } > + } else { > + /* get tstamp only in fallback mode and only if enabled */ > + if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_ENABLE) > + snd_pcm_gettime(runtime, &status->tstamp); > } > - snd_pcm_gettime(runtime, &status->tstamp); > _tstamp_end: > status->appl_ptr = runtime->control->appl_ptr; > status->hw_ptr = runtime->status->hw_ptr; > -- > 1.9.1 > > _______________________________________________ > Alsa-devel mailing list > Alsa-devel@alsa-project.org > http://mailman.alsa-project.org/mailman/listinfo/alsa-devel >