Changeset 703 for branches

Timestamp:

11/04/07 03:33:35 (15 years ago)

Author:

ppalmers

Message:

- rework of streaming startup
- started moving files around to enhance structure

Files:

• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpPort.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/AmdtpPort.cpp)
• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpPort.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/AmdtpPort.h)
• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpPortInfo.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/AmdtpPortInfo.cpp)
• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpPortInfo.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/AmdtpPortInfo.h)
• branches/ppalmers-streaming/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (15 diffs)
• branches/ppalmers-streaming/src/libstreaming/AmdtpStreamProcessor.h (modified) (2 diffs)
• branches/ppalmers-streaming/src/libstreaming/cycletimer.h (modified) (5 diffs)
• branches/ppalmers-streaming/src/libstreaming/IsoHandlerManager.cpp (modified) (2 diffs)
• branches/ppalmers-streaming/src/libstreaming/IsoHandlerManager.h (modified) (2 diffs)
• branches/ppalmers-streaming/src/libstreaming/motu/MotuPort.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/MotuPort.cpp)
• branches/ppalmers-streaming/src/libstreaming/motu/MotuPort.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/MotuPort.h)
• branches/ppalmers-streaming/src/libstreaming/motu/MotuPortInfo.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/MotuPortInfo.cpp)
• branches/ppalmers-streaming/src/libstreaming/motu/MotuPortInfo.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/MotuPortInfo.h)
• branches/ppalmers-streaming/src/libstreaming/motu/MotuStreamProcessor.cpp (moved) (moved from branches/ppalmers-streaming/src/libstreaming/MotuStreamProcessor.cpp)
• branches/ppalmers-streaming/src/libstreaming/motu/MotuStreamProcessor.h (moved) (moved from branches/ppalmers-streaming/src/libstreaming/MotuStreamProcessor.h)
• branches/ppalmers-streaming/src/libstreaming/StreamProcessor.cpp (modified) (4 diffs)
• branches/ppalmers-streaming/src/libstreaming/StreamProcessor.h (modified) (4 diffs)
• branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.cpp (modified) (14 diffs)
• branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.h (modified) (2 diffs)

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

@@ -38 +38 @@
-namespace Streaming {
-
-NORMAL
-NORMAL
+VERBOSE
+VERBOSE
-
-
@@ -84 +84 @@
-    
-    if (cycle<0) {
-VERY_VERBOSE,"Xmit handler for cycle %d, (running=%d, enabled=%d,
-, m_disabled, m_is_disabled
+ULTRA_VERBOSE,"Xmit handler for cycle %d, (running=
+
-        
-        *tag = 0;
@@ -94 +94 @@
-    }
-    
-VERY_VERBOSE,"Xmit handler for cycle %d, (running=%d, enabled=%d,
-, m_disabled, m_is_disabled
+ULTRA_VERBOSE,"Xmit handler for cycle %d, (running=
+
-    
-    m_last_cycle=cycle;
@@ -153 +153 @@
-    uint64_t ts_head;
-    signed int fc;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // the base timestamp is the one of the next sample in the buffer
-    ffado_timestamp_t ts_head_tmp;
@@ -216 +177 @@
-    ts_head=(uint64_t)ts_head_tmp;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return RAW1394_ISO_ERROR;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -384 +354 @@
-    m_WakeupStat.reset();
-
-
-
-
-
-
+
-
-    // reset all non-device specific stuff
@@ -589 +555 @@
-
-bool AmdtpTransmitStreamProcessor::prepareForStop() {
-    disable();
-    return true;
-}
-
-bool AmdtpTransmitStreamProcessor::prepareForEnable(uint64_t time_to_enable_at) {
-
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Preparing to enable...\n");
-
-    // for the transmit SP, we have to initialize the
-    // buffer timestamp to something sane, because this timestamp
-    // is used when it is SyncSource
-
-    // the time we initialize to will determine the time at which
-    // the first sample in the buffer will be sent, so we should
-    // make it at least 'time_to_enable_at'
-
-    uint64_t now=m_handler->getCycleTimer();
-    unsigned int now_secs=CYCLE_TIMER_GET_SECS(now);
-
-    // check if a wraparound on the secs will happen between
-    // now and the time we start
-    int until_enable=(int)time_to_enable_at - (int)CYCLE_TIMER_GET_CYCLES(now);
-
-    if(until_enable>4000) {
-        // wraparound on CYCLE_TIMER_GET_CYCLES(now)
-        // this means that we are late starting up,
-        // and that the start lies in the previous second
-        if (now_secs==0) now_secs=127;
-        else now_secs--;
-    } else if (until_enable<-4000) {
-        // wraparound on time_to_enable_at
-        // this means that we are early and that the start
-        // point lies in the next second
-        now_secs++;
-        if (now_secs>=128) now_secs=0;
-    }
-
-    uint64_t ts_head= now_secs*TICKS_PER_SECOND;
-    ts_head+=time_to_enable_at*TICKS_PER_CYCLE;
-
-    // we also add the nb of cycles we transmit in advance
-    ts_head=addTicks(ts_head, TRANSMIT_ADVANCE_CYCLES*TICKS_PER_CYCLE);
-
-    m_data_buffer->setBufferTailTimestamp(ts_head);
-
-
-    if (!StreamProcessor::prepareForEnable(time_to_enable_at)) {
@@ -666 +591 @@
-    m_PeriodStat.mark(m_data_buffer->getBufferFill());
-
-VERY
+ULTRA
-
-    // transfer the data
-    m_data_buffer->blockProcessWriteFrames(nbframes, ts);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-/*
- * write received events to the stream ringbuffers.
@@ -800 +745 @@
-                                             IEC61883_AM824_LABEL_MIDI_1X));
-
-VERY
+ULTRA
-                    mp->getName().c_str(), mp->getPosition(), mp->getLocation(), dbc, nevents, m_dimension);
-VERY
+ULTRA
-                    data, target_event, tmpval);
-                    
@@ -937 +882 @@
-    }
-
-, disabled=%d,%d
+
-        channel, cycle,ntohs(packet->syt),
-        CYCLE_TIMER_GET_CYCLES(ntohs(packet->syt)), CYCLE_TIMER_GET_OFFSET(ntohs(packet->syt)),
-,m_disabled,m_is_disabled
+
-
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
@@ -952 +897 @@
-
-#endif
-    if (!m_disabled && m_is_disabled) { // this means that we are trying to enable
-        // check if we are on or past the enable point
-        int cycles_past_enable=diffCycles(cycle, m_cycle_to_enable_at);
-
-        if (cycles_past_enable >= 0) {
-            m_is_disabled=false;
-            debugOutput(DEBUG_LEVEL_VERBOSE,"Enabling StreamProcessor %p at %d (SYT=%04X)\n",
-                this, cycle, ntohs(packet->syt));
-            // the previous timestamp is the one we need to start with
-            // because we're going to update the buffer again this loop
-            // using writeframes
-            m_data_buffer->setBufferTailTimestamp(m_last_timestamp);
-
-        } else {
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
-                "will enable StreamProcessor %p at %u, now is %d\n",
-                    this, m_cycle_to_enable_at, cycle);
-        }
-    } else if (m_disabled && !m_is_disabled) {
-        // trying to disable
-        debugOutput(DEBUG_LEVEL_VERBOSE,"disabling StreamProcessor %p at %u\n", this, cycle);
-        m_is_disabled=true;
-    }
-
-    // check if this is a valid packet
@@ -1011 +933 @@
-        }
-
-        //=> don't process the stream samples when it is not enabled.
-        if(m_is_disabled) {
-
-            // we keep track of the timestamp here
-            // this makes sure that we will have a somewhat accurate
-            // estimate as to when a period might be ready. i.e. it will not
-            // be ready earlier than this timestamp + period time
-
-            // the next (possible) sample is not this one, but lies
-            // SYT_INTERVAL * rate later
-            uint64_t ts=addTicks(m_last_timestamp,
-                                 (uint64_t)((float)m_syt_interval * getTicksPerFrame()));
-
-            // set the timestamp as if there will be a sample put into
-            // the buffer by the next packet.
-            m_data_buffer->setBufferTailTimestamp(ts);
-
-            return RAW1394_ISO_DEFER;
-        }
-
-        #ifdef DEBUG_OFF
-        if((cycle % 1000) == 0) {
@@ -1065 +967 @@
-        } else {
-
-
-
+// 
+// 
-
-            m_xruns++;
-
-            // disable the processing, will be re-enabled when
-            // the xrun is handled
-            m_disabled=true;
-            m_is_disabled=true;
-
-            retval=RAW1394_ISO_DEFER;
@@ -1275 +1172 @@
-bool AmdtpReceiveStreamProcessor::getFrames(unsigned int nbframes, int64_t ts) {
-
-    m_PeriodStat.mark(m_data_buffer->getBufferFill());
-    uint64_t ts_head;
-    signed int fc;
-    int32_t lag_ticks;
-    float lag_frames;
-
-    // in order to sync up multiple received streams, we should 
-    // use the ts parameter. It specifies the time of the block's 
-    // first sample.
-    
-    ffado_timestamp_t ts_head_tmp;
-    m_data_buffer->getBufferHeadTimestamp(&ts_head_tmp, &fc);
-    ts_head=(uint64_t)ts_head_tmp;
-    lag_ticks=diffTicks(ts, ts_head);
-    float rate=m_data_buffer->getRate();
-    
-    assert(rate!=0.0);
-    
-    lag_frames=(((float)lag_ticks)/rate);
-    
-    if (lag_frames>=1.0) {
-        // the stream leads
-        debugOutput( DEBUG_LEVEL_VERBOSE, "stream (%p): lags  with %6d ticks = %10.5f frames (rate=%10.5f)\n",this,lag_ticks,lag_frames,rate);
-        
-        if (lag_frames>=10.0) {
-            debugOutput( DEBUG_LEVEL_VERBOSE, "  %lld, %llu, %d\n", ts, ts_head, fc);
-        }
-        
-        // ditch the excess frames
-        char dummy[m_data_buffer->getBytesPerFrame()]; // one frame of garbage
-        int frames_to_ditch=(int)(lag_frames);
-        debugOutput( DEBUG_LEVEL_VERBOSE, "stream (%p): ditching %d frames (@ ts=%lld)\n",this,frames_to_ditch,ts);
-        
-        while (frames_to_ditch--) {
-//             m_data_buffer->readFrames(1, dummy);
-        }
-        
-    } else if (lag_frames<=-1.0) {
-        // the stream leads
-        debugOutput( DEBUG_LEVEL_VERBOSE, "stream (%p): leads with %6d ticks = %10.5f frames (rate=%10.5f)\n",this,lag_ticks,lag_frames,rate);
-        
-        if (lag_frames<=-10.0) {
-            debugOutput( DEBUG_LEVEL_VERBOSE, "  %lld, %llu, %d\n", ts, ts_head, fc);
-        }
-        
-        // add some padding frames
-        int frames_to_add=(int)lag_frames;
-        debugOutput( DEBUG_LEVEL_VERBOSE, "stream (%p): adding %d frames (@ ts=%lld)\n",this,-frames_to_add,ts);
-        
-        while (frames_to_add++) {
-//             m_data_buffer->writeDummyFrame();
-        }
-    }
-    
-    // ask the buffer to process nbframes of frames
-    // using it's registered client's processReadBlock(),
@@ -1334 +1177 @@
-    m_data_buffer->blockProcessReadFrames(nbframes);
-
+    return true;
+}
+
+bool AmdtpReceiveStreamProcessor::getFramesDry(unsigned int nbframes, int64_t ts) {
+    int frames_to_ditch=(int)(nbframes);
+    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "stream (%p): dry run %d frames (@ ts=%lld)\n",
+                 this, frames_to_ditch, ts);
+    char dummy[m_data_buffer->getBytesPerFrame()]; // one frame of garbage
+
+    while (frames_to_ditch--) {
+        m_data_buffer->readFrames(1, dummy);
+    }
-    return true;
-}

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

@@ -96 +96 @@
-
-    bool putFrames(unsigned int nbframes, int64_t ts); ///< transfer the buffer contents from the client
+    bool putFramesDry(unsigned int nbframes, int64_t ts);
-
-    // We have 1 period of samples = m_period
@@ -188 +189 @@
-
-    bool getFrames(unsigned int nbframes, int64_t ts); ///< transfer the buffer contents to the client
+    bool getFramesDry(unsigned int nbframes, int64_t ts);
-
-    // We have 1 period of samples = m_period

branches/ppalmers-streaming/src/libstreaming/cycletimer.h

@@ -66 +66 @@
-                                      )
-#define CYCLE_TIMER_WRAP_TICKS(x) ((x % TICKS_PER_SECOND))
+
+#define INVALID_TIMESTAMP_TICKS     0xFFFFFFFFFFFFFFFFULL
-
-DECLARE_GLOBAL_DEBUG_MODULE;
@@ -247 +249 @@
-    uint64_t timestamp;
-
-8X CY=%04X CTR=%08
-rcv_cycle,
+4llX CY=%u CTR=%08ll
+ rcv_cycle, 
-
-    // reconstruct the full cycle
@@ -309 +311 @@
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
-            debugWarning("back-converted timestamp not equal to SYT\n");
-
+l
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }
@@ -333 +335 @@
-    uint64_t timestamp;
-
-X CY=%04X CTR=%08
+llX CY=%04X CTR=%08ll
-        syt_timestamp,xmt_cycle,ctr_now);
-
@@ -395 +397 @@
-        if(( TICKS_TO_CYCLE_TIMER(timestamp) & 0xFFFF) != syt_timestamp) {
-            debugWarning("back-converted timestamp not equal to SYT\n");
-
+l
-                  timestamp, TICKS_TO_CYCLE_TIMER(timestamp), syt_timestamp);
-        }

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

@@ -86 +86 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");
+    pthread_mutex_init(&m_debug_lock, NULL);
-
-    return true;
@@ -107 +108 @@
-//     updateCycleTimers();
-
+    pthread_mutex_lock(&m_debug_lock);
+
-    if(!iterate()) {
-        debugFatal("Could not iterate the isoManager\n");
+        pthread_mutex_unlock(&m_debug_lock);
-        return false;
-    }
+
+    pthread_mutex_unlock(&m_debug_lock);
-
-    return true;

branches/ppalmers-streaming/src/libstreaming/IsoHandlerManager.h

@@ -102 +102 @@
-        bool Execute(); // note that this is called in we while(running) loop
-        bool Init();
+        pthread_mutex_t m_debug_lock;
-
-    // the state machine
@@ -149 +150 @@
-        Util::PosixThread *m_isoManagerThread;
-
-
-        // debug stuff
-        DECLARE_DEBUG_MODULE;

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

@@ -211 +211 @@
-    }
-#endif
+    m_data_buffer->enable();
-
-    m_disabled=false;
@@ -217 +218 @@
-
-bool StreamProcessor::disable()  {
+    m_data_buffer->disable();
-    m_disabled=true;
-    return true;
@@ -261 +263 @@
-    int32_t until_next=diffTicks(time_at_period,cycle_timer);
-
-l
+
-        time_at_period, cycle_timer, until_next
-        );
@@ -274 +276 @@
-uint64_t StreamProcessor::getTimeAtPeriodUsecs() {
-    return (uint64_t)((float)getTimeAtPeriod() * TICKS_PER_USEC);
+}
+
+bool StreamProcessor::dropFrames(unsigned int nbframes) {
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "StreamProcessor::dropFrames(%d)\n", nbframes);
+    return m_data_buffer->dropFrames(nbframes);
-}
-

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

@@ -91 +91 @@
-    virtual bool putFrames(unsigned int nbframes, int64_t ts) = 0; ///< transfer the buffer contents from client
-    virtual bool getFrames(unsigned int nbframes, int64_t ts) = 0; ///< transfer the buffer contents to the client
+    virtual bool putFramesDry(unsigned int nbframes, int64_t ts) = 0; ///< dry-process the buffer contents
+    virtual bool getFramesDry(unsigned int nbframes, int64_t ts) = 0; ///< dry-process the buffer contents
-
-    virtual bool reset(); ///< reset the streams & buffers (e.g. after xrun)
@@ -149 +151 @@
-         */
-        virtual bool canClientTransferFrames(unsigned int nframes) = 0;
+
+        /**
+         * @brief drop nframes from the internal buffer
+         *
+         * this function drops nframes from the internal buffers, without any
+         * specification on what frames are dropped. Timestamps are not updated.
+         *
+         * @param nframes number of frames
+         * @return true if the operation was successful
+         */
+        virtual bool dropFrames(unsigned int nframes);
-
-        /**
@@ -242 +255 @@
-                  {return RAW1394_ISO_STOP;};
-        virtual bool putFrames(unsigned int nbframes, int64_t ts) {return false;};
+        virtual bool putFramesDry(unsigned int nbframes, int64_t ts) {return false;};
-
-        virtual enum raw1394_iso_disposition putPacket(unsigned char *data, unsigned int length,
@@ -276 +290 @@
-                  unsigned int cycle, unsigned int dropped) {return RAW1394_ISO_STOP;};
-        virtual bool getFrames(unsigned int nbframes, int64_t ts) {return false;};
-
-
-
-
-
+
+
-     virtual void setVerboseLevel(int l);
-

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

@@ -173 +173 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");
-
-
+ + 1
-
-    if(!m_isoManager) {
@@ -296 +296 @@
-        }
-
-        // EXPERIMENT:
-        // the only stream that should be running is the sync
-        // source stream, as this is the one that defines
-        // when to signal buffers. Maybe we get an xrun at startup,
-        // but that should be handled.
-
-        // the problem is that otherwise a setup with a device
-        // that waits for decent input before sending output
-        // will not start up (e.g. the bounce device), because
-        // all streams are required to be running.
-
-        // other streams still have at least ENABLE_DELAY_CYCLES cycles
-        // to start up
-//         if(!m_SyncSource->isRunning()) notRunning=true;
-
-        usleep(1000);
-
+ 
-    }
-
@@ -342 +327 @@
-    // we want to make sure that everything is running well,
-    // so wait for a while
-
+// 
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, " StreamProcessor streams running...\n");
@@ -373 +358 @@
-            it != m_ReceiveProcessors.end();
-            ++it ) {
+        // get the receive SP's going at receiving data
+        (*it)->m_data_buffer->setTransparent(false);
-        (*it)->reset();
-    }
@@ -379 +366 @@
-            it != m_TransmitProcessors.end();
-            ++it ) {
+        // make sure the SP retains it's prefilled data
+        (*it)->m_data_buffer->setTransparent(false);
-        (*it)->reset();
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Enabling StreamProcessors...\n");
-
@@ -387 +435 @@
-
-    // FIXME: this should not be in cycles, but in 'time'
+    // FIXME: remove the timestamp
-    unsigned int enable_at=TICKS_TO_CYCLES(now)+ENABLE_DELAY_CYCLES;
-    if (enable_at > 8000) enable_at -= 8000;
@@ -395 +444 @@
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -492 +577 @@
-    }
-
+    debugOutput( DEBUG_LEVEL_VERBOSE, "Disabling StreamProcessors...\n");
+        if (!disableStreamProcessors()) {
+        debugFatal("Could not disable StreamProcessors...\n");
+        return false;
+    }
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Stopping handlers...\n");
@@ -585 +675 @@
-
-    // now we wait for the SP's to get enabled
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+
+// 
+// 
+// 
+// 
+// 
+
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+
+// 
+// 
+
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, " => all StreamProcessors enabled...\n");
@@ -661 +751 @@
-            ++it ) {
-        (*it)->disable();
+        (*it)->m_data_buffer->setTransparent(true);
-    }
-
@@ -667 +758 @@
-            ++it ) {
-        (*it)->disable();
+        (*it)->m_data_buffer->setTransparent(true);
-    }
-
@@ -833 +925 @@
-    }
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "XF at %011llu ticks, RBF=%d, XBF=%d, SUM=%d...\n",
-rcv_bf,xmt_bf,
+ rcv_bf, xmt_bf, 
-
-#endif
@@ -925 +1017 @@
-        int64_t one_frame_in_ticks=(int64_t)(((float)m_period)*rate);
-        
-
+ 
-        
-        if(receive_timestamp<0) {
@@ -951 +1043 @@
-                it != m_TransmitProcessors.end();
-                ++it ) {
-
-
+
+
+
+
+
+
+
+
+
+
-                debugOutput(DEBUG_LEVEL_VERBOSE, "could not putFrames(%u,%llu) to stream processor (%p)\n",
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                return false; // buffer overrun
-            }

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

@@ -87 +87 @@
-    bool transfer(); ///< transfer the buffer contents from/to client
-    bool transfer(enum StreamProcessor::EProcessorType); ///< transfer the buffer contents from/to client (single processor type)
+    
+    bool dryRun();
+    bool dryRun(enum StreamProcessor::EProcessorType);
-
-    int getDelayedUsecs() {return m_delayed_usecs;};
@@ -93 +96 @@
-
-private:
+    void resetXrunCounters();
+
-    int m_delayed_usecs;
-    // this stores the time at which the next transfer should occur