Changeset 948

Timestamp:

03/16/08 15:13:45 (13 years ago)

Author:

jwoithe

Message:

MOTU: Use fast C99 lrint()/lrintf() for float-int casts in MOTU transmit stream if available. There may be a neater way of detecting the suitability of these in SConstruct but what's there now seems to work.

MOTU: only output the test tone if the debug level is greater than 0.

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/SConstruct (modified) (2 diffs)
• trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp (modified) (7 diffs)
• trunk/libffado/src/libutil/float_cast.h (added)

trunk/libffado/config.h.in

@@ -32 +32 @@
-#define LIBDIR "$LIBDIR"
-#define SHAREDIR "$SHAREDIR"
+
+/* Define indicating availability of lrint() */
+#define HAVE_LRINT $HAVE_LRINT
+
+/* Define indicatin availability of lrintf() */
+#define HAVE_LRINTF $HAVE_LRINTF
-
-#define DEBUG_IMPLEMENT_BACKLOG     0

trunk/libffado/SConstruct

@@ -3 +3 @@
-# Copyright (C) 2007 Arnold Krille
-# Copyright (C) 2007 Pieter Palmers
+# Copyright (C) 2008 Jonathan Woithe
-#
-# This file is part of FFADO
@@ -208 +209 @@
-                Exit( 1 )
-
+        # Check for C99 lrint() and lrintf() functions used to convert from
+        # float to integer more efficiently via float_cast.h.  If not
+        # present the standard slower methods will be used instead.  This
+        # might not be the best way of testing for these but it's the only
+        # way which seems to work properly.  CheckFunc() fails due to
+        # argument count problems.
+        oldcf = env['CFLAGS']
+        oldcf = env.Append(CFLAGS = '-std=c99')
+        if conf.CheckLibWithHeader( "m", "math.h", "c", "lrint(3.2);" ):
+                HAVE_LRINT = 1
+        else:
+                HAVE_LRINT = 0
+        if conf.CheckLibWithHeader( "m", "math.h", "c", "lrintf(3.2);" ):
+                HAVE_LRINTF = 1
+        else:
+                HAVE_LRINTF = 0
+        env['HAVE_LRINT'] = HAVE_LRINT;
+        env['HAVE_LRINTF'] = HAVE_LRINTF;
+        env.Replace(CFLAGS=oldcf)
+
-        #
-        # Optional checks follow:

trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp

@@ -25 +25 @@
-#include "config.h"
-
+#include "libutil/float_cast.h"
+
-#include "MotuTransmitStreamProcessor.h"
-#include "MotuPort.h"
@@ -37 +39 @@
-#include <assert.h>
-
-
+
+
+
-#define TESTTONE 1
-
@@ -268 +272 @@
-
-#if TESTTONE
+    /* Now things are beginning to stabilise, make things easier for others by only playing
+     * the test tone when run with a non-zero debug level.
+     */
+    if (getDebugLevel() > 0) {
-        // FIXME: remove this hacked in 1 kHz test signal to
-        // analog-1 when testing is complete.
-(int)ticks_per_frame
+lrintf(ticks_per_frame)
-        unsigned char *sample = data+8+16;
-        for (i=0; i<n_events; i++, sample+=m_event_size) {
@@ -277 +285 @@
-            // network byte order).  After byte order swap, the 24-bit
-            // MSB is in the second byte of val.
-(int)
+lrintf
-            memcpy(sample,((char *)&val)+1,3);
-            if ((a_cx+=int_tpf) >= 24576000) {
@@ -283 +291 @@
-            }
-        }
+    }
-#endif
-
-        // Set up each frames's SPH.
-        for (int i=0; i < n_events; i++, quadlet += dbs) {
-
-
-
+
-            *quadlet = htonl(fullTicksToSph(ts_frame));
-        }
@@ -385 +392 @@
-    // Set up each frames's SPH.
-    for (int i=0; i < n_events; i++, quadlet += dbs) {
-
-
-
+
-        *quadlet = htonl(fullTicksToSph(ts_frame));
-    }
@@ -577 +582 @@
-
-                for(j = 0; j < nevents; j += 1) { // decode max nsamples
-(int)
+lrintf
-                    *target = (v >> 16) & 0xff;
-                    *(target+1) = (v >> 8) & 0xff;