Changeset 401

Timestamp:

02/17/07 08:37:50 (16 years ago)

Author:

pieterpalmers

Message:

move some code from amdtp SP to SP base class

Files:

• branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (4 diffs)
• branches/streaming-rework/src/libstreaming/AmdtpStreamProcessor.h (modified) (4 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessor.cpp (modified) (3 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessor.h (modified) (5 diffs)
• branches/streaming-rework/src/libutil/TimestampedBuffer.h (modified) (1 diff)

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

@@ -361 +361 @@
-    return RAW1394_ISO_ERROR;
-
-}
-
-int64_t AmdtpTransmitStreamProcessor::getTimeUntilNextPeriodUsecs() {
-    uint64_t time_at_period=getTimeAtPeriod();
-    
-    uint64_t cycle_timer=m_handler->getCycleTimerTicks();
-    
-    // calculate the time until the next period
-    int64_t until_next=substractTicks(time_at_period,cycle_timer);
-    
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> TAP=%11llu, CTR=%11llu, UTN=%11lld\n",
-        time_at_period, cycle_timer, until_next
-        );
-    
-    // now convert to usecs
-    // don't use the mapping function because it only works
-    // for absolute times, not the relative time we are
-    // using here (which can also be negative).
-    return (int64_t)(((float)until_next) / TICKS_PER_USEC);
-}
-
-uint64_t AmdtpTransmitStreamProcessor::getTimeAtPeriodUsecs() {
-    // then we should convert this into usecs
-    return (uint64_t)((float)getTimeAtPeriod() * TICKS_PER_USEC);
-}
-
-uint64_t AmdtpTransmitStreamProcessor::getTimeAtPeriod() {
-    uint64_t next_period_boundary=m_data_buffer->getTimestampFromTail((m_nb_buffers-1) * m_period);
-    
-    #ifdef DEBUG
-    uint64_t ts,fc;
-    m_data_buffer->getBufferTailTimestamp(&ts,&fc);
-    
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> NPD=%11lld, LTS=%11llu, FC=%5u, TPF=%f\n",
-        next_period_boundary, ts, fc, m_ticks_per_frame
-        );
-    #endif
-    
-    return next_period_boundary;
-}
-
@@ -699 +660 @@
-}
-
-bool AmdtpTransmitStreamProcessor::canClientTransferFrames(unsigned int nbframes) {
-    // there has to be enough space to put the frames in
-    return m_ringbuffer_size_frames - m_data_buffer->getFrameCounter() > nbframes;
-}
-
-bool AmdtpTransmitStreamProcessor::putFrames(unsigned int nbframes, int64_t ts) {
-    m_PeriodStat.mark(m_data_buffer->getBufferFill());
@@ -1099 +1055 @@
-
-    return retval;
-}
-
-int64_t AmdtpReceiveStreamProcessor::getTimeUntilNextPeriodUsecs() {
-    uint64_t time_at_period=getTimeAtPeriod();
-    
-    uint64_t cycle_timer=m_handler->getCycleTimerTicks();
-    
-    // calculate the time until the next period
-    int64_t until_next=substractTicks(time_at_period,cycle_timer);
-    
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> TAP=%11llu, CTR=%11llu, UTN=%11lld\n",
-        time_at_period, cycle_timer, until_next
-        );
-    
-    // now convert to usecs
-    // don't use the mapping function because it only works
-    // for absolute times, not the relative time we are
-    // using here (which can also be negative).
-    return (int64_t)(((float)until_next) / TICKS_PER_USEC);
-}
-
-uint64_t AmdtpReceiveStreamProcessor::getTimeAtPeriodUsecs() {
-    // then we should convert this into usecs
-    return (uint64_t)((float)getTimeAtPeriod()*TICKS_PER_USEC);
-}
-
-uint64_t AmdtpReceiveStreamProcessor::getTimeAtPeriod() {
-    uint64_t next_period_boundary=m_data_buffer->getTimestampFromHead(m_period);
-    
-    #ifdef DEBUG
-    uint64_t ts,fc;
-    m_data_buffer->getBufferTailTimestamp(&ts,&fc);
-    
-    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> NPD=%11lld, LTS=%11llu, FC=%5u, TPF=%f\n",
-        next_period_boundary, ts, fc, m_ticks_per_frame
-        );
-    #endif
-    
-    return next_period_boundary;
-}
-
@@ -1355 +1272 @@
-}
-
-bool AmdtpReceiveStreamProcessor::canClientTransferFrames(unsigned int nbframes) {
-    return m_data_buffer->getFrameCounter() >= (int) nbframes;
-}
-
-bool AmdtpReceiveStreamProcessor::getFrames(unsigned int nbframes) {
-

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

@@ -95 +95 @@
-    bool prepareForEnable(uint64_t time_to_enable_at);
-    
-    bool canClientTransferFrames(unsigned int nbframes);
-    bool putFrames(unsigned int nbframes, int64_t ts); ///< transfer the buffer contents from the client
-
@@ -109 +108 @@
-    unsigned int getMaxPacketSize() {return 4 * (2 + m_syt_interval * m_dimension);}; 
-    
-    int64_t getTimeUntilNextPeriodUsecs();
-
-    uint64_t getTimeAtPeriodUsecs();
-    uint64_t getTimeAtPeriod();
-    int getMinimalSyncDelay();
-    
@@ -183 +178 @@
-    bool prepareForStart();
-        
-    bool canClientTransferFrames(unsigned int nbframes);
-    bool getFrames(unsigned int nbframes); ///< transfer the buffer contents to the client
-
@@ -199 +193 @@
-    void dumpInfo();
-    
-    int64_t getTimeUntilNextPeriodUsecs();
-
-    uint64_t getTimeAtPeriodUsecs();
-    uint64_t getTimeAtPeriod();
-    int getMinimalSyncDelay();
-        

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

@@ -232 +232 @@
-}
-
+int64_t StreamProcessor::getTimeUntilNextPeriodUsecs() {
+    uint64_t time_at_period=getTimeAtPeriod();
+    
+    uint64_t cycle_timer=m_handler->getCycleTimerTicks();
+    
+    // calculate the time until the next period
+    int64_t until_next=substractTicks(time_at_period,cycle_timer);
+    
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> TAP=%11llu, CTR=%11llu, UTN=%11lld\n",
+        time_at_period, cycle_timer, until_next
+        );
+    
+    // now convert to usecs
+    // don't use the mapping function because it only works
+    // for absolute times, not the relative time we are
+    // using here (which can also be negative).
+    return (int64_t)(((float)until_next) / TICKS_PER_USEC);
+}
+
+uint64_t StreamProcessor::getTimeAtPeriodUsecs() {
+    return (uint64_t)((float)getTimeAtPeriod() * TICKS_PER_USEC);
+}
+
-/**
- * Resets the xrun counter, in a atomic way. This
@@ -262 +285 @@
-}
-
+uint64_t ReceiveStreamProcessor::getTimeAtPeriod() {
+    uint64_t next_period_boundary=m_data_buffer->getTimestampFromHead(m_period);
+    
+    #ifdef DEBUG
+    uint64_t ts,fc;
+    m_data_buffer->getBufferTailTimestamp(&ts,&fc);
+    
+    debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "=> NPD=%11lld, LTS=%11llu, FC=%5u, TPF=%f\n",
+        next_period_boundary, ts, fc, m_ticks_per_frame
+        );
+    #endif
+    
+    return next_period_boundary;
+}
+
+bool ReceiveStreamProcessor::canClientTransferFrames(unsigned int nbframes) {
+    return m_data_buffer->getFrameCounter() >= (int) nbframes;
+}
-
-TransmitStreamProcessor::TransmitStreamProcessor( int port, int framerate) 
@@ -278 +319 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -151 +151 @@
-         *         false if it can't
-         */
-{return true;}
+= 0
-        
-        /**
@@ -164 +164 @@
-         * \return the time in usecs
-         */
-virtual int64_t getTimeUntilNextPeriodUsecs() = 0
+int64_t getTimeUntilNextPeriodUsecs()
-        /**
-         * \brief return the time of the next period boundary (in microseconds)
@@ -176 +176 @@
-         * \return the time in usecs
-         */
-virtual uint64_t getTimeAtPeriodUsecs() = 0
+uint64_t getTimeAtPeriodUsecs()
-
-        /**
@@ -251 +251 @@
-        virtual void setVerboseLevel(int l);
-
+    uint64_t getTimeAtPeriod();
+    bool canClientTransferFrames(unsigned int nframes);
+
-protected:
-    bool processWriteBlock(char *data, unsigned int nevents, unsigned int offset) {return true;};
@@ -283 +286 @@
-        virtual void setVerboseLevel(int l);
-
+    uint64_t getTimeAtPeriod();
+    bool canClientTransferFrames(unsigned int nframes);
+
-protected:
-    bool processReadBlock(char *data, unsigned int nevents, unsigned int offset) {return true;};

branches/streaming-rework/src/libutil/TimestampedBuffer.h

@@ -100 +100 @@
-    bool setEventsPerFrame(unsigned int s);
-    bool setBufferSize(unsigned int s);
+    unsigned int getBufferSize() {return m_buffer_size;};
-    
-    bool setWrapValue(uint64_t w);