Changeset 721

Timestamp:

11/23/07 10:09:15 (13 years ago)

Author:

ppalmers

Message:

another update

Files:

• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (2 diffs)
• branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp (modified) (7 diffs)
• branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h (modified) (2 diffs)
• branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.cpp (modified) (4 diffs)

branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

@@ -145 +145 @@
-    {
-        // not enough frames in the buffer,
-
-
-
+
-        // we can still postpone the queueing of the packets
-        // if we are far enough ahead of the presentation time
-        if ( cycles_until_presentation <= min_cycles_before_presentation )
-        {
+            debugOutput ( DEBUG_LEVEL_VERBOSE,
+                        "Insufficient frames (P): N=%02d, CY=%04u, TC=%04u, CUT=%04d\n",
+                        fc, cycle, transmit_at_cycle, cycles_until_transmit );
-            // we are too late
-            // meaning that we in some sort of xrun state
@@ -161 +162 @@
-        else
-        {
+            debugOutput ( DEBUG_LEVEL_VERY_VERBOSE,
+                        "Insufficient frames (NP): N=%02d, CY=%04u, TC=%04u, CUT=%04d\n",
+                        fc, cycle, transmit_at_cycle, cycles_until_transmit );
-            // there is still time left to send the packet
-            // we want the system to give this packet another go

branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp

@@ -464 +464 @@
-            }
-            return RAW1394_ISO_OK;
+        } else { // pick up the possible xruns
+            
-        }
-    }
@@ -512 +514 @@
-    // use the ts parameter. It specifies the time of the block's 
-    // last sample.
-    
-    // determine the time at which we want reception to start
-    float srate = m_manager->getSyncSource().getTicksPerFrame();
-    assert(srate != 0.0);
-    int64_t this_block_length_in_ticks = (int64_t)(((float)nbframes) * srate);
-
+
-    ffado_timestamp_t ts_head_tmp;
-    m_data_buffer->getBufferHeadTimestamp(&ts_head_tmp, &fc);
-    ts_expected = addTicks((uint64_t)ts_head_tmp, this_block_length_in_ticks);
-
+
-    lag_ticks = diffTicks(ts, ts_expected);
-    
-    
-    lag_frames = (((float)lag_ticks) / srate);
-    
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "stream (%p): drifts %6d ticks = %10.5f frames (rate=%10.5f), %lld, %llu, %d\n",
-                 this, lag_ticks, lag_frames, srate, ts, ts_expected, fc);
-
-    if (lag_frames >= 1.0) {
-        // the stream lags
@@ -611 +607 @@
-}
-
-bool StreamProcessor::stop()
-{
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "stop...\n");
-    switch (m_state) {
-        case ePS_Stopped: return true;
-        case ePS_DryRunning:
-            return stopDryRunning(-1);
-        case ePS_Running:
-            return stopRunning(-1) && 
-                   stopDryRunning(-1);
-        default:
-            debugError("Bad state: %s\n", ePSToString(m_state));
-            return false;
-    }
-}
-
-bool
-StreamProcessor::scheduleStateTransition(enum eProcessorState state, uint64_t time_instant)
@@ -661 +641 @@
-    }
-    debugOutput(DEBUG_LEVEL_VERBOSE,"for %s SP (%p)\n", ePTToString(getType()), this);
-
-
+
+
+
+
+
+
+
+
+
+
+
-    if (m_state == ePS_Stopped) {
-        return scheduleStateTransition(ePS_WaitingForStream, tx);
@@ -681 +670 @@
-    }
-    debugOutput(DEBUG_LEVEL_VERBOSE,"for %s SP (%p)\n", ePTToString(getType()), this);
-
-
+
+
+
+
+
+
+
+
+
+
+
-    return scheduleStateTransition(ePS_WaitingForStreamEnable, tx);
-}
@@ -694 +692 @@
-    }
-    debugOutput(DEBUG_LEVEL_VERBOSE,"for %s SP (%p)\n", ePTToString(getType()), this);
-
-
+
+
+
+
+
+
+
+
+
+
+
-    return scheduleStateTransition(ePS_Stopped, tx);
-}
@@ -707 +714 @@
-    }
-    debugOutput(DEBUG_LEVEL_VERBOSE,"for %s SP (%p)\n", ePTToString(getType()), this);
-
-
+
+
+
+
+
+
+
+
+
+
+
-    return scheduleStateTransition(ePS_WaitingForStreamDisable, tx);
-}

branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h

@@ -110 +110 @@
-    bool isDryRunning()
-            {return m_state == ePS_DryRunning;};
+    bool isStopped()
+            {return m_state == ePS_Stopped;};
-
-    // these schedule and wait for the state transition
@@ -127 +129 @@
-    bool init();
-    bool prepare();
-
-    ///> stop the SP from running or dryrunning
-    bool stop();
-
-public: // constructor/destructor

branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.cpp

@@ -268 +268 @@
-    // the received frames will all be presented to the SP
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Finding minimal sync delay...\n");
-=
-=
+ = 
+ = 
-    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-            it != m_ReceiveProcessors.end();
-            ++it ) {
-=
->max_of_min_delay) max_of_min_delay=
+ = 
+ > max_of_min_delay) max_of_min_delay = 
-    }
-
@@ -459 +459 @@
-    assert(m_isoManager);
-
-
-
-
-
+
+
+
-    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-          it != m_ReceiveProcessors.end();
-          ++it ) {
-
-
+
+
+
-        }
-    }
@@ -473 +473 @@
-          it != m_TransmitProcessors.end();
-          ++it ) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -504 +567 @@
-        }
-    }
-
-    return true;
-}