Changeset 255

Timestamp:

06/09/06 15:33:51 (16 years ago)

Author:

pieterpalmers

Message:

- the syt extraction is finally correct, handling all wraparounds correctly
- when receiving a stream the device's samplerate is estimated and this estimate

is used to calculate the timestamps for the transmitted packets
(needs some more work)

Files:

• branches/libfreebob-2.0/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (11 diffs)
• branches/libfreebob-2.0/src/libstreaming/AmdtpStreamProcessor.h (modified) (1 diff)
• branches/libfreebob-2.0/src/libstreaming/StreamProcessor.cpp (modified) (2 diffs)

branches/libfreebob-2.0/src/libstreaming/AmdtpStreamProcessor.cpp

@@ -106 +106 @@
-                *tag = IEC61883_TAG_WITH_CIP;
-                *sy = 0;
-
+4.0*
-                return RAW1394_ISO_OK;
-        }
@@ -196 +196 @@
-        
-        unsigned int timestamp2=ntohs(timestamp);
-
+Y_VER
-         nevents, timestamp, packet->syt, cycle,
-         CYCLE_COUNTER_TO_TICKS(timestamp2),
@@ -878 +878 @@
-            // actual presentation time later
-            if (packet->syt != 0xFFFF) {
+
+                bool wraparound_occurred=false;
-                
-                m_last_timestamp2=m_last_timestamp;
@@ -887 +889 @@
-                
-                // if this is true, wraparound has occurred, undo this wraparound
-F
+10
-                
-                unsigned int delta_cycles=syt_cycle-now_cycle_masked;
@@ -894 +896 @@
-                unsigned int new_cycles=cycle + delta_cycles;
-                
-
+
+
+
+
+
+
-                
-                m_last_timestamp = (new_cycles) << 12;
@@ -901 +908 @@
-                m_last_timestamp |= (syt_timestamp & 0xFFF);
-                
+                // mask off the seconds field
+                
-                // m_last_timestamp timestamp now contains all info,
-                // including cycle number
@@ -906 +915 @@
-                if (m_last_timestamp & m_last_timestamp2) {
-                    // try and estimate the frame rate from the device:
-CYCLE_COUNTER_TO_TICKS(m_last_timestamp
-CYCLE_COUNTER_TO_TICKS(m_last_timestamp2
+((int)(CYCLE_COUNTER_TO_TICKS(m_last_timestamp))
+((int)(CYCLE_COUNTER_TO_TICKS(m_last_timestamp2))
-                                             
-
-
+
+
+
+
+
+
+
-                    
-                    // implement a 1st order DLL to estimate the framerate
@@ -920 +934 @@
-                    err=err-m_ticks_per_frame;
-                    
+                    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,"SYT: %08X | STMP: %08X | DLL: in=%5.0f, current=%f, err=%e\n",syt_timestamp, m_last_timestamp, f,m_ticks_per_frame,err);
+
+#ifdef DEBUG
+                    if(f > 1.5*((TICKS_PER_SECOND*1.0) / m_framerate)*m_syt_interval) {
+                        debugWarning("Timestamp diff more than 50%% of the nominal diff too large!\n");
+                        debugWarning(" SYT: %08X | STMP: %08X,%08X | DLL: in=%5.0f, current=%f, err=%e\n",syt_timestamp, m_last_timestamp, m_last_timestamp2, f,m_ticks_per_frame,err);
+                    }
+                    if(f < 0.5*((TICKS_PER_SECOND*1.0) / m_framerate)*m_syt_interval) {
+                        debugWarning("Timestamp diff more than 50%% of the nominal diff too small!\n");
+                        debugWarning(" SYT: %08X | STMP: %08X,%08X | DLL: in=%5.0f, current=%f, err=%e\n",syt_timestamp, m_last_timestamp, m_last_timestamp2, f,m_ticks_per_frame,err);
+                    }
+#endif
+
+                    const double coeff=0.0001;
-                    // integrate the error
-
+
+
-                }
-                
@@ -934 +963 @@
-#ifdef DEBUG
-                if(m_last_timestamp<m_last_timestamp2) {
-new_cycles==0
-Warning("timestamp not sequential, but it's wraparound. %08X %08X %08X\n"
+wraparound_occurred
+Output(DEBUG_LEVEL_VERY_VERBOSE,"timestamp not sequential for cycle %d, but it's wraparound. %08X %08X %08X\n",cycle
-                    } else {
-
-
+
+
+
+
-                    }
-                }
@@ -1063 +1094 @@
-        
-        if(tmp<0) {
-
-
+Y_VER
+Y_VER
-            if (-tmp>1000000) debugWarning("SYT VERY LATE: %d!\n",-tmp);
-//                 return true;
@@ -1079 +1110 @@
-#endif
-}
+
+void AmdtpReceiveStreamProcessor::dumpInfo()
+{
+
+    StreamProcessor::dumpInfo();
+    
+        debugOutputShort( DEBUG_LEVEL_NORMAL, "  Device framerate  : %f\n", 24576000.0/m_ticks_per_frame);
+
+}
+
-
-void AmdtpReceiveStreamProcessor::setVerboseLevel(int l) {

branches/libfreebob-2.0/src/libstreaming/AmdtpStreamProcessor.h

@@ -182 +182 @@
-    double getTicksPerFrame() {return m_ticks_per_frame;};
-    
+    void dumpInfo();
+    
-protected:
-

branches/libfreebob-2.0/src/libstreaming/StreamProcessor.cpp

@@ -63 +63 @@
-        debugOutputShort( DEBUG_LEVEL_NORMAL, "  Iso stream info:\n");
-        
-((IsoStream*)this)->
+IsoStream::
-        debugOutputShort( DEBUG_LEVEL_NORMAL, "  Frame counter  : %d\n", m_framecounter);
-        debugOutputShort( DEBUG_LEVEL_NORMAL, "  Xruns          : %d\n", m_xruns);
@@ -74 +74 @@
-        
-        
-;
+
-
-bool StreamProcessor::init()