Changeset 495

Timestamp:

07/24/07 17:29:22 (16 years ago)

Author:

jwoithe

Message:

MOTU: more debugging aids.
TimestampedBuffer?: update internal DLL state when changing the tick offset to maintain consistency. Helps for MOTU, other interfaces need testing.

Files:

• trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp (modified) (3 diffs)
• trunk/libffado/src/libutil/TimestampedBuffer.cpp (modified) (1 diff)

trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp

@@ -239 +239 @@
-    int64_t timestamp = ts_head;
-
+//debugOutput(DEBUG_LEVEL_VERBOSE,"tx cycle %d, base timestamp %lld\n",cycle, ts_head);
-#if 0
-if (cycle<10000) {
@@ -1156 +1157 @@
-            // to stop these warnings most of the time and allow for a
-            // smoother startup.
-
-
+
+
+
-//debugOutput(DEBUG_LEVEL_VERBOSE,"%p, last ts=%lld, ts=%lld, lts2=%lld\n", m_data_buffer, m_last_timestamp, ts, m_last_timestamp2);
-
@@ -1164 +1166 @@
-
-        debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "put packet...\n");
-cycle=%d, mp=%d, last ts=%lld, ts2=%lld\n",cycle,m_period, m_last_timestamp, m_last_timestamp2
+rx cycle=%d, last ts=%lld\n",cycle, m_last_timestamp
-
-        //=> process the packet

trunk/libffado/src/libutil/TimestampedBuffer.cpp

@@ -204 +204 @@
-bool TimestampedBuffer::setTickOffset(ffado_timestamp_t nticks) {
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Setting ticks offset to "TIMESTAMP_FORMAT_SPEC"\n",nticks);
+
+    // JMW: I think we need to update the internal DLL state to take account
+    // of the new offset.  Doing so certainly makes for a smoother MOTU
+    // startup.
+    pthread_mutex_lock(&m_framecounter_lock);
+    m_buffer_tail_timestamp = m_buffer_tail_timestamp - m_tick_offset + nticks;
+    m_buffer_next_tail_timestamp = (ffado_timestamp_t)((float)m_buffer_tail_timestamp + m_dll_e2);
-    m_tick_offset=nticks;
+    pthread_mutex_unlock(&m_framecounter_lock);
+
-    return true;
-}