Changeset 492

Timestamp:

07/15/07 17:04:05 (16 years ago)

Author:

jwoithe

Message:

MOTU: more debugging. There's nothing really profound in these changes.

Files:

• trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp (modified) (4 diffs)

trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp

@@ -193 +193 @@
-// These are just copied from AmdtpStreamProcessor.  At some point we should
-// verify that they make sense for the MOTU.
-
+//
-            // account for the number of cycles we are too late to enable
-            ts_head = addTicks(ts_head, cycles_past_enable * TICKS_PER_CYCLE);
-            // account for one extra packet of frames
-
-
+//
+//
-
-            m_data_buffer->setBufferTailTimestamp(ts_head);
@@ -269 +269 @@
-    int32_t until_next=diffTicks(timestamp, cycle_timer + ticks_to_advance);
-
-(uint32_t)
+
-
-    // Size of a single data frame in quadlets
@@ -335 +335 @@
-
-        *length = n_events*m_event_size + 8;
-
-        // convert the timestamp to Motu format
-        // I assume that it is in ticks, and wraps as the cycle timer
-        #warning syt conversion to be done
-
-        // FIXME: if we choose to read the buffer even during closedown,
@@ -511 +507 @@
-    // allocate the internal buffer
-    m_ticks_per_frame = (TICKS_PER_SECOND*1.0) / ((float)m_framerate);
-    unsigned int events_per_frame = m_framerate<=48000?8:(m_framerate<=96000?16:32);
-
-    assert(m_data_buffer);
+    // Note: terminology is slightly confused here.  From the point of view
+    // of the buffer the event size is the size of a single complete "event"
+    // in the MOTU datastream, which consists of one sample from each audio
+    // channel plus a timestamp and other control data.  Almost by
+    // definition then, the buffer's "events per frame" must be 1.  With
+    // these values, data copies to/from the MOTU data stream can be handled
+    // by the generic copying functions.
-    m_data_buffer->setBufferSize(ringbuffer_size_frames);
-    m_data_buffer->setEventSize(m_event_size);