Changeset 428

Timestamp:

03/01/07 15:26:52 (16 years ago)

Author:

jwoithe

Message:

MOTU: more work trying to get MOTU working with the new streaming framework.

Files:

• branches/streaming-rework/src/libstreaming/MotuStreamProcessor.cpp (modified) (5 diffs)
• branches/streaming-rework/src/libstreaming/StreamProcessor.cpp (modified) (1 diff)
• branches/streaming-rework/src/motu/motu_avdevice.cpp (modified) (1 diff)

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

@@ -917 +917 @@
-            // because we're going to update the buffer again this loop
-            // using writeframes
-
-
-
+
+
+
+
+
+
+
-        } else {
-            debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
@@ -965 +969 @@
-// Then it's just a matter of adding m_ticks_per_frame rather than frame_size times this.
-uint32_t first_sph = ntohl(*(quadlet_t *)(data+8));
+//uint32_t first_sph = ntohl(*(quadlet_t *)(data+8+(event_length*(n_events-1))));
-//        m_last_timestamp = ((first_sph & 0x1fff000)>>12)*3072 + (first_sph & 0xfff);
-        m_last_timestamp = CYCLE_TIMER_TO_TICKS(first_sph & 0x1ffffff);
@@ -987 +992 @@
-            uint64_t ts=addTicks(m_last_timestamp,
-                                 (uint64_t)(frame_size * m_ticks_per_frame));
+//            uint64_t ts=addTicks(m_last_timestamp,
+//                                 (uint64_t)(m_ticks_per_frame));
-
-            // set the timestamp as if there will be a sample put into
@@ -993 +1000 @@
-  ts -= TICKS_PER_SECOND;
-            m_data_buffer->setBufferTailTimestamp(ts);
-
+//
-            
-            return RAW1394_ISO_DEFER;
@@ -999 +1006 @@
-
-                debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "put packet...\n");
-
+//
-
-        //=> process the packet

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

@@ -73 +73 @@
-    IsoStream::dumpInfo();
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  StreamProcessor info:\n");
-
+
+
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Xruns                 : %d\n", m_xruns);
-    debugOutputShort( DEBUG_LEVEL_NORMAL, "  Running               : %d\n", m_running);

branches/streaming-rework/src/motu/motu_avdevice.cpp

@@ -73 +73 @@
-    // Free ieee1394 bus resources if they have been allocated
-    if (m_p1394Service != NULL) {
-(
+ (m_iso_recv_channel>=0 && 
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Could not free recv iso channel %d\n", m_iso_recv_channel);
-            
-        }
-(
+ (m_iso_send_channel>=0 && 
-            debugOutput(DEBUG_LEVEL_VERBOSE, "Could not free send iso channel %d\n", m_iso_send_channel);
-            
-        }
-    }