Changeset 1530

Timestamp:

03/29/09 13:30:46 (14 years ago)

Author:

ppalmers

Message:

- make the sync delay an integer amount of packets to avoid phase issues
- debug message updates

Files:

• branches/libffado-2.0/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp (modified) (5 diffs)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.h (modified) (2 diffs)
• branches/libffado-2.0/src/libstreaming/StreamProcessorManager.cpp (modified) (10 diffs)
• branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp (modified) (13 diffs)
• branches/libffado-2.0/src/libutil/TimestampedBuffer.h (modified) (1 diff)

branches/libffado-2.0/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp

@@ -103 +103 @@
-    if(ok) {
-        m_last_timestamp = sytRecvToFullTicks2((uint32_t)CondSwapFromBus16(packet->syt), pkt_ctr);
-
-        //#ifdef DEBUG
-        #if 0

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

@@ -77 +77 @@
-    , m_ticks_per_frame( 0 )
-    , m_dll_bandwidth_hz ( STREAMPROCESSOR_DLL_BW_HZ )
-
+_frames
-    , m_in_xrun( false )
-{
@@ -209 +209 @@
-
-void
-
+
+
+
+
+
+
+
-    #ifdef DEBUG
-
-
+
+
+
-    #endif
- = d
+_frames = frames
-}
-
-unsigned int
-StreamProcessor::getSyncDelayFrames() {
-
-
+
+
+
+
+
+
-}
-
@@ -414 +425 @@
-                        fs_nom, fs_syt, fs_diff, fs_diff_norm);
-            }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                                CYCLE_TIMER_GET_CYCLES(pkt_ctr), m_last_timestamp2,
-                                m_last_timestamp, diff, ticks_per_packet);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
@@ -723 +732 @@
-                debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "Nom fs: %12f, Instantanous fs: %12f, diff: %12f (%12f)\n",
-                           fs_nom, fs_syt, fs_diff, fs_diff_norm);
+//                 debugOutput(DEBUG_LEVEL_VERBOSE, "Diff fs: %12f, m_last_timestamp: %011llu, m_last_timestamp2: %011llu\n",
+//                            fs_diff, m_last_timestamp, m_last_timestamp2);
-                if (fs_diff_norm > 0.01 || fs_diff_norm < -0.01) {
-                    debugWarning( "Instantanous samplerate more than 1%% off nominal. [Nom fs: %12f, Instantanous fs: %12f, diff: %12f (%12f)]\n",
@@ -1551 +1562 @@
-                ringbuffer_size_frames += syncdelay_in_frames;
-
-
+
+
-                // prefill the buffer
-                if(!transferSilence(ringbuffer_size_frames)) {

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

@@ -372 +372 @@
-         * @return the sync delay (in ticks)
-         */
- {return m_sync_delay;}
+
-        unsigned int getSyncDelayFrames();
-        /**
-         * sets the sync delay
+         * 
+         * note: will be rounded to an integer number of packets
+         * 
-         * @param d sync delay
-         */
-d
+ticks
-
-        /**
@@ -449 +452 @@
-        float m_ticks_per_frame;
-        float m_dll_bandwidth_hz;
-
+_frames
-    private:
-        bool m_in_xrun;

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

@@ -491 +491 @@
-    int max_of_min_delay = 0;
-    int min_delay = 0;
+    int packet_size_frames = 0;
+    int max_packet_size_frames = 0;
+
-    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-            it != m_ReceiveProcessors.end();
@@ -496 +499 @@
-        min_delay = (*it)->getMaxFrameLatency();
-        if(min_delay > max_of_min_delay) max_of_min_delay = min_delay;
-
+
+
+
+
+
+
+
+
+
+
-
-    // add some processing margin. This only shifts the time
-    // at which the buffer is transfer()'ed. This makes things somewhat
-
-
-
+
-    max_of_min_delay += signal_delay_ticks;
-
+    // Note that the equivalent number of frames is added to the 
+    // transmit buffer to ensure that it keeps a good buffer fill, no matter
+    // what the sync delay is.
-    m_SyncSource->setSyncDelay(max_of_min_delay);
-    unsigned int syncdelay = m_SyncSource->getSyncDelay();
@@ -530 +543 @@
-        // check if we were woken up too soon
-        time_till_next_period = m_SyncSource->getTimeUntilNextPeriodSignalUsecs();
-Y_VER
+
-        if(time_till_next_period > 0) {
-            // wait for the period
@@ -549 +562 @@
-    }
-    debugOutput( DEBUG_LEVEL_VERBOSE, " sync source frame rate: %f fps (%f tpf)\n", syncrate, tpf);
+
+    m_SyncSource->setSyncDelay(max_of_min_delay);
+    syncdelay = m_SyncSource->getSyncDelay();
+    debugOutput( DEBUG_LEVEL_VERBOSE, " updated sync delay = %d => %d ticks (%f frames) (%03us %04uc %04ut)...\n", 
+        max_of_min_delay, syncdelay, syncdelay/tpf,
+        (unsigned int)TICKS_TO_SECS(syncdelay),
+        (unsigned int)TICKS_TO_CYCLES(syncdelay),
+        (unsigned int)TICKS_TO_OFFSET(syncdelay));
-
-    // we now should have decent sync info on the sync source
@@ -563 +584 @@
-    // this is the time window we have to setup all SP's such that they 
-    // can start wet-running correctly.
+    // we have to round this time to an integer number of audio packets
+    double time_for_startup_abs = (double)(cycles_for_startup * TICKS_PER_CYCLE);
+    int time_for_startup_frames = (int)(time_for_startup_abs / tpf);
+    time_for_startup_frames = ((time_for_startup_frames / max_packet_size_frames) + 1) * max_packet_size_frames;
+    uint64_t time_for_startup_ticks = (uint64_t)((float)time_for_startup_frames * tpf);
+
-    time_of_first_sample = addTicks(time_of_first_sample,
-
+
+
+
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "  => first sample at TS=%011llu (%03us %04uc %04ut)...\n", 
@@ -571 +600 @@
-        (unsigned int)TICKS_TO_CYCLES(time_of_first_sample),
-        (unsigned int)TICKS_TO_OFFSET(time_of_first_sample));
-
-    #ifdef DEBUG
-    // the time at which the previous period would have passed is the
-    // time of the first sample received, minus one frame.
-    //m_time_of_transfer2 = substractTicks(time_of_first_sample, (uint64_t)m_SyncSource->getTicksPerFrame());
-    m_time_of_transfer2 = time_of_first_sample;
-    #endif
-
-    // we should start wet-running the transmit SP's some cycles in advance
@@ -603 +625 @@
-          ++it ) {
-        (*it)->setBufferHeadTimestamp(time_of_first_sample);
+        ffado_timestamp_t ts;
+        signed int fc;
+        (*it)->getBufferHeadTimestamp ( &ts, &fc );
+        debugOutput( DEBUG_LEVEL_VERBOSE, " transmit buffer tail %010lld => head TS %010lld, fc=%d...\n",
+                    time_of_first_sample, (uint64_t)ts, fc);
-    }
-
@@ -659 +686 @@
-    m_time_of_transfer = m_SyncSource->getTimeAtPeriod();
-
-still very 
+
-    float rate = m_SyncSource->getTicksPerFrame();
+
+    #ifdef DEBUG
+    // the time at which the previous period would have passed
+    m_time_of_transfer2 = m_time_of_transfer;
+    m_time_of_transfer2 = substractTicks(m_time_of_transfer2, (uint64_t)(m_period * rate));
+    #endif
+
+    debugOutput( DEBUG_LEVEL_VERBOSE, "  initial time of transfer %010lld, rate %f...\n",
+                m_time_of_transfer, rate);
+
-    int64_t delay_in_ticks = (int64_t)(((float)((m_nb_buffers-1) * m_period)) * rate);
-    // also add the sync delay
-    delay_in_ticks = addTicks(delay_in_ticks, m_SyncSource->getSyncDelay());
-    debugOutput( DEBUG_LEVEL_VERBOSE, "  initial time of transfer %010lld, rate %f...\n",
-                m_time_of_transfer, rate);
-
-
@@ -679 +714 @@
-
-    int64_t transmit_tail_timestamp = addTicks(m_time_of_transfer, delay_in_ticks);
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "  preset transmit tail TS %010lld, rate %f...\n",
-                transmit_tail_timestamp, rate);
@@ -686 +720 @@
-        it != m_TransmitProcessors.end();
-        ++it ) {
+        (*it)->setTicksPerFrame(rate);
-        (*it)->setBufferTailTimestamp(transmit_tail_timestamp);
-
+
+
+
+
+
-    }
-

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

@@ -58 +58 @@
-    pthread_mutex_unlock(&m_framecounter_lock); \
-    }
+
-
-namespace Util {
@@ -71 +72 @@
-      m_wrap_at(0xFFFFFFFFFFFFFFFFLLU),
-      m_Client(c), m_framecounter(0),
-0
-0
+TIMESTAMP_MAX + 1
+TIMESTAMP_MAX + 1
-      m_dll_e2(0.0), m_dll_b(DLL_COEFF_B), m_dll_c(DLL_COEFF_C),
-      m_nominal_rate(0.0), m_current_rate(0.0), m_update_period(0)
@@ -202 +203 @@
-    ENTER_CRITICAL_SECTION;
-
-
+
+
-    m_buffer_next_tail_timestamp = (ffado_timestamp_t)((double)m_buffer_tail_timestamp + m_dll_e2);
-
@@ -331 +333 @@
- *
- * Resets the TimestampedBuffer, clearing the buffers and counters.
-Also resets the DLL to the nominal values.
+[DEL Also resets the DLL to the nominal values. DEL]
- *
- * \note when this is called, you should make sure that the buffer
@@ -344 +346 @@
-
-    m_current_rate = m_nominal_rate;
-
-
-
+
-
-    return true;
@@ -402 +402 @@
-
-    // init the DLL
-
-
-
-
+
+
+
+
+
+
-
-    return true;
@@ -462 +464 @@
-        // while disabled, we don't update the DLL, nor do we write frames
-        // we just set the correct timestamp for the frames
-
-
+
+
+
+
-        setBufferTailTimestamp(ts);
-    } else {
@@ -502 +506 @@
-        return false;
-    }
-
+
-    // make sure the head timestamp remains identical
-    signed int fc;
@@ -845 +849 @@
-#ifdef DEBUG
-    if (new_timestamp >= m_wrap_at) {
-
+ 
-    }
-#endif
@@ -854 +858 @@
-
-    // add the time
-nominal_rate * (float)m_framecounter
+current_rate * (float)(m_framecounter)
-
-    if (ts >= m_wrap_at) {
@@ -864 +868 @@
-    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);
-
@@ -949 +953 @@
-    ffado_timestamp_t retval;
-    ENTER_CRITICAL_SECTION;
--
+ - 
-    EXIT_CRITICAL_SECTION;
-    return retval;
@@ -1103 +1107 @@
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "   Timestamps           : head: "TIMESTAMP_FORMAT_SPEC", Tail: "TIMESTAMP_FORMAT_SPEC", Next tail: "TIMESTAMP_FORMAT_SPEC"\n",
-                                          ts_head, m_buffer_tail_timestamp, m_buffer_next_tail_timestamp);
-\n", diff
+ (%f frames)\n", diff, diff/m_dll_e2*m_update_period
-    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);

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

@@ -31 +31 @@
-//typedef float ffado_timestamp_t;
-//#define TIMESTAMP_FORMAT_SPEC "%14.3f"
+
-typedef double ffado_timestamp_t;
-#define TIMESTAMP_FORMAT_SPEC "%14.3f"
+#define TIMESTAMP_MAX 3145728000.0
+
-// typedef int64_t ffado_timestamp_t;
-// #define TIMESTAMP_FORMAT_SPEC "%012lld"