Changeset 212

Timestamp:

05/21/06 13:17:28 (16 years ago)

Author:

pieterpalmers

Message:

- end of day commit

Files:

• branches/libfreebob-2.0/src/libstreaming/AmdtpStreamProcessor.cpp (modified) (3 diffs)
• branches/libfreebob-2.0/src/libstreaming/StreamProcessor.h (modified) (1 diff)
• branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.cpp (modified) (1 diff)
• branches/libfreebob-2.0/tests/streaming/test-isohandling.cpp (modified) (7 diffs)

branches/libfreebob-2.0/src/libstreaming/AmdtpStreamProcessor.cpp

@@ -283 +283 @@
-//                      freebob_streaming_decode_midi(connection,(quadlet_t *)(data+8), nevents, packet->dbc);
-                }
+
+                debugOutput(DEBUG_LEVEL_VERY_VERBOSE, 
+                        "RCV: CH = %d, FDF = %X. SYT = %6d, DBS = %3d, DBC = %3d, FMT = %3d, LEN = %4d (%2d)\n", 
+                        channel, packet->fdf,
+                        packet->syt,
+                        packet->dbs,
+                        packet->dbc,
+                        packet->fmt, 
+                        length,
+                        ((length / sizeof (quadlet_t)) - 2)/packet->dbs);
-                
-                // update the frame counter
@@ -297 +307 @@
-void AmdtpReceiveStreamProcessor::setVerboseLevel(int l) {
-        setDebugLevel(l);
-//
+
-
-}
@@ -327 +337 @@
-        debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "Transferring period...\n");
-// TODO: implement
+        
+        int read_size=m_period*sizeof(quadlet_t)*m_dimension;
+        char *dummybuffer=(char *)calloc(sizeof(quadlet_t),m_period*m_dimension);
+        if (freebob_ringbuffer_read(m_event_buffer,(char *)(dummybuffer),read_size) < read_size) {
+                debugWarning("Could not read from event buffer\n");
+        }
+        free(dummybuffer);
+
-
-        return 0;

branches/libfreebob-2.0/src/libstreaming/StreamProcessor.h

@@ -67 +67 @@
-        bool isOnePeriodReady() { return (m_framecounter > m_period); };
-        unsigned int getNbPeriodsReady() { if(m_period) return m_framecounter/m_period; else return 0;};
+        void decrementFrameCounter() {m_framecounter -= m_period;};
+
-
-        virtual int transfer(); // transfer the buffer contents from/to client

branches/libfreebob-2.0/src/libstreaming/StreamProcessorManager.cpp

@@ -169 +169 @@
-                // signal the waiting thread(s?) that a period is ready
-                sem_post(&m_period_semaphore);
+                debugOutputShort( DEBUG_LEVEL_VERY_VERBOSE, "Period done...\n");
+
+                for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
+                        it != m_ReceiveProcessors.end();
+                        ++it ) {
+                        (*it)->decrementFrameCounter();
+                }
+        
+                for ( StreamProcessorVectorIterator it = m_TransmitProcessors.begin();
+                        it != m_TransmitProcessors.end();
+                        ++it ) {
+                        (*it)->decrementFrameCounter();
+                }
-        }
-

branches/libfreebob-2.0/tests/streaming/test-isohandling.cpp

@@ -87 +87 @@
-//      spt->setVerboseLevel(DEBUG_LEVEL_VERBOSE);
-
-//     AmdtpReceiveStreamProcessor *spr = new AmdtpReceiveStreamProcessor(0,2,44100,7
-
+       AmdtpReceiveStreamProcessor *spr = new AmdtpReceiveStreamProcessor(0,2,44100,11
+// 
-        if(!spr) {
-                printf("Could not create receive AmdtpStreamProcessor\n");
@@ -94 +94 @@
-        }
-        spr->setVerboseLevel(DEBUG_LEVEL_VERBOSE);
+
+        AmdtpReceiveStreamProcessor *spr2 = new AmdtpReceiveStreamProcessor(1,2,44100,7);
+//      ReceiveStreamProcessor *spr = new ReceiveStreamProcessor(0,2,44100);
+        if(!spr2) {
+                printf("Could not create receive AmdtpStreamProcessor\n");
+                return -1;
+        }
+        spr2->setVerboseLevel(DEBUG_LEVEL_VERBOSE);
-
-//      if (isomanager->registerStream(spt)) {
@@ -111 +119 @@
-        printf("----------------------\n");
-
+        if (isomanager->registerStream(spr2)) {
+                printf("Could not register receive stream processor with the ISO manager\n");
+                return -1;
+        }
+        printf("----------------------\n");
-
-//      printf("----------------------\n");
@@ -127 +140 @@
-        printf("----------------------\n");
-
+        if (procMan->registerProcessor(spr2)) {
+                printf("Could not register receive stream processor with the Processor manager\n");
+                return -1;
+        }
+        printf("----------------------\n");
+
-        // now create the runner that does the actual streaming
-        StreamRunner *runner = new StreamRunner(isomanager,procMan);
@@ -146 +165 @@
-        printf("----------------------\n");
-
+        int periods=0;
+        int periods_print=0;
-        while(run) {
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -164 +190 @@
-//      isomanager->unregisterStream(spt);
-        isomanager->unregisterStream(spr);
+        isomanager->unregisterStream(spr2);
-
-//      procMan->unregisterProcessor(spt);
-        procMan->unregisterProcessor(spr);
+        procMan->unregisterProcessor(spr2);
-
-        delete thread;
@@ -175 +203 @@
-//      delete spt;
-        delete spr;
+        delete spr2;
-
-        printf("Bye...\n");