From owner-svn-src-all@FreeBSD.ORG  Tue Mar 24 09:21:54 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D7C8E4FC;
 Tue, 24 Mar 2015 09:21:54 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C30207BA;
 Tue, 24 Mar 2015 09:21:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2O9LsU7053782;
 Tue, 24 Mar 2015 09:21:54 GMT (envelope-from hselasky@FreeBSD.org)
Received: (from hselasky@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2O9Lsjs053781;
 Tue, 24 Mar 2015 09:21:54 GMT (envelope-from hselasky@FreeBSD.org)
Message-Id: <201503240921.t2O9Lsjs053781@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: hselasky set sender to
 hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 24 Mar 2015 09:21:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280429 - head/sys/dev/sound/usb
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Mar 2015 09:21:54 -0000

Author: hselasky
Date: Tue Mar 24 09:21:53 2015
New Revision: 280429
URL: https://svnweb.freebsd.org/changeset/base/280429

Log:
  Use the feedback value from the synchronization endpoint as fallback
  when there is no recording channel.
  
  MFC after:	3 days
  PR: 		198444

Modified:
  head/sys/dev/sound/usb/uaudio.c

Modified: head/sys/dev/sound/usb/uaudio.c
==============================================================================
--- head/sys/dev/sound/usb/uaudio.c	Tue Mar 24 08:27:01 2015	(r280428)
+++ head/sys/dev/sound/usb/uaudio.c	Tue Mar 24 09:21:53 2015	(r280429)
@@ -2026,6 +2026,13 @@ uaudio_chan_play_sync_callback(struct us
 		DPRINTF("Comparing %d Hz :: %d Hz\n",
 		    (int)temp, (int)sample_rate);
 
+		/*
+		 * Use feedback value as fallback when there is no
+		 * recording channel:
+		 */
+		if (ch->priv_sc->sc_rec_chan.num_alt == 0)
+			ch->jitter_curr = temp - sample_rate;
+
 		ch->feedback_rate = temp;
 		break;