Changeset 709

Timestamp:

11/04/07 10:47:05 (13 years ago)

Author:

ppalmers

Message:

some more streaming system updates.
this works with the saffire up till -n2 -p256

Files:

• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpStreamProcessor.cpp (modified) (2 diffs)
• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpStreamProcessor.h (modified) (2 diffs)
• branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp (modified) (1 diff)
• branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h (modified) (1 diff)
• branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.cpp (modified) (2 diffs)

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

@@ -386 +386 @@
-}
-
-int AmdtpTransmitStreamProcessor::getMinimalSyncDelay() {
-    return 0;
-}
-
-bool AmdtpTransmitStreamProcessor::prefill() {
-
@@ -1036 +1032 @@
-}
-
-// returns the delay between the actual (real) time of a timestamp as received,
-// and the timestamp that is passed on for the same event. This is to cope with
-// ISO buffering
-int AmdtpReceiveStreamProcessor::getMinimalSyncDelay() {
-    return ((int)(m_handler->getWakeupInterval() * m_syt_interval * getTicksPerFrame()));
-}
-
-void AmdtpReceiveStreamProcessor::dumpInfo() {
-    StreamProcessor::dumpInfo();

branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpStreamProcessor.h

@@ -109 +109 @@
-    unsigned int getMaxPacketSize() {return 4 * (2 + m_syt_interval * m_dimension);};
-
-    int getMinimalSyncDelay();
-
-protected:
-    bool processWriteBlock(char *data, unsigned int nevents, unsigned int offset);
@@ -197 +195 @@
-
-    void dumpInfo();
-
-    int getMinimalSyncDelay();
-
-protected:
-

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

@@ -179 +179 @@
-
-
+int StreamProcessor::getMaxFrameLatency() {
+    if (getType() == E_Receive) {
+        return (int)(m_handler->getWakeupInterval() * TICKS_PER_CYCLE);
+    } else {
+        return (int)(m_handler->getWakeupInterval() * TICKS_PER_CYCLE);
+    }
+}
+
-bool StreamProcessor::isRunning() {
-    return m_running;

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

@@ -214 +214 @@
-
-        /**
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-        bool setSyncSource(StreamProcessor *s);

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

@@ -320 +320 @@
-    }
-
-    // we want to make sure that everything is running well,
-    // so wait for a while
-//     usleep(USECS_PER_CYCLE * CYCLES_TO_SLEEP_AFTER_RUN_SIGNAL);
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, " StreamProcessor streams running...\n");
-
+    // now find out how long we have to delay the wait operation such that
+    // the received frames will all be presented to the SP
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Finding minimal sync delay...\n");
-
-    int max_of_min_delay=0;
-    int min_delay=0;
@@ -333 +330 @@
-            it != m_ReceiveProcessors.end();
-            ++it ) {
-inimalSyncDela
+axFrameLatenc
-        if(min_delay>max_of_min_delay) max_of_min_delay=min_delay;
-    }
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-    m_SyncSource->setSyncDelay(max_of_min_delay);
-