Changeset 277

Timestamp:

06/29/06 16:24:39 (17 years ago)

Author:

jwoithe

Message:

Start of work leading to MOTU iso transmission.
Fix use of uninitialised local variable in DelayLockedLoop::setIntegrator().

Files:

• branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.cpp (modified) (4 diffs)
• branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.h (modified) (2 diffs)
• branches/libfreebob-2.0/src/libutil/DelayLockedLoop.cpp (modified) (1 diff)
• branches/libfreebob-2.0/src/motu/motu_avdevice.cpp (modified) (1 diff)

branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.cpp

@@ -96 +96 @@
-        // don't process the stream when it is not enabled.
-        // however, maybe we do have to generate (semi) valid packets
-
+ 
-                *length = 0; 
-                *tag = 1; // TODO: is this correct for MOTU?
@@ -659 +659 @@
-MotuReceiveStreamProcessor::MotuReceiveStreamProcessor(int port, int framerate, 
-        unsigned int event_size)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-MotuReceiveStreamProcessor::~MotuReceiveStreamProcessor() {
-    
-    
-
+       
+       
+
-}
-
@@ -688 +701 @@
-    
-    enum raw1394_iso_disposition retval=RAW1394_ISO_OK;
+
+// FIXME: just for debugging, print out the sph ofs DLL value
+// once a second
+if (cycle==0) {
+  fprintf(stderr, "sph_ofs_dll=%g\n",m_sph_ofs_dll->get());
+}
-
-    // If the packet length is 8 bytes (ie: just a CIP-like header) there is
@@ -989 +1008 @@
-        int problem=0;
-
+        /* Push cycle offset differences from each event's SPH into the DLL.
+         * If this is the very first block received, use the first event to
+         * initialise the last cycle offset.
+         * FIXME: it might be best to use differences only within the given
+         * block rather than keeping a store of the last cycle offset.
+         * Otherwise in the event of a lost incoming packet the DLL will
+         * have an abnormally large value sent to it.  Perhaps this doesn't
+         * matter?
+         */
+        unsigned int ev;
+        signed int sph_ofs = ntohl(*(quadlet_t *)data) & 0xfff;
+        if (m_last_cycle_ofs < 0) {
+                m_last_cycle_ofs = sph_ofs-m_sph_ofs_dll->get();
+        }
+        for (ev=0; ev<nevents; ev++) {
+                sph_ofs = ntohl(*(quadlet_t *)(data+ev*m_event_size)) & 0xfff;
+                m_sph_ofs_dll->put((m_last_cycle_ofs<sph_ofs)?
+                        sph_ofs-m_last_cycle_ofs:sph_ofs+3072-m_last_cycle_ofs);
+                m_last_cycle_ofs = sph_ofs;
+        }
+
-        for ( PortVectorIterator it = m_PeriodPorts.begin();
-          it != m_PeriodPorts.end();

branches/libfreebob-2.0/src/libstreaming/MotuStreamProcessor.h

@@ -32 +32 @@
-#include "../debugmodule/debugmodule.h"
-#include "StreamProcessor.h"
+
+#include "../libutil/DelayLockedLoop.h"
-
-namespace FreebobStreaming {
@@ -149 +151 @@
-        unsigned int m_event_size;
-
+        FreebobUtil::DelayLockedLoop *m_sph_ofs_dll;
+        signed int m_last_cycle_ofs;
+
-    DECLARE_DEBUG_MODULE;
-

branches/libfreebob-2.0/src/libutil/DelayLockedLoop.cpp

@@ -150 +150 @@
-DelayLockedLoop::setIntegrator(unsigned int i, float c) {
-    
-
-
-
+
+
-    }
-}

branches/libfreebob-2.0/src/motu/motu_avdevice.cpp

@@ -30 +30 @@
-#include "libstreaming/MotuStreamProcessor.h"
-#include "libstreaming/MotuPort.h"
+
+#include "libutil/DelayLockedLoop.h"
-
-#include <string>