Changeset 906 for trunk/libffado

Timestamp:

03/06/08 04:22:38 (13 years ago)

Author:

ppalmers

Message:

implement support for kernel space skipped cycles notification (non-public experimental code)

Files:

• trunk/libffado/config.h.in (modified) (1 diff)
• trunk/libffado/src/libieee1394/IsoHandler.cpp (modified) (6 diffs)
• trunk/libffado/src/libieee1394/IsoHandler.h (modified) (2 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp (modified) (4 diffs)
• trunk/libffado/src/libstreaming/generic/StreamProcessor.h (modified) (1 diff)

trunk/libffado/config.h.in

@@ -52 +52 @@
-// These are the result of a lot of trial and error
-// due to weirdness in the kernel layer
-2048
-2
+(2048-16)
+4
-
-#define ISOHANDLER_FLUSH_BEFORE_ITERATE     0

trunk/libffado/src/libieee1394/IsoHandler.cpp

@@ -47 +47 @@
-        unsigned char *data, unsigned int *length,
-        unsigned char *tag, unsigned char *sy,
-
+1
-
-    IsoHandler *xmitHandler = static_cast<IsoHandler *>(raw1394_get_userdata(handle));
-    assert(xmitHandler);
-
-
+
+
+
+
-}
-
@@ -59 +61 @@
-                        unsigned int length, unsigned char channel,
-                        unsigned char tag, unsigned char sy, unsigned int cycle,
-
+1
-
-    IsoHandler *recvHandler = static_cast<IsoHandler *>(raw1394_get_userdata(handle));
-    assert(recvHandler);
-
-
+
+
+
+
-}
-
@@ -403 +408 @@
-                    unsigned char *data, unsigned int length,
-                    unsigned char channel, unsigned char tag, unsigned char sy,
-
+, unsigned int skipped
-
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
@@ -415 +420 @@
-    #endif
-    if(m_Client) {
-
+, skipped
-    }
-
@@ -425 +430 @@
-IsoHandler::getPacket(unsigned char *data, unsigned int *length,
-                      unsigned char *tag, unsigned char *sy,
-
+, unsigned int skipped
-
-    debugOutputExtreme(DEBUG_LEVEL_ULTRA_VERBOSE,
@@ -432 +437 @@
-    if(m_Client) {
-        enum raw1394_iso_disposition retval;
-
+skipped, 
-        #ifdef DEBUG
-        if (*length > m_max_packet_size) {

trunk/libffado/src/libieee1394/IsoHandler.h

@@ -69 +69 @@
-            putPacket(unsigned char *data, unsigned int length,
-                        unsigned char channel, unsigned char tag, unsigned char sy,
-
+, unsigned int skipped
-
-    static enum raw1394_iso_disposition iso_transmit_handler(raw1394handle_t handle,
@@ -78 +78 @@
-            getPacket(unsigned char *data, unsigned int *length,
-                    unsigned char *tag, unsigned char *sy,
-
+, unsigned int skipped
-
-public:

trunk/libffado/src/libstreaming/generic/StreamProcessor.cpp

@@ -266 +266 @@
-StreamProcessor::putPacket(unsigned char *data, unsigned int length,
-                           unsigned char channel, unsigned char tag, unsigned char sy,
-
+
+
-#ifdef DEBUG
-    if(m_last_cycle == -1) {
@@ -277 +278 @@
-        dropped_cycles = diffCycles(cycle, m_last_cycle) - 1;
-        if (dropped_cycles < 0) {
-
-
+, 'skipped'=%u
+, skipped
-        }
-        if (dropped_cycles > 0) {
-
-
+'skipped'=%u, 
+skipped, 
-            m_dropped += dropped_cycles;
-            m_last_cycle = cycle;
@@ -451 +452 @@
-StreamProcessor::getPacket(unsigned char *data, unsigned int *length,
-                           unsigned char *tag, unsigned char *sy,
-
+
+
-    if (cycle<0) {
-        *tag = 0;
@@ -472 +474 @@
-    if (m_last_cycle != cycle && m_last_cycle != -1) {
-        dropped_cycles = diffCycles(cycle, m_last_cycle) - 1;
+        // correct for skipped packets
+        // since those are not dropped, but only delayed
+        dropped_cycles =- skipped;
+        if(skipped) {
+            debugWarning("(%p) skipped %d cycles, cycle: %d, last_cycle: %d, dropped: %d\n", 
+                         this, skipped, cycle, m_last_cycle, dropped);
+        }
-        if (dropped_cycles < 0) { 
-
-
+, skipped: %d
+, skipped
-        }
-        if (dropped_cycles > 0) {
-
-
+, skipped: %d
+, skipped
-            m_dropped += dropped_cycles;
-            // HACK: this should not be necessary, since the header generation functions should trigger the xrun.

trunk/libffado/src/libstreaming/generic/StreamProcessor.h

@@ -152 +152 @@
-        putPacket(unsigned char *data, unsigned int length,
-                  unsigned char channel, unsigned char tag, unsigned char sy,
-
+, unsigned int skipped
-
-    enum raw1394_iso_disposition
-    getPacket(unsigned char *data, unsigned int *length,
-                unsigned char *tag, unsigned char *sy,
-
+skipped, unsigned int 
-
-    bool getFrames(unsigned int nbframes, int64_t ts); ///< transfer the buffer contents to the client