From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KA9Oy-0003LR-9q
	for qemu-devel@nongnu.org; Sat, 21 Jun 2008 16:09:36 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KA9Ox-0003Kc-PC
	for qemu-devel@nongnu.org; Sat, 21 Jun 2008 16:09:35 -0400
Received: from [199.232.76.173] (port=60095 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KA9Ox-0003KU-MQ
	for qemu-devel@nongnu.org; Sat, 21 Jun 2008 16:09:35 -0400
Received: from savannah.gnu.org ([199.232.41.3]:58955 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <av1474@comtv.ru>) id 1KA9Ow-0003eG-Vr
	for qemu-devel@nongnu.org; Sat, 21 Jun 2008 16:09:35 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <av1474@comtv.ru>) id 1KA9Ou-0000iP-Oa
	for qemu-devel@nongnu.org; Sat, 21 Jun 2008 20:09:32 +0000
Received: from malc by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <malc@savannah.gnu.org>) id 1KA9Ou-0000iL-IU
	for qemu-devel@nongnu.org; Sat, 21 Jun 2008 20:09:32 +0000
MIME-Version: 1.0
Errors-To: malc
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: malc <av1474@comtv.ru>
Message-Id: <E1KA9Ou-0000iL-IU@cvs.savannah.gnu.org>
Date: Sat, 21 Jun 2008 20:09:32 +0000
Subject: [Qemu-devel] [4773] Emit warning message if user supplied
 buffer/period size/ time was rejected
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4773
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4773
Author:   malc
Date:     2008-06-21 20:09:32 +0000 (Sat, 21 Jun 2008)

Log Message:
-----------
Emit warning message if user supplied buffer/period size/time was rejected

Modified Paths:
--------------
    trunk/audio/alsaaudio.c

Modified: trunk/audio/alsaaudio.c
===================================================================
--- trunk/audio/alsaaudio.c	2008-06-21 19:50:10 UTC (rev 4772)
+++ trunk/audio/alsaaudio.c	2008-06-21 20:09:32 UTC (rev 4773)
@@ -334,6 +334,8 @@
     }
 
     if (req->buffer_size) {
+        unsigned long obt;
+
         if (size_in_usec) {
             int dir = 0;
             unsigned int btime = req->buffer_size;
@@ -344,6 +346,7 @@
                 &btime,
                 &dir
                 );
+            obt = btime;
         }
         else {
             snd_pcm_uframes_t bsize = req->buffer_size;
@@ -353,15 +356,22 @@
                 hw_params,
                 &bsize
                 );
+            obt = bsize;
         }
         if (err < 0) {
             alsa_logerr2 (err, typ, "Failed to set buffer %s to %d\n",
                           size_in_usec ? "time" : "size", req->buffer_size);
             goto err;
         }
+
+        if (obt - req->buffer_size)
+            dolog ("Requested buffer %s %u was rejected, using %lu\n",
+                   size_in_usec ? "time" : "size", req->buffer_size, obt);
     }
 
     if (req->period_size) {
+        unsigned long obt;
+
         if (size_in_usec) {
             int dir = 0;
             unsigned int ptime = req->period_size;
@@ -372,6 +382,7 @@
                 &ptime,
                 &dir
                 );
+            obt = ptime;
         }
         else {
             snd_pcm_uframes_t psize = req->period_size;
@@ -381,6 +392,7 @@
                 hw_params,
                 &psize
                 );
+            obt = psize;
         }
 
         if (err < 0) {
@@ -388,6 +400,10 @@
                           size_in_usec ? "time" : "size", req->period_size);
             goto err;
         }
+
+        if (obt - req->period_size)
+            dolog ("Requested period %s %u was rejected, using %lu\n",
+                   size_in_usec ? "time" : "size", req->period_size, obt);
     }
 
     err = snd_pcm_hw_params (handle, hw_params);