Changeset 1529

Timestamp:

03/29/09 09:39:37 (14 years ago)

Author:

ppalmers

Message:

- don't use DEFER when we have sufficient frames. This is a huge performance killer. This might result in worse latency performance though...
- Also update the Timestampedbuffer DLL when dry-running such that we have a decent estimate of the samplerate. Use a large bandwidth for

this estimation to ensure that it tracks fast enough. Switch to a lower bandwidth once we start the actual streaming.

Files:

• branches/libffado-2.0/config.h.in (modified) (1 diff)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp (modified) (3 diffs)
• branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp (modified) (5 diffs)

branches/libffado-2.0/config.h.in

@@ -206 +206 @@
-#define STREAMPROCESSORMANAGER_DYNAMIC_SYNC_DELAY           0
-
-
+
+
+
-#define STREAMPROCESSOR_DLL_BW_HZ                           0.1
-

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

@@ -529 +529 @@
-            return RAW1394_ISO_DEFER;
-        } else if(result2 == eCRV_OK) {
-            // no problem here
-            // FIXME: cache the period size?
-            unsigned int periodsize = m_StreamProcessorManager.getPeriodSize();
-            unsigned int bufferfill = m_data_buffer->getBufferFill();
-            if(bufferfill >= periodsize) {
-                debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "signal activity, %d>%d\n", 
-                                                        bufferfill, periodsize);
-                //SIGNAL_ACTIVITY_SPM;
-                return RAW1394_ISO_DEFER; // FIXME: might not be needed
-            }
-            return RAW1394_ISO_OK;
-        } else {
@@ -1408 +1398 @@
-            result &= m_data_buffer->setNominalRate(ticks_per_frame);
-            result &= m_data_buffer->setWrapValue(128L*TICKS_PER_SECOND);
-m_dll_bandwidth_hz
+STREAMPROCESSOR_DLL_FAST_BW_HZ
-            result &= m_data_buffer->prepare(); // FIXME: the name
-
@@ -1605 +1595 @@
-            m_in_xrun = false;
-            m_local_node_id = m_1394service.getLocalNodeId() & 0x3f;
+            // reduce the DLL bandwidth to what we require
+            result &= m_data_buffer->setBandwidth(m_dll_bandwidth_hz / (double)TICKS_PER_SECOND);
+            // enable the data buffer
-            m_data_buffer->setTransparent(false);
-            m_last_timestamp2 = 0; // NOTE: no use in checking if we just started running

branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp

@@ -101 +101 @@
-    double bw_rel = bw * tupdate;
-    if(bw_rel >= 0.5) {
-*
+ / 
-        return false;
-    }
+    ENTER_CRITICAL_SECTION;
-    m_dll_b = bw_rel * (DLL_SQRT2 * DLL_2PI);
-    m_dll_c = bw_rel * bw_rel * DLL_2PI * DLL_2PI;
+    EXIT_CRITICAL_SECTION;
-    return true;
-}
@@ -460 +462 @@
-        // while disabled, we don't update the DLL, nor do we write frames
-        // we just set the correct timestamp for the frames
+        incrementFrameCounter(nframes, ts);
+        decrementFrameCounter(nframes);
-        setBufferTailTimestamp(ts);
-    } else {
@@ -793 +797 @@
-
-    // add the offsets
-=
+ = 
-
-    if (ts >= m_wrap_at) {
@@ -814 +818 @@
-    m_buffer_tail_timestamp = ts;
-
-=m_update_period * (double)m_nominal
+ = m_update_period * (double)m_current
-    m_buffer_next_tail_timestamp = (ffado_timestamp_t)((double)m_buffer_tail_timestamp + m_dll_e2);
-
@@ -1101 +1105 @@
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "    Head - Tail         : "TIMESTAMP_FORMAT_SPEC"\n", diff);
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "   DLL Rate             : %f (%f)\n", m_dll_e2, m_dll_e2/m_update_period);
+    debugOutputShort( DEBUG_LEVEL_NORMAL, "   DLL Bandwidth        : %10e 1/ticks (%f Hz)\n", getBandwidth(), getBandwidth() * TICKS_PER_SECOND);
-}
-