Changeset 905

Timestamp:

03/06/08 01:05:31 (13 years ago)

Author:

ppalmers

Message:

convert some const values into defines

Files:

• trunk/libffado/config.h.in (modified) (2 diffs)
• trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp (modified) (5 diffs)

trunk/libffado/config.h.in

@@ -86 +86 @@
-#define TIMESTAMPEDBUFFER_DLL_BANDWIDTH                     (0.01)
-
+// -- AMDTP options -- //
+
-// in ticks
-// as per AMDTP2.1:
@@ -110 +112 @@
-#define AMDTP_CLIP_FLOATS                                   1
-
+// -- MOTU options -- //
-
+// the transfer delay is substracted from the ideal presentation
+// time to obtain a corrected presentation time. This values is
+// then used to stamp the packet and determine the transmission
+// time instant.
-#define MOTU_TRANSMIT_TRANSFER_DELAY    (11776U)
-
+// the absolute minimum number of cycles we want to transmit
+// a packet ahead of the presentation time. The nominal time
+// the packet is transmitted ahead of the presentation time is
+// given by MOTU_TRANSMIT_TRANSFER_DELAY (in ticks), but in case we
+// are too late for that, this constant defines how late we can
+// be.
+#define MOTU_MIN_CYCLES_BEFORE_PRESENTATION                1
+
+// the absolute maximum number of cycles we want to transmit
+// a packet ahead of the ideal transmit time. The nominal time
+// the packet is transmitted ahead of the presentation time is
+// given by MOTU_TRANSMIT_TRANSFER_DELAY (in ticks), but we can send
+// packets early if we want to.
+#define MOTU_MAX_CYCLES_TO_TRANSMIT_EARLY                  6
+
-#endif // CONFIG_H

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

@@ -100 +100 @@
-    int cycles_until_transmit;
-
-    // FIXME: should become a define
-    // the absolute minimum number of cycles we want to transmit
-    // a packet ahead of the presentation time. The nominal time
-    // the packet is transmitted ahead of the presentation time is
-    // given by MOTU_TRANSMIT_TRANSFER_DELAY (in ticks), but in case we
-    // are too late for that, this constant defines how late we can
-    // be.
-    const int min_cycles_before_presentation = 1;
-    // FIXME: should become a define
-    // the absolute maximum number of cycles we want to transmit
-    // a packet ahead of the ideal transmit time. The nominal time
-    // the packet is transmitted ahead of the presentation time is
-    // given by MOTU_TRANSMIT_TRANSFER_DELAY (in ticks), but we can send
-    // packets early if we want to. (not completely according to spec)
-    const int max_cycles_to_transmit_early = 2;
-
-    debugOutput ( DEBUG_LEVEL_ULTRA_VERBOSE, "Try for cycle %d\n", cycle );
-    // check whether the packet buffer has packets for us to send.
@@ -168 +152 @@
-        // we can still postpone the queueing of the packets
-        // if we are far enough ahead of the presentation time
-min_cycles_before_presentation
+MOTU_MIN_CYCLES_BEFORE_PRESENTATION
-        {
-            debugOutput ( DEBUG_LEVEL_VERBOSE,
@@ -217 +201 @@
-            // NOTE: dangerous since the device has no way of reporting that it didn't get
-            //       this packet on time.
-min_cycles_before_presentation
+MOTU_MIN_CYCLES_BEFORE_PRESENTATION
-            {
-                // we are not that late and can still try to transmit the packet
@@ -230 +214 @@
-            }
-        }
-max_cycles_to_transmit_early
+MOTU_MAX_CYCLES_TO_TRANSMIT_EARLY
-        {
-            // it's time send the packet
@@ -247 +231 @@
-                        presentation_time, ( unsigned int ) TICKS_TO_CYCLES ( presentation_time ) );
-#ifdef DEBUG
-max_cycles_to_transmit_early
+MOTU_MAX_CYCLES_TO_TRANSMIT_EARLY
-            {
-                debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,