Changeset 430

Timestamp:

03/05/07 21:47:17 (17 years ago)

Author:

jwoithe

Message:

MOTU: more streaming update work. Rx now appears to be working correctly.
Tx makes a noise but there are regular glitches, indicating that things
aren't quite right yet (the tx timestamps are probably not tight enough).

Files:

• branches/streaming-rework/src/libstreaming/MotuStreamProcessor.cpp (modified) (7 diffs)

branches/streaming-rework/src/libstreaming/MotuStreamProcessor.cpp

@@ -52 +52 @@
-// A macro to extract specific bits from a native endian quadlet
-#define get_bits(_d,_start,_len) (((_d)>>((_start)-(_len)+1)) & ((1<<(_len))-1))
+
+// Convert an SPH timestamp as received from the MOTU to a full timestamp in ticks.
+static inline uint32_t sphRecvToFullTicks(uint32_t sph, uint32_t ct_now) {
+
+uint32_t timestamp = CYCLE_TIMER_TO_TICKS(sph & 0x1ffffff);
+uint32_t now_cycles = CYCLE_TIMER_GET_CYCLES(ct_now);
+
+uint32_t ts_sec = CYCLE_TIMER_GET_SECS(ct_now);
+  // If the cycles have wrapped, correct ts_sec so it represents when timestamp
+  // was received.  The timestamps sent by the MOTU are always 1 or two cycles 
+  // in advance of the cycle timer (reasons unknown at this stage).  In addition,
+  // iso buffering can delay the arrival of packets for quite a number of cycles
+  // (have seen a delay >12 cycles).
+  if (abs(CYCLE_TIMER_GET_CYCLES(sph) - now_cycles) > 1000) {
+debugOutput(DEBUG_LEVEL_VERBOSE, "now=%d, ct=%d\n", now_cycles, CYCLE_TIMER_GET_CYCLES(sph));
+    if (ts_sec)
+      ts_sec--;
+    else
+      ts_sec = 127;
+  }
+  return timestamp + ts_sec*TICKS_PER_SECOND;
+}
+
+// Convert a full timestamp into an SPH timestamp as required by the MOTU
+static inline uint32_t fullTicksToSph(uint32_t timestamp) {
+  return timestamp & 0x1ffffff;
+}
-
-/* transmit */
@@ -233 +260 @@
-        // We could (and silently junk the contents) if it turned out to be
-        // more helpful.
-
+
+
+
+
-        return RAW1394_ISO_DEFER;
-    }
@@ -284 +314 @@
-float ticks_per_frame = m_SyncSource->m_data_buffer->getRate();
-                for (i=0; i<n_events; i++, quadlet += dbs) {
-
+
+
-                        ts_frame += (unsigned int)((float)i * ticks_per_frame);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
@@ -421 +475 @@
-    
-    // FIXME: check if the timestamp wraps at one second
-
+128L*
-    
-    m_data_buffer->prepare();
@@ -971 +1025 @@
-//uint32_t first_sph = ntohl(*(quadlet_t *)(data+8+(event_length*(n_events-1))));
-//        m_last_timestamp = ((first_sph & 0x1fff000)>>12)*3072 + (first_sph & 0xfff);
-
+
+
-
-                // Signal that we're running
@@ -997 +1052 @@
-            // set the timestamp as if there will be a sample put into
-            // the buffer by the next packet.
-
-
+= 128L*
+128L*
-            m_data_buffer->setBufferTailTimestamp(ts);
-//debugOutput(DEBUG_LEVEL_VERBOSE,"%p, last ts=%lld, ts=%lld, lts2=%lld\n", m_data_buffer, m_last_timestamp, ts, m_last_timestamp2);
@@ -1104 +1159 @@
-    m_data_buffer->setNominalRate(m_ticks_per_frame);
-    
-
+128L*
-    
-    m_data_buffer->prepare();