Changeset 723

Timestamp:

11/25/07 05:42:51 (16 years ago)

Author:

ppalmers

Message:

fix problem where receiving multiple streams doesn't work

Files:

• branches/ppalmers-streaming/src/dice/dice_avdevice.cpp (modified) (1 diff)
• branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp (modified) (8 diffs)
• branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h (modified) (1 diff)
• branches/ppalmers-streaming/src/libstreaming/StreamProcessorManager.cpp (modified) (4 diffs)
• branches/ppalmers-streaming/src/libstreaming/util/IsoHandlerManager.cpp (modified) (6 diffs)

branches/ppalmers-streaming/src/dice/dice_avdevice.cpp

@@ -448 +448 @@
-DiceAvDevice::prepare() {
-    // prepare receive SP's
-
-
+
-        fb_quadlet_t nb_audio;
-        fb_quadlet_t nb_midi;

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

@@ -193 +193 @@
-                           unsigned char channel, unsigned char tag, unsigned char sy,
-                           unsigned int cycle, unsigned int dropped) {
+    if(m_last_cycle == -1) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "Handler for %s SP %p is alive (cycle = %u)\n", getTypeString(), this, cycle);
+    }
+
-    int dropped_cycles = 0;
-    if (m_last_cycle != (int)cycle && m_last_cycle != -1) {
@@ -201 +205 @@
-            m_dropped += dropped_cycles;
-        }
-    m_last_cycle = cycle;
-}
+}
+m_last_cycle = cycle;
-
-    // bypass based upon state
@@ -303 +307 @@
-            debugWarning("(%p) Correcting timestamp for dropped cycles, discarding packet...\n", this);
-            m_data_buffer->setBufferTailTimestamp(m_last_timestamp);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-
@@ -363 +368 @@
-    }
-
+    if(m_last_cycle == -1) {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "Handler for %s SP %p is alive (cycle = %d)\n", getTypeString(), this, cycle);
+    }
+
-    int dropped_cycles = 0;
-    if (m_last_cycle != cycle && m_last_cycle != -1) {
@@ -371 +380 @@
-            m_dropped += dropped_cycles;
-        }
+    }
+    if (cycle > 0) {
-        m_last_cycle = cycle;
-    }
@@ -507 +518 @@
-                return RAW1394_ISO_ERROR;
-            }
-result == eCRV_EmptyPacket
+(result == eCRV_EmptyPacket) || (result == eCRV_Again)
-            if(m_state != m_next_state) {
-                debugOutput(DEBUG_LEVEL_VERBOSE, "Should update state from %s to %s\n",
@@ -518 +529 @@
-            }
-            goto send_empty_packet;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
-        } else {
-            debugError("Invalid return value: %d\n", result);
@@ -1361 +1372 @@
-StreamProcessor::dumpInfo()
-{
-information\n"
+%p information\n", this
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Iso stream info:\n");
-

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

@@ -384 +384 @@
-    virtual void dumpInfo();
-    virtual void setVerboseLevel(int l);
+    const char *getStateString()
+        {return ePSToString(getState());};
+    const char *getTypeString()
+        {return ePTToString(getType());};
-    StreamStatistics m_PacketStat;
-    StreamStatistics m_PeriodStat;

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

@@ -241 +241 @@
-
-bool StreamProcessorManager::startDryRunning() {
-
+
+
-    for ( StreamProcessorVectorIterator it = m_ReceiveProcessors.begin();
-            it != m_ReceiveProcessors.end();
-            ++it ) {
-        if (!(*it)->isDryRunning()) {
-
+cheduleS
-                debugError("Could not put SP %p into the dry-running state\n", *it);
-                return false;
-            }
+        } else {
+            debugOutput( DEBUG_LEVEL_VERBOSE, " SP %p already dry-running...\n", *it);
-        }
-    }
@@ -256 +259 @@
-            ++it ) {
-        if (!(*it)->isDryRunning()) {
-
+cheduleS
-                debugError("Could not put SP %p into the dry-running state\n", *it);
-                return false;
-            }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    debugOutput( DEBUG_LEVEL_VERBOSE, " StreamProcessor streams dry-running...\n");
@@ -330 +373 @@
-        (unsigned int)TICKS_TO_OFFSET(time_of_first_sample));
-
-
+0
-    // start wet-running in CYCLES_FOR_STARTUP cycles
-    // this is the time window we have to setup all SP's such that they 
@@ -399 +442 @@
-        return false;
-    }
+
+    // now align the received streams
+    debugOutput( DEBUG_LEVEL_VERBOSE, " Aligning incoming streams...\n");
+    
+    
-    debugOutput( DEBUG_LEVEL_VERBOSE, " StreamProcessor streams running...\n");
-    return true;

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

@@ -48 +48 @@
-IsoHandlerManager::IsoHandlerManager(bool run_rt, unsigned int rt_prio) :
-   m_State(E_Created),
-
+00
-   m_realtime(run_rt), m_priority(rt_prio), m_xmit_nb_periods( 1 )
-{
@@ -131 +131 @@
-    int err;
-    int i=0;
-enter...\n"
+poll %d fd's, timeout = %dms...\n", m_poll_nfds, m_poll_timeout
-
-    err = poll (m_poll_fds, m_poll_nfds, m_poll_timeout);
@@ -143 +143 @@
-    }
-
+//     #ifdef DEBUG
+//     for (i = 0; i < m_poll_nfds; i++) {
+//         IsoHandler *s = m_IsoHandlers.at(i);
+//         assert(s);
+//         debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "(%d) handler %p: iterate? %d, revents: %08X\n", 
+//             i, s, (m_poll_fds[i].revents & (POLLIN) == 1), m_poll_fds[i].revents);
+//     }
+//     #endif
+
-    for (i = 0; i < m_poll_nfds; i++) {
-        if (m_poll_fds[i].revents & POLLERR) {
@@ -153 +162 @@
-
-        if(m_poll_fds[i].revents & (POLLIN)) {
-=
+ = 
-            assert(s);
-
-            s->iterate();
-        }
@@ -306 +314 @@
-    if (stream->getStreamType()==IsoStream::eST_Receive) {
-        // setup the optimal parameters for the raw1394 ISO buffering
-=
+ = 
-
-#if 1
@@ -317 +325 @@
-        unsigned int max_packet_size=(MINIMUM_INTERRUPTS_PER_PERIOD * getpagesize()) / packets_per_period;
-        if (max_packet_size < stream->getMaxPacketSize()) {
-
+
+
+
-        }
-
-        // Ensure we don't request a packet size bigger than the
-        // kernel-enforced maximum which is currently 1 page.
-
-
-
-
+
+
+
+
+
+
-        if(irq_interval <= 0) irq_interval=1;
-        // FIXME: test
-
-
+
-
-#else