Changeset 831

Timestamp:

01/10/08 13:15:38 (13 years ago)

Author:

ppalmers

Message:

small tweaks

Files:

• branches/api-cleanup/config.h.in (modified) (1 diff)
• branches/api-cleanup/src/libieee1394/IsoHandler.cpp (modified) (3 diffs)
• branches/api-cleanup/src/libieee1394/IsoHandlerManager.cpp (modified) (2 diffs)
• branches/api-cleanup/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (2 diffs)
• branches/api-cleanup/src/libstreaming/generic/StreamProcessor.cpp (modified) (7 diffs)
• branches/api-cleanup/src/libstreaming/generic/StreamProcessor.h (modified) (1 diff)
• branches/api-cleanup/src/libstreaming/StreamProcessorManager.cpp (modified) (3 diffs)
• branches/api-cleanup/src/libutil/TimestampedBuffer.cpp (modified) (1 diff)
• branches/api-cleanup/tests/streaming/teststreaming3.cpp (modified) (1 diff)
• branches/api-cleanup/tests/test-ieee1394service.cpp (modified) (1 diff)
• branches/api-cleanup/tests/test-streamdump.cpp (modified) (1 diff)

branches/api-cleanup/config.h.in

@@ -68 +68 @@
-#define STREAMPROCESSORMANAGER_PRESTART_CYCLES_FOR_RECV     0
-#define STREAMPROCESSORMANAGER_SYNCSTART_TRIES              10
+#define STREAMPROCESSORMANAGER_SYNC_WAIT_TIME_MSEC          200
-#define STREAMPROCESSORMANAGER_ALIGN_AVERAGE_TIME_MSEC      200
-#define STREAMPROCESSORMANAGER_NB_ALIGN_TRIES               40

branches/api-cleanup/src/libieee1394/IsoHandler.cpp

@@ -202 +202 @@
-IsoHandler::Execute()
-{
-//
+
-
-    // bypass if not running
@@ -273 +273 @@
-IsoHandler::iterate() {
-//     if(m_type==eHT_Receive) {
-Y_VER
+
-//                 this, (m_type==eHT_Receive?"Receive":"Transmit"));
-//     }
@@ -281 +281 @@
-#endif
-        if(raw1394_loop_iterate(m_handle)) {
-
-
+
-                        this, strerror(errno));
-            return false;
-        }
+//         debugOutput(DEBUG_LEVEL_VERBOSE, "(%p, %s)  done iterating ISO handler\n", 
+//                 this, (m_type==eHT_Receive?"Receive":"Transmit"));
-        return true;
-    } else {

branches/api-cleanup/src/libieee1394/IsoHandlerManager.cpp

@@ -378 +378 @@
-        }
-
-max_packet_size = page_size;
+//max_packet_size = page_size; // HACK
-        unsigned int irq_interval = packets_per_period / MINIMUM_INTERRUPTS_PER_PERIOD;
-        if(irq_interval <= 0) irq_interval=1;
@@ -395 +395 @@
-            return false;
-        }
+
-    } else {
-        debugFatal("Bad stream type\n");

branches/api-cleanup/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

@@ -676 +676 @@
-        {
-            AmdtpPortInfo *pinfo=dynamic_cast<AmdtpPortInfo *>(*it);
-
+Y_VER
-                                              idx, (*it)->getName().c_str(), pinfo->getPosition());
-            if(pinfo->getPosition() == idx) {
@@ -707 +707 @@
-    {
-        AmdtpPortInfo *pinfo=dynamic_cast<AmdtpPortInfo *>(*it);
-
+Y_VER
-                                        idx, (*it)->getName().c_str(), pinfo->getPosition(), pinfo->getLocation());
-        if ((*it)->getPortType() == Port::E_Midi) {

branches/api-cleanup/src/libstreaming/generic/StreamProcessor.cpp

@@ -68 +68 @@
-    , m_local_node_id ( 0 ) // local cache
-    , m_channel( -1 )
-
-
-
+
+
+
+
-    , m_scratch_buffer( NULL )
-    , m_scratch_buffer_size_bytes( 0 )
@@ -133 +134 @@
-    // the waitForClient in IsoHandler will take care of the fact that the frames are
-    // not present in time
-
+ + 10
-    debugOutput(DEBUG_LEVEL_VERBOSE, "Nominal prebuffer: %u\n", packets_to_prebuffer);
-    return packets_to_prebuffer;
@@ -367 +368 @@
-    // check the packet header
-    enum eChildReturnValue result = processPacketHeader(data, length, channel, tag, sy, cycle, dropped_cycles);
+
+    // handle dropped cycles
+    if(dropped_cycles) {
+        // make sure the last_timestamp is corrected
+        m_correct_last_timestamp = true;
+        if (m_state == ePS_Running) {
+            // this is an xrun situation
+            m_in_xrun = true;
+            debugWarning("Should update state to WaitingForStreamDisable due to dropped packet xrun\n");
+            m_cycle_to_switch_state = cycle + 1; // switch in the next cycle
+            m_next_state = ePS_WaitingForStreamDisable;
+            // execute the requested change
+            if (!updateState()) { // we are allowed to change the state directly
+                debugError("Could not update state!\n");
+                POST_SEMAPHORE;
+                return RAW1394_ISO_ERROR;
+            }
+        }
+    }
+
-    if (result == eCRV_OK) {
-        debugOutput(DEBUG_LEVEL_VERY_VERBOSE, "RECV: CY=%04u TS=%011llu\n",
@@ -374 +395 @@
-        m_last_dropped = dropped_cycles;
-
-
-
+
-            // they represent a discontinuity in the timestamps, and hence are
-            // to be dealt with
-            debugWarning("(%p) Correcting timestamp for dropped cycles, discarding packet...\n", this);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        }
-
@@ -749 +757 @@
-    }
-
-ULTRA
+VERY
-    generateSilentPacketHeader(data, length, tag, sy, cycle, dropped_cycles, max_length);
-    generateSilentPacketData(data, length, tag, sy, cycle, dropped_cycles, max_length);
@@ -902 +910 @@
-StreamProcessor::waitForSignal()
-{
+    debugOutput(DEBUG_LEVEL_VERBOSE, "(%p, %s) wait ...\n", this, getTypeString());
-    int result;
-    if(m_state == ePS_Running && m_next_state == ePS_Running) {
@@ -1326 +1335 @@
-            m_ticks_per_frame = ticks_per_frame;
-            m_local_node_id= m_1394service.getLocalNodeId() & 0x3f;
+            m_correct_last_timestamp = false;
-
-            debugOutput(DEBUG_LEVEL_VERBOSE,"Initializing remote ticks/frame to %f\n", ticks_per_frame);

branches/api-cleanup/src/libstreaming/generic/StreamProcessor.h

@@ -326 +326 @@
-    uint64_t m_last_timestamp; /// last timestamp (in ticks)
-    uint64_t m_last_timestamp2; /// last timestamp (in ticks)
-
+
+
-
-//--- data buffering and accounting

branches/api-cleanup/src/libstreaming/StreamProcessorManager.cpp

@@ -222 +222 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Putting StreamProcessor streams into dry-running state...\n");
-    debugOutput( DEBUG_LEVEL_VERBOSE, " Schedule start dry-running...\n");
-Receive
-Receive
+Transmit
+Transmit
-            ++it ) {
-        if (!(*it)->isDryRunning()) {
@@ -234 +234 @@
-        }
-    }
-Transmit
-Transmit
+Receive
+Receive
-            ++it ) {
-        if (!(*it)->isDryRunning()) {
@@ -326 +326 @@
-    // DLL to have a decent sync (FIXME: does the DLL get updated when dry-running)?
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Waiting for sync...\n");
-
+
+
+
+
+
-    int64_t time_till_next_period;
-    while(nb_sync_runs--) { // or while not sync-ed?

branches/api-cleanup/src/libutil/TimestampedBuffer.cpp

@@ -1174 +1174 @@
-
-    if (diff > max_abs_diff) {
-
+// 
-        debugWarning("(%p) difference rather large (+): diff="TIMESTAMP_FORMAT_SPEC", max="TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC"\n",
-            this, diff, max_abs_diff, ts, pred_buffer_next_tail_timestamp);
-    } else if (diff < -max_abs_diff) {
-
+// 
-        debugWarning("(%p) difference rather large (-): diff="TIMESTAMP_FORMAT_SPEC", max="TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC", "TIMESTAMP_FORMAT_SPEC"\n",
-            this, diff, -max_abs_diff, ts, pred_buffer_next_tail_timestamp);

branches/api-cleanup/tests/streaming/teststreaming3.cpp

@@ -236 +236 @@
-{
-    run = 0;
-    set_realtime_priority(0);
-}
-

branches/api-cleanup/tests/test-ieee1394service.cpp

@@ -56 +56 @@
-DECLARE_GLOBAL_DEBUG_MODULE;
-
-100000
+3072
-int PORT_TO_USE = 0;
-

branches/api-cleanup/tests/test-streamdump.cpp

@@ -191 +191 @@
-
-        if ( pCons->m_iIsoChannel != -1 ) {
+            printf( "disconnect\n");
-            iec61883_cmp_disconnect( pHandle,
-                                     pCons->m_output,