Changeset 394

Timestamp:

02/14/07 01:31:54 (16 years ago)

Author:

pieterpalmers

Message:

- fixed SYT timestamp to ticks conversion

Files:

• branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (4 diffs)
• branches/streaming-rework/src/libstreaming/cycletimer.h (modified) (3 diffs)
• branches/streaming-rework/src/libstreaming/IsoHandler.cpp (modified) (7 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessor.h (modified) (1 diff)
• branches/streaming-rework/tests/test-cycletimer.cpp (modified) (1 diff)

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

@@ -235 +235 @@
-#ifdef DEBUG
-    if(!m_is_disabled) {
- > TS=%11llu, CTR=%11llu, FC=%5
-fc
+R: TS=%011llu, NOW=%011llu, CYN=%04d, CYT=%04
+now_cycles, cycle
-            );
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "    UTN=%11lld\n",
@@ -246 +246 @@
-    }
-#endif
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // don't process the stream when it is not enabled, not running
-    // or when the next sample is not due yet.
@@ -918 +941 @@
-
-        //=> convert the SYT to a full timestamp in ticks
-
+Recv
-                                        cycle, m_handler->getCycleTimer());
-
@@ -1017 +1040 @@
-            return RAW1394_ISO_DEFER;
-        }
+        
+        #ifdef DEBUG
+        if((cycle % 1000) == 0) {
+            uint32_t syt = (uint32_t)ntohs(packet->syt);
+            uint32_t now=m_handler->getCycleTimer();
+            uint32_t now_ticks=CYCLE_TIMER_TO_TICKS(now);
+            
+            uint32_t test_ts=sytRecvToFullTicks(syt, cycle, now);
+
+            debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "R %04d: SYT=%08X,            CY=%02d OFF=%04d\n",
+                cycle, syt, CYCLE_TIMER_GET_CYCLES(syt), CYCLE_TIMER_GET_OFFSET(syt)
+                );
+            debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "R %04d: NOW=%011lu, SEC=%03u CY=%02u OFF=%04u\n",
+                cycle, now_ticks, CYCLE_TIMER_GET_SECS(now), CYCLE_TIMER_GET_CYCLES(now), CYCLE_TIMER_GET_OFFSET(now)
+                );
+            debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "R %04d: TSS=%011lu, SEC=%03u CY=%02u OFF=%04u\n",
+                cycle, test_ts, TICKS_TO_SECS(test_ts), TICKS_TO_CYCLES(test_ts), TICKS_TO_OFFSET(test_ts)
+                );
+        }
+        #endif
-        
-        //=> process the packet

branches/streaming-rework/src/libstreaming/cycletimer.h

@@ -75 +75 @@
-
-/**
-
-
-
+
+
- *
- * @param syt_timestamp The SYT timestamp as present in the packet
@@ -84 +83 @@
- * @return 
- */
-
+Recv
-    uint32_t timestamp;
-    
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"SYT=%08X CY=%04X CTR=%08X\n",
+        syt_timestamp,rcv_cycle,ctr_now);
+        
-    // reconstruct the full cycle
-    uint32_t cc_cycles=CYCLE_TIMER_GET_CYCLES(ctr_now);
@@ -140 +142 @@
-    
-    timestamp += CYCLE_TIMER_GET_OFFSET(syt_timestamp);
+    
-    timestamp += cc_seconds * TICKS_PER_SECOND;
+    
+    #ifdef DEBUG
+        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
+            debugWarning("back-converted timestamp not equal to SYT\n");
+            debugWarning("TS=%011llu TSC=%08X SYT=%04X\n",
+                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
+        }
+    #endif
+    
+    return timestamp;
+}
+
+/**
+ * @brief Converts a transmit SYT timestamp to a full timestamp in ticks.
+ *
+ * The difference between sytRecvToFullTicks and sytXmitToFullTicks is
+ * the way SYT cycle wraparound is detected: in the receive version, 
+ * wraparound is present if rcv_cycle > current_cycle. In the xmit
+ * version this is when current_cycle > xmt_cycle.
+ *
+ * @param syt_timestamp The SYT timestamp as present in the packet
+ * @param xmt_cycle The cycle this timestamp was received on
+ * @param ctr_now The current value of the cycle timer ('now')
+ * @return 
+ */
+static inline uint32_t sytXmitToFullTicks(uint32_t syt_timestamp, unsigned int xmt_cycle, uint32_t ctr_now) {
+    uint32_t timestamp;
+    
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"SYT=%08X CY=%04X CTR=%08X\n",
+        syt_timestamp,xmt_cycle,ctr_now);
+        
+    // reconstruct the full cycle
+    uint32_t cc_cycles=CYCLE_TIMER_GET_CYCLES(ctr_now);
+    uint32_t cc_seconds=CYCLE_TIMER_GET_SECS(ctr_now);
+    
+    // the cycletimer has wrapped since this packet was received
+    // we want cc_seconds to reflect the 'seconds' at the point this 
+    // is to be transmitted
+    if (xmt_cycle<cc_cycles) {
+        if (cc_seconds) {
+            cc_seconds--;
+        } else {
+            // seconds has wrapped around, so we'd better not substract 1
+            // the good value is 127
+            cc_seconds=127;
+        }
+    }
+    
+    // reconstruct the top part of the timestamp using the current cycle number
+    uint32_t xmt_cycle_masked=xmt_cycle & 0xF;
+    uint32_t syt_cycle=CYCLE_TIMER_GET_CYCLES(syt_timestamp);
+    
+    // if this is true, wraparound has occurred, undo this wraparound
+    if(syt_cycle<xmt_cycle_masked) syt_cycle += 0x10;
+    
+    // this is the difference in cycles wrt the cycle the
+    // timestamp was received
+    uint32_t delta_cycles=syt_cycle-xmt_cycle_masked;
+    
+    // reconstruct the cycle part of the timestamp
+    uint32_t new_cycles=xmt_cycle + delta_cycles;
+    
+    // if the cycles cause a wraparound of the cycle timer,
+    // perform this wraparound
+    // and convert the timestamp into ticks
+    if(new_cycles<8000) {
+        timestamp  = new_cycles * TICKS_PER_CYCLE;
+    } else {
+        debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
+            "Detected wraparound: %d + %d = %d\n",
+            xmt_cycle,delta_cycles,new_cycles);
+        
+        new_cycles-=8000; // wrap around
+#ifdef DEBUG
+        if (new_cycles >= 8000) {
+            debugWarning("insufficient unwrapping\n");
+        }
+#endif
+        timestamp  = new_cycles * TICKS_PER_CYCLE;
+        // add one second due to wraparound
+        timestamp += TICKS_PER_SECOND;
+    }
+    
+    timestamp += CYCLE_TIMER_GET_OFFSET(syt_timestamp);
+    
+    timestamp += cc_seconds * TICKS_PER_SECOND;
+    
+    #ifdef DEBUG
+        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
+            debugWarning("back-converted timestamp not equal to SYT\n");
+            debugWarning("TS=%011llu TSC=%08X SYT=%04X\n",
+                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
+        }
+    #endif
+    
-    return timestamp;
-}

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

@@ -170 +170 @@
-            debugError("libraw1394 not compatible\n");
-        } else {
-
-
+\n
+\n
-        }
-        return false;
@@ -183 +183 @@
-            debugError("libraw1394 not compatible\n");
-        } else {
-
-
+\n
+\n
-        }
-        
@@ -340 +340 @@
-    err=raw1394_read_cycle_timer(m_handle_util, &ctr);
-    if(err) {
-
+\n
-    }
-    return CYCLE_TIMER_TO_TICKS(ctr.cycle_timer);
@@ -370 +370 @@
-    err=raw1394_read_cycle_timer(m_handle_util, &ctr);
-    if(err) {
-
+\n
-    }
-    return ctr.cycle_timer;
@@ -494 +494 @@
-    err=raw1394_read_cycle_timer(m_handle_util, &ctr);
-    if(err) {
-
+\n
-    }
-    new_usecs=(freebob_microsecs_t)ctr.local_time;
@@ -643 +643 @@
-        err=raw1394_read_cycle_timer(m_handle_util, &ctr);
-        if(err) {
-
+\n
-        }
-        prev_usecs=(freebob_microsecs_t)ctr.local_time;
@@ -665 +665 @@
-        err=raw1394_read_cycle_timer(m_handle_util, &ctr);
-        if(err) {
-
+\n
-        }
-        new_usecs=(freebob_microsecs_t)ctr.local_time;

branches/streaming-rework/src/libstreaming/StreamProcessor.h

@@ -140 +140 @@
-    public:
-        /**
-nframes of
-
-nframes
-of
-
- 
+transfer of nframes
+
+a transfer of 
+nframes
+
+
-         * @return true if the StreamProcessor can handle this amount of frames
-         *         false if it can't

branches/streaming-rework/tests/test-cycletimer.cpp

@@ -196 +196 @@
-    subs=substractTicks(10, TICKS_PER_SECOND*128L + 12);
-    if (subs != -2) {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    if (failures) {