Changeset 1346

Timestamp:

09/24/08 09:18:51 (15 years ago)

Author:

ppalmers

Message:

add one syncdelay worth of frames to the roundtrip loop. this should allow to use only 2 buffers instead of 3

Files:

• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.h (modified) (1 diff)
• branches/libffado-2.0/src/libstreaming/StreamProcessorManager.cpp (modified) (4 diffs)

branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp

@@ -220 +220 @@
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Setting SP %p SyncDelay to %u ticks, %u frames\n", this, d, frames);
-    #endif
-
+
+
+
+
+
+
+
-}
-
@@ -1511 +1517 @@
-            if (getType() == ePT_Transmit) {
-                ringbuffer_size_frames = m_StreamProcessorManager.getNbBuffers() * m_StreamProcessorManager.getPeriodSize();
+
+                // add sync delay
+                int syncdelay_in_frames = m_StreamProcessorManager.getSyncSource().getSyncDelayFrames();
+                ringbuffer_size_frames += syncdelay_in_frames;
+
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Prefill transmit SP %p with %u frames\n", this, ringbuffer_size_frames);
-                // prefill the buffer

branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.h

@@ -379 +379 @@
-         */
-        unsigned int getSyncDelay() {return m_sync_delay;};
+        unsigned int getSyncDelayFrames();
-        /**
-         * sets the sync delay

branches/libffado-2.0/src/libstreaming/StreamProcessorManager.cpp

@@ -461 +461 @@
-    // lower on average.
-    max_of_min_delay += STREAMPROCESSORMANAGER_SIGNAL_DELAY_TICKS;
-
-
-
-
-
+
-    m_SyncSource->setSyncDelay(max_of_min_delay);
+    unsigned int syncdelay = m_SyncSource->getSyncDelay();
+    debugOutput( DEBUG_LEVEL_VERBOSE, " sync delay = %d => %d ticks (%03us %04uc %04ut)...\n", 
+        max_of_min_delay, syncdelay,
+        (unsigned int)TICKS_TO_SECS(syncdelay),
+        (unsigned int)TICKS_TO_CYCLES(syncdelay),
+        (unsigned int)TICKS_TO_OFFSET(syncdelay));
-
-    //STEP X: when we implement such a function, we can wait for a signal from the devices that they
@@ -599 +601 @@
-    float rate = m_SyncSource->getTicksPerFrame();
-    int64_t delay_in_ticks=(int64_t)(((float)((m_nb_buffers-1) * m_period)) * rate);
+    // also add the sync delay
+    delay_in_ticks += m_SyncSource->getSyncDelay();
-    debugOutput( DEBUG_LEVEL_VERBOSE, "  initial time of transfer %010lld, rate %f...\n",
-                m_time_of_transfer, rate);
@@ -1174 +1178 @@
-        // the data we are putting into the buffer is intended to be transmitted
-        // one ringbuffer size after it has been received
-
+
+
+
+
+
-
-        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
@@ -1250 +1258 @@
-        // the data we are putting into the buffer is intended to be transmitted
-        // one ringbuffer size after it has been received
-
+
+
+
+
-
-        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();