Changeset 714

Timestamp:

11/11/07 09:50:28 (15 years ago)

Author:

ppalmers

Message:

- cleanup of streaming interfaces
- doesn't work yet

Files:

• branches/ppalmers-streaming/src/ffado_streaming.cpp (modified) (3 diffs)
• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (4 diffs)
• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.h (modified) (1 diff)
• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (4 diffs)
• branches/ppalmers-streaming/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.h (modified) (1 diff)
• branches/ppalmers-streaming/src/libstreaming/generic/IsoStream.cpp (modified) (1 diff)
• branches/ppalmers-streaming/src/libstreaming/generic/IsoStream.h (modified) (3 diffs)
• branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp (modified) (9 diffs)
• branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h (modified) (9 diffs)
• branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.cpp (modified) (12 diffs)
• branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.h (modified) (2 diffs)
• branches/ppalmers-streaming/src/libstreaming/util/IsoHandlerManager.cpp (modified) (2 diffs)
• branches/ppalmers-streaming/tests/SytMonitor.cpp (modified) (1 diff)
• branches/ppalmers-streaming/tests/test-cycletimer.cpp (modified) (1 diff)

branches/ppalmers-streaming/src/ffado_streaming.cpp

@@ -170 +170 @@
-        // prepare the device
-        device->prepare();
-
-        int j=0;
-        for(j=0; j<device->getStreamCount();j++) {
@@ -176 +175 @@
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Registering stream processor %d of device %d with processormanager\n",j,i);
-            if (!dev->processorManager->registerProcessor(streamproc)) {
-
+
+
+
+
+
-            }
-        }
@@ -331 +334 @@
-
-int ffado_streaming_transfer_capture_buffers(ffado_device_t *dev) {
-E
+ePT
-}
-
-int ffado_streaming_transfer_playback_buffers(ffado_device_t *dev) {
-E_Transmit
+ePT_Receive
-}
-

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

@@ -42 +42 @@
-
-AmdtpReceiveStreamProcessor::AmdtpReceiveStreamProcessor(int port, int framerate, int dimension)
-ReceiveStreamProcessor(
+StreamProcessor(ePT_Receive , 
-    , m_dimension(dimension)
-    , m_last_timestamp(0)
@@ -54 +54 @@
-    // this has to be done before allocating the buffers,
-    // because this sets the buffersizes from the processormanager
-Receive
+
-        debugFatal("Could not do base class init (%d)\n",this);
-        return false;
@@ -257 +257 @@
-    // reset all non-device specific stuff
-    // i.e. the iso stream and the associated ports
-Receive
+
-            debugFatal("Could not do base class reset\n");
-            return false;
@@ -274 +274 @@
-    // prepare all non-device specific stuff
-    // i.e. the iso stream and the associated ports
-Receive
+
-        debugFatal("Could not prepare base class\n");
-        return false;

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

@@ -65 +65 @@
-*/
-class AmdtpReceiveStreamProcessor
-Receive
+
-{
-

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

@@ -41 +41 @@
-/* transmit */
-AmdtpTransmitStreamProcessor::AmdtpTransmitStreamProcessor(int port, int framerate, int dimension)
-
-
+
+
+
+
+
-{}
-
@@ -50 +53 @@
-bool AmdtpTransmitStreamProcessor::init() {
-
-
+, this
-    // call the parent init
-    // this has to be done before allocating the buffers,
-    // because this sets the buffersizes from the processormanager
-Transmit
+
-        debugFatal("Could not do base class init (%p)\n",this);
-        return false;
@@ -415 +418 @@
-    // reset all non-device specific stuff
-    // i.e. the iso stream and the associated ports
-Transmit
+
-        debugFatal("Could not do base class reset\n");
-        return false;
@@ -438 +441 @@
-    // prepare all non-device specific stuff
-    // i.e. the iso stream and the associated ports
-Transmit
+
-        debugFatal("Could not prepare base class\n");
-        return false;

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

@@ -66 +66 @@
-*/
-class AmdtpTransmitStreamProcessor
-Transmit
+
-{
-

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

@@ -72 +72 @@
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Address        : %p\n",this);
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Stream type    : %s\n",
-Type()==E
+StreamType()==e
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Port, Channel  : %d, %d\n",
-            m_port, m_channel);

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

@@ -48 +48 @@
-    public:
-
-E
-E
-E
+e
+e
+e
-        };
-
-E
-        : m_type(type), m_channel(-1), m_port(0), m_handler(0
+e
+: m_channel(-1), m_port(0), m_handler(0), m_isostream_type(type
-        {};
-E
-type(type), m_channel(-1), m_port(port), m_handler(0
+e
+channel(-1), m_port(port), m_handler(0), m_isostream_type(type
-        {};
-        virtual ~IsoStream()
@@ -69 +69 @@
-        int getPort() {return m_port;};
-
-EStreamType getType() { return 
+eStreamType getStreamType() { return m_isostrea
-
-        virtual unsigned int getPacketsPerPeriod() {return 1;};
@@ -93 +93 @@
-
-    protected:
-
-        void setHandler( IsoHandler * h) ;
-        void clearHandler();
-
-        enum EStreamType m_type;
-        int m_channel;
-        int m_port;
-
-        IsoHandler *m_handler;
+
+    private: // should be set in the constructor
+        enum eStreamType m_isostream_type;
-
-        DECLARE_DEBUG_MODULE;

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

@@ -35 +35 @@
-IMPL_DEBUG_MODULE( StreamProcessor, StreamProcessor, DEBUG_LEVEL_VERBOSE );
-
-
-
+
+
+
+
-    , m_nb_buffers(0)
-    , m_period(0)
@@ -46 +48 @@
-    , m_is_disabled(true)
-    , m_cycle_to_enable_at(0)
-    , m_SyncSource(NULL)
-    , m_ticks_per_frame(0)
-    , m_last_cycle(0)
@@ -58 +59 @@
-StreamProcessor::~StreamProcessor() {
-    if (m_data_buffer) delete m_data_buffer;
+}
+
+void
+StreamProcessor::setState(enum eProcessorState s) {
+    #ifdef DEBUG
+        // check the state transistion
+        debugOutput( DEBUG_LEVEL_VERBOSE, "State transition from %s to %s",
+            ePSToString(m_state), ePSToString(s) );
+    #endif
+    m_state = s;
-}
-
@@ -76 +87 @@
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Nominal framerate     : %u\n", m_framerate);
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Device framerate      : Sync: %f, Buffer %f\n",
-m_SyncSource->
+getSyncSource().
-        24576000.0/m_data_buffer->getRate()
-        );
@@ -169 +180 @@
-}
-
+StreamProcessor&
+StreamProcessor::getSyncSource()
+{
+    return m_manager->getSyncSource();
+};
+
-int StreamProcessor::getBufferFill() {
-//     return m_data_buffer->getFrameCounter();
@@ -180 +197 @@
-
-int StreamProcessor::getMaxFrameLatency() {
-E
+ePT
-        return (int)(m_handler->getWakeupInterval() * TICKS_PER_CYCLE);
-    } else {
@@ -225 +242 @@
-    m_data_buffer->disable();
-    m_disabled=true;
-    return true;
-}
-
-bool StreamProcessor::setSyncSource(StreamProcessor *s) {
-    m_SyncSource=s;
-    return true;
-}
@@ -261 +273 @@
-    // pass before these packets are processed. Adding this extra term makes that
-    // the period boundary is signalled later
-m_SyncSource->
+getSyncSource().
-
-    uint64_t cycle_timer=m_handler->getCycleTimerTicks();
@@ -303 +315 @@
-}
-
-
-
-
-
-
-
+
+
+
+
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -53 +53 @@
-                        public Util::OptionContainer {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    };
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    virtual ~StreamProcessor();
-
+// the receive/transmit functions
+public:
+    // the transmit interface accepts frames and provides packets
+    // implement these for a transmit SP
+    // leave default for a receive SP
-    virtual enum raw1394_iso_disposition
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    virtual enum raw1394_iso_disposition
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    bool isRunning(); ///< returns true if there is some stream data processed
-
-    virtual bool prepareForEnable(uint64_t time_to_enable_at);
-    virtual bool prepareForDisable();
@@ -89 +135 @@
-    bool isEnabled() {return !m_is_disabled;};
-
-    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)
-
-    virtual bool prepare(); ///< prepare the streams & buffers (e.g. prefill)
-
-    virtual void dumpInfo();
-
-    virtual bool init();
-
-    virtual void setVerboseLevel(int l);
-
-    virtual bool prepareForStop() {return true;};
-    virtual bool prepareForStart() {return true;};
-
-
+
+
+
+
+
-    Util::TimestampedBuffer *m_data_buffer;
-
-    StreamStatistics m_PacketStat;
-    StreamStatistics m_PeriodStat;
-
-    StreamStatistics m_WakeupStat;
-
-protected: // SPM related
@@ -122 +156 @@
-    unsigned int m_nb_buffers; ///< cached from manager->getNbBuffers(), the number of periods to buffer
-    unsigned int m_period; ///< cached from manager->getPeriod(), the period size
-
-    unsigned int m_xruns;
-
-    unsigned int m_framerate;
-
-    StreamProcessorManager *m_manager;
-
+
-    bool m_running;
-    bool m_disabled;
@@ -135 +167 @@
-
-
-
-    DECLARE_DEBUG_MODULE;
-
-    // frame counter & sync stuff
-    public:
@@ -150 +179 @@
-         *         false if it can't
-         */
- = 0
+
-
-        /**
@@ -195 +224 @@
-         * @return the time in internal units
-         */
- = 0
+
-
-        uint64_t getTimeNow();
@@ -229 +258 @@
-        virtual int getMaxFrameLatency();
-
-
+
+
-        float getTicksPerFrame();
-
@@ -238 +268 @@
-
-    protected:
-        StreamProcessor *m_SyncSource;
-
-        float m_ticks_per_frame;
@@ -245 +274 @@
-        int m_sync_delay;
-
+public:
+    // debug stuff
+    virtual void dumpInfo();
+    virtual void setVerboseLevel(int l);
+    StreamStatistics m_PacketStat;
+    StreamStatistics m_PeriodStat;
+    StreamStatistics m_WakeupStat;
+    DECLARE_DEBUG_MODULE;
+
-};
-
-/*!
-\brief Class providing a generic interface for receive Stream Processors
-
-*/
-class ReceiveStreamProcessor : public StreamProcessor {
-
-public:
-    ReceiveStreamProcessor(int port, int framerate)
-        : StreamProcessor(IsoStream::EST_Receive, port, framerate) {};
-    virtual ~ReceiveStreamProcessor(){};
-
-
-    virtual enum EProcessorType getType() {return E_Receive;};
-
-    virtual enum raw1394_iso_disposition
-        getPacket(unsigned char *data, unsigned int *length,
-                  unsigned char *tag, unsigned char *sy,
-                  int cycle, unsigned int dropped, unsigned int max_length)
-                  {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,
-                  unsigned char channel, unsigned char tag, unsigned char sy,
-                  unsigned int cycle, unsigned int dropped) = 0;
-
-    uint64_t getTimeAtPeriod();
-    bool canClientTransferFrames(unsigned int nframes);
-
-protected:
-    bool processWriteBlock(char *data, unsigned int nevents, unsigned int offset) {return true;};
-};
-
-/*!
-\brief Class providing a generic interface for receive Stream Processors
-
-*/
-class TransmitStreamProcessor : public StreamProcessor {
-
-public:
-    TransmitStreamProcessor(int port, int framerate)
-        : StreamProcessor(IsoStream::EST_Transmit, port, framerate) {};
-    virtual ~TransmitStreamProcessor() {};
-
-    virtual enum EProcessorType getType() {return E_Transmit;};
-
-    virtual enum raw1394_iso_disposition
-        putPacket(unsigned char *data, unsigned int length,
-                  unsigned char channel, unsigned char tag, unsigned char sy,
-                  unsigned int cycle, unsigned int dropped) {return RAW1394_ISO_STOP;};
-        virtual bool getFrames(unsigned int nbframes, int64_t ts) {return false;};
-        virtual bool getFramesDry(unsigned int nbframes, int64_t ts) {return false;};
-
-    uint64_t getTimeAtPeriod();
-    bool canClientTransferFrames(unsigned int nframes);
-
-protected:
-    bool processReadBlock(char *data, unsigned int nevents, unsigned int offset) {return true;};
-};
-
-}
-

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

@@ -72 +72 @@
-    assert(m_isoManager);
-
-==StreamProcessor::E
+ == StreamProcessor::ePT
-        processor->setVerboseLevel(getDebugLevel()); // inherit debug level
-
-        m_ReceiveProcessors.push_back(processor);
-
-        processor->setManager(this);
-
-        return true;
-    }
-
-==StreamProcessor::E
+ == StreamProcessor::ePT
-        processor->setVerboseLevel(getDebugLevel()); // inherit debug level
-
-        m_TransmitProcessors.push_back(processor);
-
-        processor->setManager(this);
-
-        return true;
-    }
@@ -102 +98 @@
-    assert(processor);
-
-E
+ePT
-
-        for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
@@ -125 +121 @@
-    }
-
-E
+ePT
-        for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
-            it != m_TransmitProcessors.end();
@@ -158 +154 @@
-    m_SyncSource=s;
-    return true;
-}
-
-StreamProcessor *StreamProcessorManager::getSyncSource() {
-    return m_SyncSource;
-}
-
@@ -168 +160 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "enter...\n");
-
-=
+ = 
-
-    if(!m_isoManager) {
@@ -226 +218 @@
-        ++it ) {
-
-        if(!(*it)->setSyncSource(m_SyncSource)) {
-            debugFatal(  " could not set sync source (%p)...\n",(*it));
-            return false;
-        }
-
-        if(!(*it)->setOption("slaveMode", m_is_slave)) {
-            debugOutput(DEBUG_LEVEL_VERBOSE, " note: could not set slaveMode option for (%p)...\n",(*it));
@@ -245 +232 @@
-        it != m_TransmitProcessors.end();
-        ++it ) {
-        if(!(*it)->setSyncSource(m_SyncSource)) {
-            debugFatal(  " could not set sync source (%p)...\n",(*it));
-            return false;
-        }
-        if(!(*it)->setOption("slaveMode", m_is_slave)) {
-            debugOutput(DEBUG_LEVEL_VERBOSE, " note: could not set slaveMode option for (%p)...\n",(*it));
@@ -377 +360 @@
-        waitForPeriod();
-        // drop the frames for all receive SP's
-E
+ePT
-        
-        // we don't have to dryrun for the xmit SP's since they
@@ -1067 +1050 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Transferring period...\n");
-    bool retval=true;
-E
-E
+ePT
+ePT
-    return retval;
-}
@@ -1081 +1064 @@
- */
-
-E
+e
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "Transferring period...\n");
-    bool retval = true;
-    // a static cast could make sure that there is no performance
-    // penalty for the virtual functions (to be checked)
-E
+ePT
-        // determine the time at which we want reception to start
-        float rate=m_SyncSource->getTicksPerFrame();
@@ -1148 +1131 @@
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "Dry-running period...\n");
-    bool retval=true;
-E
-E
+ePT
+ePT
-    return retval;
-}
@@ -1162 +1145 @@
- */
-
-E
+e
-    debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "Dry-running period...\n");
-    bool retval = true;
-    // a static cast could make sure that there is no performance
-    // penalty for the virtual functions (to be checked)
-E
+ePT
-        // determine the time at which we want reception to start
-        float rate=m_SyncSource->getTicksPerFrame();

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

@@ -87 +87 @@
-
-    bool transfer(); ///< transfer the buffer contents from/to client
-E
+e
-    
-    bool dryRun();
-E
+e
-
-    int getDelayedUsecs() {return m_delayed_usecs;};
@@ -122 +122 @@
-public:
-    bool setSyncSource(StreamProcessor *s);
-
+
+
-
-protected:

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

@@ -304 +304 @@
-
-    // allocate a handler for this stream
-Type()==IsoStream::E
+StreamType()==IsoStream::e
-        // setup the optimal parameters for the raw1394 ISO buffering
-        unsigned int packets_per_period=stream->getPacketsPerPeriod();
@@ -394 +394 @@
-    }
-
-Type()==IsoStream::E
+StreamType()==IsoStream::e
-        // setup the optimal parameters for the raw1394 ISO buffering
-        unsigned int packets_per_period=stream->getPacketsPerPeriod();

branches/ppalmers-streaming/tests/SytMonitor.cpp

@@ -35 +35 @@
-
-SytMonitor::SytMonitor(int port)
-E
+e
-    m_cinfo_buffer=ffado_ringbuffer_create(16384*sizeof(struct cycle_info));
-

branches/ppalmers-streaming/tests/test-cycletimer.cpp

@@ -288 +288 @@
-#ifdef TEST_PORT_0
-    // add a stream to the manager so that it has something to do
-E
+e
-
-    if (!s) {