Changeset 1525

Timestamp:

03/28/09 14:24:21 (15 years ago)

Author:

ppalmers

Message:

- Allow to specify the DLL bandwidths for the CycleTimerHelper? and the TimestampedBuffer? in absolute units (Hz). This ensures samplerate-independent operation
- Reduce the default DLL bandwidth for the TimestampedBuffer?'s. This improves timestamp timing with a factor 10x, which should benefit especially the timing sensitive devices (MOTU).
- Allow to specify the DLL bandwith and other transmit settings through the configuration file
- Implement a sanity check for the instantanous samplerate to detect bogus timestamp processing

Files:

• branches/libffado-2.0/config.h.in (modified) (2 diffs)
• branches/libffado-2.0/src/genericavc/avc_avdevice.cpp (modified) (4 diffs)
• branches/libffado-2.0/src/libieee1394/CycleTimerHelper.cpp (modified) (13 diffs)
• branches/libffado-2.0/src/libieee1394/CycleTimerHelper.h (modified) (1 diff)
• branches/libffado-2.0/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp (modified) (7 diffs)
• branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.h (modified) (2 diffs)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp (modified) (8 diffs)
• branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.h (modified) (2 diffs)
• branches/libffado-2.0/src/libutil/Configuration.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/libutil/Configuration.h (modified) (2 diffs)
• branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp (modified) (5 diffs)
• branches/libffado-2.0/src/libutil/TimestampedBuffer.h (modified) (1 diff)
• branches/libffado-2.0/src/motu/motu_avdevice.cpp (modified) (4 diffs)

branches/libffado-2.0/config.h.in

@@ -108 +108 @@
-#define IEEE1394SERVICE_USE_CYCLETIMER_DLL                         1
-#define IEEE1394SERVICE_CYCLETIMER_DLL_UPDATE_INTERVAL_USEC   200000
+#define IEEE1394SERVICE_CYCLETIMER_DLL_BANDWIDTH_HZ              0.5
-#define IEEE1394SERVICE_MAX_FIREWIRE_PORTS                         4
-#define IEEE1394SERVICE_MIN_SPLIT_TIMEOUT_USECS              1000000
@@ -205 +206 @@
-#define STREAMPROCESSORMANAGER_DYNAMIC_SYNC_DELAY           0
-
-
-
-
+
+
-
-// -- AMDTP options -- //

branches/libffado-2.0/src/genericavc/avc_avdevice.cpp

@@ -529 +529 @@
-    }
-
+    // get the device specific and/or global SP configuration
+    Util::Configuration &config = getDeviceManager().getConfiguration();
+    // base value is the config.h value
+    float recv_sp_dll_bw = STREAMPROCESSOR_DLL_BW_HZ;
+    float xmit_sp_dll_bw = STREAMPROCESSOR_DLL_BW_HZ;
+
+    int xmit_max_cycles_early_transmit = AMDTP_MAX_CYCLES_TO_TRANSMIT_EARLY;
+    int xmit_transfer_delay = AMDTP_TRANSMIT_TRANSFER_DELAY;
+    int xmit_min_cycles_before_presentation = AMDTP_MIN_CYCLES_BEFORE_PRESENTATION;
+
+    // we can override that globally
+    config.getValueForSetting("streaming.common.recv_sp_dll_bw", recv_sp_dll_bw);
+    config.getValueForSetting("streaming.common.xmit_sp_dll_bw", xmit_sp_dll_bw);
+    config.getValueForSetting("streaming.amdtp.xmit_max_cycles_early_transmit", xmit_max_cycles_early_transmit);
+    config.getValueForSetting("streaming.amdtp.xmit_transfer_delay", xmit_transfer_delay);
+    config.getValueForSetting("streaming.amdtp.xmit_min_cycles_before_presentation", xmit_min_cycles_before_presentation);
+
+    // or override in the device section
+    uint32_t vendorid = getConfigRom().getNodeVendorId();
+    uint32_t modelid = getConfigRom().getModelId();
+    config.getValueForDeviceSetting(vendorid, modelid, "recv_sp_dll_bw", recv_sp_dll_bw);
+    config.getValueForDeviceSetting(vendorid, modelid, "xmit_sp_dll_bw", xmit_sp_dll_bw);
+    config.getValueForDeviceSetting(vendorid, modelid, "xmit_max_cycles_early_transmit", xmit_max_cycles_early_transmit);
+    config.getValueForDeviceSetting(vendorid, modelid, "xmit_transfer_delay", xmit_transfer_delay);
+    config.getValueForDeviceSetting(vendorid, modelid, "xmit_min_cycles_before_presentation", xmit_min_cycles_before_presentation);
+
+    // initialize the SP's
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Initializing receive processor...\n");
-    // create & add streamprocessors
@@ -549 +576 @@
-        Streaming::Port::E_Capture)) {
-        debugFatal("Could not add plug to processor!\n");
+        delete p;
+        return false;
+    }
+
+    if(!p->setDllBandwidth(recv_sp_dll_bw)) {
+        debugFatal("Could not set DLL bandwidth\n");
-        delete p;
-        return false;
@@ -568 +601 @@
-        #if AMDTP_ALLOW_PAYLOAD_IN_NODATA_XMIT
-            // FIXME: it seems that some BeBoB devices can't handle NO-DATA without payload
+            // FIXME: make this a config value too
-            t->sendPayloadForNoDataPackets(true);
-        #endif
+
+        // transmit control parameters
+        t->setMaxCyclesToTransmitEarly(xmit_max_cycles_early_transmit);
+        t->setTransferDelay(xmit_transfer_delay);
+        t->setMinCyclesBeforePresentation(xmit_min_cycles_before_presentation);
+
-        p=t;
-    }
@@ -586 +626 @@
-            return false;
-        }
+        if(!p->setDllBandwidth(recv_sp_dll_bw)) {
+            debugFatal("Could not set DLL bandwidth\n");
+            delete p;
+            return false;
+        }
-    } else {
-        if (!addPlugToProcessor(*inputPlug, p,
-            Streaming::Port::E_Playback)) {
-            debugFatal("Could not add plug to processor!\n");
+            return false;
+        }
+        if(!p->setDllBandwidth(xmit_sp_dll_bw)) {
+            debugFatal("Could not set DLL bandwidth\n");
+            delete p;
-            return false;
-        }

branches/libffado-2.0/src/libieee1394/CycleTimerHelper.cpp

@@ -32 +32 @@
-
-#define DLL_PI        (3.141592653589793238)
+#define DLL_2PI       (2 * DLL_PI)
-#define DLL_SQRT2     (1.414213562373095049)
-
-// the high-bandwidth coefficients are used
-// to speed up inital tracking
-#define DLL_BANDWIDTH_HIGH (0.1)
-#define DLL_OMEGA_HIGH     (2.0*DLL_PI*DLL_BANDWIDTH_HIGH)
-#define DLL_COEFF_B_HIGH   (DLL_SQRT2 * DLL_OMEGA_HIGH)
-#define DLL_COEFF_C_HIGH   (DLL_OMEGA_HIGH * DLL_OMEGA_HIGH)
-
-// the low-bandwidth coefficients are used once we have a
-// good estimate of the internal parameters
-#define DLL_BANDWIDTH (0.1)
-#define DLL_OMEGA     (2.0*DLL_PI*DLL_BANDWIDTH)
-#define DLL_COEFF_B   (DLL_SQRT2 * DLL_OMEGA)
-#define DLL_COEFF_C   (DLL_OMEGA * DLL_OMEGA)
-
-// is 1 sec
-#define UPDATES_WITH_HIGH_BANDWIDTH \
-         (1000000 / IEEE1394SERVICE_CYCLETIMER_DLL_UPDATE_INTERVAL_USEC)
-
-IMPL_DEBUG_MODULE( CycleTimerHelper, CycleTimerHelper, DEBUG_LEVEL_NORMAL );
@@ -68 +51 @@
-    , m_cycle_timer_prev ( 0 )
-    , m_cycle_timer_ticks_prev ( 0 )
-    , m_high_bw_updates ( UPDATES_WITH_HIGH_BANDWIDTH )
-    , m_current_shadow_idx ( 0 )
-    , m_Thread ( NULL )
@@ -78 +60 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Create %p...\n", this);
+
+    double bw_rel = IEEE1394SERVICE_CYCLETIMER_DLL_BANDWIDTH_HZ*((double)update_period_us)/1e6;
+    m_dll_coeff_b = bw_rel * (DLL_SQRT2 * DLL_2PI);
+    m_dll_coeff_c = bw_rel * bw_rel * DLL_2PI * DLL_2PI;
+
-}
-
@@ -94 +81 @@
-    , m_cycle_timer_prev ( 0 )
-    , m_cycle_timer_ticks_prev ( 0 )
-    , m_high_bw_updates ( UPDATES_WITH_HIGH_BANDWIDTH )
-    , m_current_shadow_idx ( 0 )
-    , m_Thread ( NULL )
@@ -104 +90 @@
-{
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Create %p...\n", this);
+
+    double bw_rel = IEEE1394SERVICE_CYCLETIMER_DLL_BANDWIDTH_HZ*((double)update_period_us)/1e6;
+    m_dll_coeff_b = bw_rel * (DLL_SQRT2 * DLL_2PI);
+    m_dll_coeff_c = bw_rel * bw_rel * DLL_2PI * DLL_2PI;
-}
-
@@ -189 +179 @@
-    debugOutput( DEBUG_LEVEL_VERBOSE, "requesting DLL re-init...\n" );
-    Util::SystemTimeSource::SleepUsecRelative(1000); // some time to settle
-    m_high_bw_updates = UPDATES_WITH_HIGH_BANDWIDTH;
-    if(!initDLL()) {
-        debugError("(%p) Could not init DLL\n", this);
@@ -283 +272 @@
-    uint64_t cycle_timer_ticks;
-
+    double bw_rel = m_dll_coeff_b / (DLL_SQRT2 * DLL_2PI);
+    double bw_abs = bw_rel / (m_usecs_per_update / 1e6);
+    if (bw_rel > 0.5) {
+        double bw_max = 0.5 / (m_usecs_per_update / 1e6);
+        debugWarning("Specified DLL bandwidth too high (%f > %f), reducing to max."
+                     " Increase the DLL update rate to increase the max DLL bandwidth\n", bw_abs, bw_max);
+
+        bw_rel = 0.49;
+        bw_abs = bw_rel / (m_usecs_per_update / 1e6);
+        m_dll_coeff_b = bw_rel * (DLL_SQRT2 * DLL_2PI);
+        m_dll_coeff_c = bw_rel * bw_rel * DLL_2PI * DLL_2PI;
+    }
+
-    if(!readCycleTimerWithRetry(&cycle_timer, &local_time, 10)) {
-        debugError("Could not read cycle timer register\n");
@@ -305 +307 @@
-    m_next_time_ticks = addTicks( (uint64_t)m_current_time_ticks, (uint64_t)m_dll_e2);
-    debugOutput(DEBUG_LEVEL_VERBOSE, " (%p) First run\n", this);
+    debugOutput(DEBUG_LEVEL_VERBOSE, "  DLL bandwidth: %f Hz (rel: %f)\n", 
+                bw_abs, bw_rel);
-    debugOutput(DEBUG_LEVEL_VERBOSE,
-                "  usecs/update: %lu, ticks/update: %lu, m_dll_e2: %f\n",
@@ -383 +387 @@
-
-        // check for unrealistic CTR reads (NEC controller does that sometimes)
-HALFCYCLE || err_ticks > 1*TICKS_PER_HALF
+CYCLE || err_ticks > 1*TICKS_PER_
-        if(not_good) {
-            debugOutput(DEBUG_LEVEL_VERBOSE, 
@@ -389 +393 @@
-                        this, err_ticks, 1*TICKS_PER_CYCLE, ntries, expected_ticks);
-            // sleep half a cycle to make sure the hardware moved on
-/2
+
-        }
-
@@ -477 +481 @@
-
-        // decide what coefficients to use
-        double coeff_b, coeff_c;
-        if (m_high_bw_updates > 0) {
-            coeff_b = DLL_COEFF_B_HIGH;
-            coeff_c = DLL_COEFF_C_HIGH;
-            m_high_bw_updates--;
-            if (m_high_bw_updates == 0) {
-                debugOutput(DEBUG_LEVEL_VERBOSE,
-                            "Switching to low-bandwidth coefficients\n");
-            }
-        } else {
-            coeff_b = DLL_COEFF_B;
-            coeff_c = DLL_COEFF_C;
-        }
-
-        // it should be ok to not do this in tick space 
@@ -500 +491 @@
-
-        double diff_ticks_corr_d =  (double)diff_ticks_corr;
-
+m_dll_
-        debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
-                           "diff_ticks_corr=%f, step_ticks=%f\n",
@@ -528 +519 @@
-
-        // update the DLL state
-
+m_dll_
-
-        // update the y-axis values

branches/libffado-2.0/src/libieee1394/CycleTimerHelper.h

@@ -147 +147 @@
-    uint32_t m_cycle_timer_prev;
-    uint64_t m_cycle_timer_ticks_prev;
-
+
+
+
-
-    // cached vars used for computation

branches/libffado-2.0/src/libstreaming/amdtp/AmdtpReceiveStreamProcessor.cpp

@@ -104 +104 @@
-    if(ok) {
-        m_last_timestamp = sytRecvToFullTicks2((uint32_t)CondSwapFromBus16(packet->syt), pkt_ctr);
+
-        //#ifdef DEBUG
-        #if 0

branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.cpp

@@ -54 +54 @@
-        , m_send_nodata_payload ( AMDTP_SEND_PAYLOAD_IN_NODATA_XMIT_BY_DEFAULT )
-#endif
+        , m_max_cycles_to_transmit_early ( AMDTP_MAX_CYCLES_TO_TRANSMIT_EARLY )
+        , m_transmit_transfer_delay ( AMDTP_TRANSMIT_TRANSFER_DELAY )
+        , m_min_cycles_before_presentation ( AMDTP_MIN_CYCLES_BEFORE_PRESENTATION )
-        , m_nb_audio_ports( 0 )
-        , m_nb_midi_ports( 0 )
@@ -103 +106 @@
-
-    // now we calculate the time when we have to transmit the sample block
-AMDTP_TRANSMIT_TRANSFER_DELAY
+m_transmit_transfer_delay
-
-    // calculate the cycle this block should be presented in
@@ -135 +138 @@
-        // we can still postpone the queueing of the packets
-        // if we are far enough ahead of the presentation time
-AMDTP_MIN_CYCLES_BEFORE_PRESENTATION
+m_min_cycles_before_presentation
-        {
-            debugOutput( DEBUG_LEVEL_NORMAL,
@@ -206 +209 @@
-            // NOTE: dangerous since the device has no way of reporting that it didn't get
-            //       this packet on time.
-AMDTP_MIN_CYCLES_BEFORE_PRESENTATION
+m_min_cycles_before_presentation
-            {
-                // we are not that late and can still try to transmit the packet
@@ -218 +221 @@
-            }
-        }
-AMDTP_MAX_CYCLES_TO_TRANSMIT_EARLY
+m_max_cycles_to_transmit_early
-        {
-            // it's time send the packet
@@ -242 +245 @@
-                               presentation_time, (unsigned int)TICKS_TO_CYCLES(presentation_time));
-#ifdef DEBUG
-AMDTP_MAX_CYCLES_TO_TRANSMIT_EARLY
+m_max_cycles_to_transmit_early
-            {
-                debugOutputExtreme(DEBUG_LEVEL_VERY_VERBOSE,
@@ -429 +432 @@
-    m_syt_interval = getSytInterval();
-    m_fdf = getFDF();
+
+    debugOutput ( DEBUG_LEVEL_VERBOSE, " SYT interval / FDF             : %d / %d\n", m_syt_interval, m_fdf );
+#if AMDTP_ALLOW_PAYLOAD_IN_NODATA_XMIT
+    debugOutput ( DEBUG_LEVEL_VERBOSE, " Send payload in No-Data packets: %s \n", m_send_nodata_payload?"Yes":"No" );
+#endif
+    debugOutput ( DEBUG_LEVEL_VERBOSE, " Max early transmit cycles      : %d\n", m_max_cycles_to_transmit_early );
+    debugOutput ( DEBUG_LEVEL_VERBOSE, " Transfer delay                 : %d\n", m_transmit_transfer_delay );
+    debugOutput ( DEBUG_LEVEL_VERBOSE, " Min cycles before presentation : %d\n", m_min_cycles_before_presentation );
-
-    iec61883_cip_init (

branches/libffado-2.0/src/libstreaming/amdtp/AmdtpTransmitStreamProcessor.h

@@ -110 +110 @@
-    virtual unsigned int getNominalFramesPerPacket()
-                    {return getSytInterval();};
+    // transmit control parameters
+    virtual int getMaxCyclesToTransmitEarly()
+                    {return m_max_cycles_to_transmit_early;};
+    virtual void setMaxCyclesToTransmitEarly(int x)
+                    {m_max_cycles_to_transmit_early = x;};
+    virtual unsigned int getTransferDelay()
+                    {return m_transmit_transfer_delay;};
+    virtual void setTransferDelay(unsigned int x)
+                    {m_transmit_transfer_delay = x;};
+    virtual int getMinCyclesBeforePresentation()
+                    {return m_min_cycles_before_presentation;};
+    virtual void setMinCyclesBeforePresentation(int x)
+                    {m_min_cycles_before_presentation = x;};
-
-protected:
@@ -141 +154 @@
-    bool m_send_nodata_payload;
-#endif
+    int m_max_cycles_to_transmit_early;
+    unsigned int m_transmit_transfer_delay;
+    int m_min_cycles_before_presentation;
-
-private: // local port caching for performance

branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.cpp

@@ -76 +76 @@
-    , m_scratch_buffer_size_bytes( 0 )
-    , m_ticks_per_frame( 0 )
+    , m_dll_bandwidth_hz ( STREAMPROCESSOR_DLL_BW_HZ )
-    , m_sync_delay( 0 )
-    , m_in_xrun( false )
@@ -136 +137 @@
-
-int StreamProcessor::getMaxFrameLatency() {
-
-
-
-
-
+
-}
-
@@ -282 +279 @@
-
-bool
+StreamProcessor::setDllBandwidth(float bw)
+{
+    m_dll_bandwidth_hz = bw;
+    return true;
+}
+
+bool
-StreamProcessor::canClientTransferFrames(unsigned int nbframes)
-{
@@ -397 +401 @@
-
-    if (result == eCRV_OK) {
+        #ifdef DEBUG
+        if (m_last_timestamp > 0 && m_last_timestamp2 > 0) {
+            int64_t tsp_diff = diffTicks(m_last_timestamp, m_last_timestamp2);
+            debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "TSP diff: %lld\n", tsp_diff);
+            double tsp_diff_d = tsp_diff;
+            double fs_syt = 1.0/tsp_diff_d;
+            fs_syt *= (double)getNominalFramesPerPacket() * (double)TICKS_PER_USEC * 1e6;
+            double fs_nom = (double)m_StreamProcessorManager.getNominalRate();
+            double fs_diff = fs_nom - fs_syt;
+            double fs_diff_norm = fs_diff/fs_nom;
+            debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "Nom fs: %12f, Instantanous fs: %12f, diff: %12f (%12f)\n",
+                        fs_nom, fs_syt, fs_diff, fs_diff_norm);
+            if (fs_diff_norm > 0.01 || fs_diff_norm < -0.01) {
+                debugWarning( "Instantanous samplerate more than 1%% off nominal. [Nom fs: %12f, Instantanous fs: %12f, diff: %12f (%12f)]\n",
+                        fs_nom, fs_syt, fs_diff, fs_diff_norm);
+            }
+        }
+        #endif
+
-//         #ifdef DEBUG
-        int ticks_per_packet = (int)(getTicksPerFrame() * getNominalFramesPerPacket());
@@ -702 +725 @@
-            }
-            #ifdef DEBUG
+            if (m_last_timestamp > 0 && m_last_timestamp2 > 0) {
+                int64_t tsp_diff = diffTicks(m_last_timestamp, m_last_timestamp2);
+                debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "TSP diff: %lld\n", tsp_diff);
+                double tsp_diff_d = tsp_diff;
+                double fs_syt = 1.0/tsp_diff_d;
+                fs_syt *= (double)getNominalFramesPerPacket() * (double)TICKS_PER_USEC * 1e6;
+                double fs_nom = (double)m_StreamProcessorManager.getNominalRate();
+                double fs_diff = fs_nom - fs_syt;
+                double fs_diff_norm = fs_diff/fs_nom;
+                debugOutputExtreme(DEBUG_LEVEL_VERBOSE, "Nom fs: %12f, Instantanous fs: %12f, diff: %12f (%12f)\n",
+                           fs_nom, fs_syt, fs_diff, fs_diff_norm);
+                if (fs_diff_norm > 0.01 || fs_diff_norm < -0.01) {
+                    debugWarning( "Instantanous samplerate more than 1%% off nominal. [Nom fs: %12f, Instantanous fs: %12f, diff: %12f (%12f)]\n",
+                           fs_nom, fs_syt, fs_diff, fs_diff_norm);
+                }
+            }
+
-            int ticks_per_packet = (int)(getTicksPerFrame() * getNominalFramesPerPacket());
-            int diff = diffTicks(m_last_timestamp, m_last_timestamp2);
@@ -1097 +1137 @@
-
-    debugOutput( DEBUG_LEVEL_VERBOSE, "Prepared for:\n");
-
-
+  [DLL Bandwidth: %f Hz]
+, m_dll_bandwidth_hz
-    debugOutput( DEBUG_LEVEL_VERBOSE, " PeriodSize: %d, NbBuffers: %d\n",
-             m_StreamProcessorManager.getPeriodSize(), m_StreamProcessorManager.getNbBuffers());
@@ -1358 +1398 @@
-            m_correct_last_timestamp = false;
-
-
+ 
-
-            // initialize internal buffer
@@ -1372 +1412 @@
-            result &= m_data_buffer->setNominalRate(ticks_per_frame);
-            result &= m_data_buffer->setWrapValue(128L*TICKS_PER_SECOND);
+            result &= m_data_buffer->setBandwidth(m_dll_bandwidth_hz / (double)TICKS_PER_SECOND);
-            result &= m_data_buffer->prepare(); // FIXME: the name
+
+            debugOutput(DEBUG_LEVEL_VERBOSE, "DLL info: nominal tpf: %f, update period: %d, bandwidth: %e 1/ticks (%e Hz)\n", 
+                        m_data_buffer->getNominalRate(), m_data_buffer->getUpdatePeriod(), m_data_buffer->getBandwidth(), m_data_buffer->getBandwidth() * TICKS_PER_SECOND);
-
-            break;

branches/libffado-2.0/src/libstreaming/generic/StreamProcessor.h

@@ -405 +405 @@
-        void setTicksPerFrame(float tpf);
-
+        bool setDllBandwidth(float bw);
+
-        int getBufferFill();
-
@@ -451 +453 @@
-    protected:
-        float m_ticks_per_frame;
+        float m_dll_bandwidth_hz;
-        unsigned int m_sync_delay;
-    private:

branches/libffado-2.0/src/libutil/Configuration.cpp

@@ -270 +270 @@
-}
-
+bool
+Configuration::getValueForSetting(std::string path, float &ref)
+{
+    libconfig::Setting *s = getSetting( path );
+    if(s) {
+        // FIXME: this can be done using the libconfig methods
+        Setting::Type t = s->getType();
+        if(t == Setting::TypeFloat) {
+            ref = *s;
+            debugOutput(DEBUG_LEVEL_VERBOSE, "path '%s' has value %f\n", path.c_str(), ref);
+            return true;
+        } else {
+            debugOutput(DEBUG_LEVEL_VERBOSE, "path '%s' has wrong type\n", path.c_str());
+            return false;
+        }
+    } else {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "path '%s' not found\n", path.c_str());
+        return false;
+    }
+}
+
-libconfig::Setting *
-Configuration::getSetting( std::string path )
@@ -308 +329 @@
-bool
-Configuration::getValueForDeviceSetting(unsigned int vendor_id, unsigned model_id, std::string setting, int64_t &ref)
+{
+    libconfig::Setting *s = getDeviceSetting( vendor_id, model_id );
+    if(s) {
+        try {
+            return s->lookupValue(setting, ref);
+        } catch (...) {
+            debugOutput(DEBUG_LEVEL_VERBOSE, "Setting %s not found\n", setting.c_str());
+            return false;
+        }
+    } else {
+        debugOutput(DEBUG_LEVEL_VERBOSE, "device %X/%X not found\n", vendor_id, model_id);
+        return false;
+    }
+}
+
+bool
+Configuration::getValueForDeviceSetting(unsigned int vendor_id, unsigned model_id, std::string setting, float &ref)
-{
-    libconfig::Setting *s = getDeviceSetting( vendor_id, model_id );

branches/libffado-2.0/src/libutil/Configuration.h

@@ -126 +126 @@
-    bool getValueForSetting(std::string path, int32_t &ref);
-    bool getValueForSetting(std::string path, int64_t &ref);
+    bool getValueForSetting(std::string path, float &ref);
-
-    /**
@@ -141 +142 @@
-    bool getValueForDeviceSetting(unsigned int vendor_id, unsigned model_id, std::string setting, int32_t &ref);
-    bool getValueForDeviceSetting(unsigned int vendor_id, unsigned model_id, std::string setting, int64_t &ref);
+    bool getValueForDeviceSetting(unsigned int vendor_id, unsigned model_id, std::string setting, float &ref);
-
-    virtual void setVerboseLevel(int l) {setDebugLevel(l);};

branches/libffado-2.0/src/libutil/TimestampedBuffer.cpp

@@ -36 +36 @@
-#define DLL_PI        (3.141592653589793238)
-#define DLL_SQRT2     (1.414213562373095049)
-
+
+
+
+
-#define DLL_COEFF_B   (DLL_SQRT2 * DLL_OMEGA)
-#define DLL_COEFF_C   (DLL_OMEGA * DLL_OMEGA)
@@ -84 +87 @@
-
-/**
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- * to initialize the DLL that will extract the effective rate based
- * upon the timestamps it gets fed.
@@ -94 +134 @@
- */
-bool TimestampedBuffer::setNominalRate(float r) {
+    debugOutput(DEBUG_LEVEL_VERBOSE," nominal rate %e => %e\n",
+                                    m_nominal_rate, r);
-    m_nominal_rate=r;
-    debugOutput(DEBUG_LEVEL_VERBOSE," nominal rate=%e set to %e\n",
-                                    m_nominal_rate, r);
-    return true;
-}
@@ -362 +402 @@
-    m_dll_e2=m_nominal_rate * (float)m_update_period;
-
-    m_dll_b=((float)(DLL_COEFF_B));
-    m_dll_c=((float)(DLL_COEFF_C));
-    
-    // this will init the internal timestamps to a sensible value
-    setBufferTailTimestamp(m_buffer_tail_timestamp);
@@ -958 +995 @@
-
-#ifdef DEBUG
+
-    // check whether the update is within the allowed bounds
-    ffado_timestamp_t max_abs_diff = 3072/2; // half a cycle is what we consider 'normal'

branches/libffado-2.0/src/libutil/TimestampedBuffer.h

@@ -136 +136 @@
-
-        // dll stuff
+        bool setBandwidth(double bw);
+        double getBandwidth();
-        bool setNominalRate ( float r );
-        float getNominalRate() {return m_nominal_rate;};

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

@@ -24 +24 @@
-
-#include "motu/motu_avdevice.h"
+
+#include "devicemanager.h"
-
-#include "libieee1394/configrom.h"
@@ -1397 +1399 @@
-    }
-
+    // get the device specific and/or global SP configuration
+    Util::Configuration &config = getDeviceManager().getConfiguration();
+    // base value is the config.h value
+    float recv_sp_dll_bw = STREAMPROCESSOR_DLL_BW_HZ;
+    float xmit_sp_dll_bw = STREAMPROCESSOR_DLL_BW_HZ;
+
+    // we can override that globally
+    config.getValueForSetting("streaming.spm.recv_sp_dll_bw", recv_sp_dll_bw);
+    config.getValueForSetting("streaming.spm.xmit_sp_dll_bw", xmit_sp_dll_bw);
+
+    // or override in the device section
+    config.getValueForDeviceSetting(getConfigRom().getNodeVendorId(), getConfigRom().getModelId(), "recv_sp_dll_bw", recv_sp_dll_bw);
+    config.getValueForDeviceSetting(getConfigRom().getNodeVendorId(), getConfigRom().getModelId(), "xmit_sp_dll_bw", xmit_sp_dll_bw);
+
-    m_receiveProcessor=new Streaming::MotuReceiveStreamProcessor(*this, event_size_in);
+    m_receiveProcessor->setVerboseLevel(getDebugLevel());
-
-    // The first thing is to initialize the processor.  This creates the
@@ -1405 +1422 @@
-        return false;
-    }
-
+
+
+
+
+
+
+
-
-    // Now we add ports to the processor
@@ -1467 +1490 @@
-    }
-
+    if(!m_transmitProcessor->setDllBandwidth(xmit_sp_dll_bw)) {
+        debugFatal("Could not set DLL bandwidth\n");
+        delete m_transmitProcessor;
+        m_transmitProcessor = NULL;
+        return false;
+    }
+
-    // Now we add ports to the processor
-    debugOutput(DEBUG_LEVEL_VERBOSE,"Adding ports to transmit processor\n");