Changeset 857 for trunk/libffado/src/libstreaming/motu

Timestamp:

01/19/08 04:11:20 (15 years ago)

Author:

ppalmers

Message:

Introduce distinction between empty and silent packets. When shutting down a transmit SP, we now send silent (= valid, but all audio muted) packets instead of empty (w/o
payload) packets for a while. This should solve the shutdown issue with the motu's.

Files:

• trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp (modified) (2 diffs)
• trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.h (modified) (1 diff)

trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.cpp

@@ -316 +316 @@
-
-enum StreamProcessor::eChildReturnValue
-Silent
+Empty
-    unsigned char *data, unsigned int *length,
-    unsigned char *tag, unsigned char *sy,
-    int cycle, unsigned int dropped, unsigned int max_length )
-{
-NONE
+EMPTY
-                cycle, m_last_timestamp, ( unsigned int ) TICKS_TO_CYCLES ( m_last_timestamp ) );
-
@@ -332 +332 @@
-    m_tx_dbc += fillNoDataPacketHeader ( (quadlet_t *)data, length );
-    return eCRV_OK;
+}
+
+enum StreamProcessor::eChildReturnValue
+MotuTransmitStreamProcessor::generateEmptyPacketData (
+    unsigned char *data, unsigned int *length,
+    unsigned char *tag, unsigned char *sy,
+    int cycle, unsigned int dropped, unsigned int max_length )
+{
+    return eCRV_OK; // no need to do anything
+}
+
+enum StreamProcessor::eChildReturnValue
+MotuTransmitStreamProcessor::generateSilentPacketHeader (
+    unsigned char *data, unsigned int *length,
+    unsigned char *tag, unsigned char *sy,
+    int cycle, unsigned int dropped, unsigned int max_length )
+{
+    debugOutput ( DEBUG_LEVEL_VERY_VERBOSE, "XMIT SILENT: CY=%04u, TSP=%011llu (%04u)\n",
+                cycle, m_last_timestamp, ( unsigned int ) TICKS_TO_CYCLES ( m_last_timestamp ) );
+
+    // Do housekeeping expected for all packets sent to the MOTU, even
+    // for packets containing no audio data.
+    *sy = 0x00;
+    *tag = 1;      // All MOTU packets have a CIP-like header
+    *length = 8;
+
+    m_tx_dbc += fillNoDataPacketHeader ( (quadlet_t *)data, length );
+    return eCRV_Packet;
-}
-

trunk/libffado/src/libstreaming/motu/MotuTransmitStreamProcessor.h

@@ -64 +64 @@
-                            unsigned char *tag, unsigned char *sy,
-                            int cycle, unsigned int dropped, unsigned int max_length);
+    enum eChildReturnValue generateEmptyPacketHeader(unsigned char *data, unsigned int *length,
+                                    unsigned char *tag, unsigned char *sy,
+                                    int cycle, unsigned int dropped, unsigned int max_length);
+    enum eChildReturnValue generateEmptyPacketData(unsigned char *data, unsigned int *length,
+                                  unsigned char *tag, unsigned char *sy,
+                                  int cycle, unsigned int dropped, unsigned int max_length);
-    enum eChildReturnValue generateSilentPacketHeader(unsigned char *data, unsigned int *length,
-                                    unsigned char *tag, unsigned char *sy,