Changeset 1288

Timestamp:

07/10/08 11:08:36 (13 years ago)

Author:

ppalmers

Message:

implement samplerate control through the mixer panels. disabled by default due to potential issues with rediscovery and a running jackd

Files:

• branches/libffado-2.0/src/bebob/bebob_avdevice.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/bebob/bebob_avdevice.h (modified) (1 diff)
• branches/libffado-2.0/src/ffadodevice.h (modified) (1 diff)
• branches/libffado-2.0/src/fireworks/fireworks_device.cpp (modified) (1 diff)
• branches/libffado-2.0/src/fireworks/fireworks_device.h (modified) (1 diff)
• branches/libffado-2.0/src/genericavc/avc_avdevice.cpp (modified) (1 diff)
• branches/libffado-2.0/src/genericavc/avc_avdevice.h (modified) (2 diffs)
• branches/libffado-2.0/src/libavc/general/avc_plug.cpp (modified) (1 diff)
• branches/libffado-2.0/src/libavc/general/avc_plug.h (modified) (1 diff)
• branches/libffado-2.0/src/libcontrol/ClockSelect.cpp (modified) (2 diffs)
• branches/libffado-2.0/src/libcontrol/ClockSelect.h (modified) (2 diffs)
• branches/libffado-2.0/src/motu/motu_avdevice.cpp (modified) (1 diff)
• branches/libffado-2.0/src/motu/motu_avdevice.h (modified) (1 diff)
• branches/libffado-2.0/support/mixer/ffadomixer.in (modified) (2 diffs)
• branches/libffado-2.0/support/mixer/mixer_global.py (modified) (2 diffs)
• branches/libffado-2.0/support/mixer/mixer_global.ui (modified) (4 diffs)

branches/libffado-2.0/src/bebob/bebob_avdevice.cpp

@@ -174 +174 @@
-}
-
+#define BEBOB_CHECK_AND_ADD_SR(v, x) \
+    { if(supportsSamplingFrequency(x)) \
+      v.push_back(x); }
-bool
-AvDevice::discover()
@@ -434 +437 @@
-}
-
-
-uint8_t
-AvDevice::getConfigurationIdSampleRate()

branches/libffado-2.0/src/bebob/bebob_avdevice.h

@@ -108 +108 @@
-    virtual uint16_t getConfigurationIdSyncMode();
-
+    std::vector<int> m_supported_frequencies;
-protected:
-    Mixer*             m_Mixer;

branches/libffado-2.0/src/ffadodevice.h

@@ -138 +138 @@
-     */
-    virtual int getSamplingFrequency( ) = 0;
+
+    /**
+     * @brief get the supported sampling frequencies
+     * @return a vector containing the supported sampling frequencies
+     */
+    virtual std::vector<int> getSupportedSamplingFrequencies( ) = 0;
-
-    /**

branches/libffado-2.0/src/fireworks/fireworks_device.cpp

@@ -427 +427 @@
-}
-
+#define ECHO_CHECK_AND_ADD_SR(v, x) \
+    { if(x >= m_HwInfo.m_min_sample_rate && x <= m_HwInfo.m_max_sample_rate) \
+      v.push_back(x); }
+std::vector<int>
+Device::getSupportedSamplingFrequencies()
+{
+    std::vector<int> frequencies;
+    ECHO_CHECK_AND_ADD_SR(frequencies, 22050);
+    ECHO_CHECK_AND_ADD_SR(frequencies, 24000);
+    ECHO_CHECK_AND_ADD_SR(frequencies, 32000);
+    ECHO_CHECK_AND_ADD_SR(frequencies, 44100);
+    ECHO_CHECK_AND_ADD_SR(frequencies, 48000);
+    ECHO_CHECK_AND_ADD_SR(frequencies, 88200);
+    ECHO_CHECK_AND_ADD_SR(frequencies, 96000);
+    ECHO_CHECK_AND_ADD_SR(frequencies, 176400);
+    ECHO_CHECK_AND_ADD_SR(frequencies, 192000);
+    return frequencies;
+}
+
-FFADODevice::ClockSourceVector
-Device::getSupportedClockSources() {

branches/libffado-2.0/src/fireworks/fireworks_device.h

@@ -60 +60 @@
-    virtual bool buildMixer();
-    virtual bool destroyMixer();
+
+    virtual std::vector<int> getSupportedSamplingFrequencies();
-
-    virtual ClockSourceVector getSupportedClockSources();

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

@@ -240 +240 @@
-    return false;
-
+}
+
+bool
+AvDevice::supportsSamplingFrequency( int s )
+{
+    Util::MutexLockHelper lock(m_DeviceMutex);
+
+    AVC::Plug* plug = getPlugById( m_pcrPlugs, Plug::eAPD_Input, 0 );
+    if ( !plug ) {
+        debugError( "Could not retrieve iso input plug 0\n" );
+        return false;
+    }
+
+    if ( !plug->supportsSampleRate( s ) )
+    {
+        debugError( "sample rate not supported by input plug\n" );
+        return false;
+    }
+
+    plug = getPlugById( m_pcrPlugs, Plug::eAPD_Output,  0 );
+    if ( !plug ) {
+        debugError( "Could not retrieve iso output plug 0\n" );
+        return false;
+    }
+
+    if ( !plug->supportsSampleRate( s ) )
+    {
+        debugError( "sample rate not supported by output plug\n" );
+        return false;
+    }
+    return true;
+}
+
+#define GENERICAVC_CHECK_AND_ADD_SR(v, x) \
+    { if(supportsSamplingFrequency(x)) \
+      v.push_back(x); }
+
+std::vector<int>
+AvDevice::getSupportedSamplingFrequencies()
+{
+    if (m_supported_frequencies_cache.size() == 0) {
+        GENERICAVC_CHECK_AND_ADD_SR(m_supported_frequencies_cache, 22050);
+        GENERICAVC_CHECK_AND_ADD_SR(m_supported_frequencies_cache, 24000);
+        GENERICAVC_CHECK_AND_ADD_SR(m_supported_frequencies_cache, 32000);
+        GENERICAVC_CHECK_AND_ADD_SR(m_supported_frequencies_cache, 44100);
+        GENERICAVC_CHECK_AND_ADD_SR(m_supported_frequencies_cache, 48000);
+        GENERICAVC_CHECK_AND_ADD_SR(m_supported_frequencies_cache, 88200);
+        GENERICAVC_CHECK_AND_ADD_SR(m_supported_frequencies_cache, 96000);
+        GENERICAVC_CHECK_AND_ADD_SR(m_supported_frequencies_cache, 176400);
+        GENERICAVC_CHECK_AND_ADD_SR(m_supported_frequencies_cache, 192000);
+    }
+    return m_supported_frequencies_cache;
-}
-

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

@@ -62 +62 @@
-
-    virtual bool setSamplingFrequency( int );
+    virtual bool supportsSamplingFrequency( int s );
-    virtual int getSamplingFrequency( );
+    virtual std::vector<int> getSupportedSamplingFrequencies();
-
-    virtual ClockSourceVector getSupportedClockSources();
@@ -103 +105 @@
-private:
-    ClockSource syncInfoToClockSource(const SyncInfo& si);
+    std::vector<int> m_supported_frequencies_cache;
-};
-

branches/libffado-2.0/src/libavc/general/avc_plug.cpp

@@ -1015 +1015 @@
-
-bool
+Plug::supportsSampleRate( int rate )
+{
+    // fallback: BeBoB style
+    ESamplingFrequency samplingFrequency = parseSampleRate(rate);
+
+    ExtendedStreamFormatCmd extStreamFormatCmd(
+        m_unit->get1394Service(),
+        ExtendedStreamFormatCmd::eSF_ExtendedStreamFormatInformationCommandList );
+    UnitPlugAddress unitPlugAddress( UnitPlugAddress::ePT_PCR,
+                                     getPlugId() );
+
+    extStreamFormatCmd.setPlugAddress(
+        PlugAddress(
+            Plug::convertPlugDirection(getPlugDirection() ),
+            PlugAddress::ePAM_Unit,
+            unitPlugAddress ) );
+
+    extStreamFormatCmd.setNodeId( m_unit->getConfigRom().getNodeId() );
+    extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
+
+    int i = 0;
+    bool cmdSuccess = false;
+    bool correctFormatFound = false;
+
+    do {
+        extStreamFormatCmd.setIndexInStreamFormat( i );
+        extStreamFormatCmd.setCommandType( AVCCommand::eCT_Status );
+        extStreamFormatCmd.setVerbose( getDebugLevel() );
+
+        cmdSuccess = extStreamFormatCmd.fire();
+
+        if ( cmdSuccess
+             && ( extStreamFormatCmd.getResponse() ==
+                  AVCCommand::eR_Implemented ) )
+        {
+            ESamplingFrequency foundFreq = eSF_DontCare;
+
+            FormatInformation* formatInfo =
+                extStreamFormatCmd.getFormatInformation();
+            FormatInformationStreamsCompound* compoundStream
+                = dynamic_cast< FormatInformationStreamsCompound* > (
+                    formatInfo->m_streams );
+            if ( compoundStream ) {
+                foundFreq =
+                    static_cast< ESamplingFrequency >(
+                        compoundStream->m_samplingFrequency );
+            }
+
+            FormatInformationStreamsSync* syncStream
+                = dynamic_cast< FormatInformationStreamsSync* > (
+                    formatInfo->m_streams );
+            if ( syncStream ) {
+                foundFreq =
+                    static_cast< ESamplingFrequency >(
+                        syncStream->m_samplingFrequency );
+            }
+
+            if ( foundFreq == samplingFrequency )
+            {
+                correctFormatFound = true;
+                break;
+            }
+        }
+
+        ++i;
+    } while ( cmdSuccess
+              && ( extStreamFormatCmd.getResponse() ==
+                   ExtendedStreamFormatCmd::eR_Implemented ) );
+
+    if ( !cmdSuccess ) {
+        debugError( "setSampleRatePlug: Failed to retrieve format info\n" );
+        return false;
+    }
+
+    if ( !correctFormatFound ) {
+        debugOutput(DEBUG_LEVEL_VERBOSE,
+                    "setSampleRatePlug: %s plug %d does not support sample rate %d\n",
+                    getName(),
+                    getPlugId(),
+                    convertESamplingFrequency( samplingFrequency ) );
+        return false;
+    }
+    return true;
+}
+
+bool
-Plug::discoverConnectionsFromSpecificData(
-    EPlugDirection discoverDirection,

branches/libffado-2.0/src/libavc/general/avc_plug.h

@@ -129 +129 @@
-    int getSampleRate() const; // 22050, 24000, 32000, ...
-    bool setSampleRate( int rate );
+    bool supportsSampleRate( int rate );
-
-    int getNrOfChannels() const;

branches/libffado-2.0/src/libcontrol/ClockSelect.cpp

@@ -173 +173 @@
-
-SamplerateSelect::SamplerateSelect(FFADODevice &d)
-Discrete
+Enum
-, m_Device( d )
-{
@@ -182 +182 @@
-
-bool
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-} // namespace Control

branches/libffado-2.0/src/libcontrol/ClockSelect.h

@@ -69 +69 @@
-*/
-class SamplerateSelect
-Discrete
+Enum
-{
-public:
@@ -75 +75 @@
-    virtual ~SamplerateSelect() {};
-
-tValue(int v
-getValue
-bool setValue(int idx, int v
-int getValue
+lect(int idx
+selected
+int count(
+std::string getEnumLabel
-
-int getMinimum
-
+void show
+
-protected:
-    FFADODevice &m_Device;

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

@@ -825 +825 @@
-}
-
+std::vector<int>
+MotuDevice::getSupportedSamplingFrequencies()
+{
+    std::vector<int> frequencies;
+    frequencies.push_back(44100);
+    frequencies.push_back(48000);
+    frequencies.push_back(88200);
+    frequencies.push_back(96000);
+    frequencies.push_back(176400);
+    frequencies.push_back(192000);
+    return frequencies;
+}
+
-FFADODevice::ClockSource
-MotuDevice::clockIdToClockSource(unsigned int id) {

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

@@ -161 +161 @@
-    virtual bool setSamplingFrequency( int samplingFrequency );
-    virtual int getSamplingFrequency( );
+    virtual std::vector<int> getSupportedSamplingFrequencies();
-
-    FFADODevice::ClockSource clockIdToClockSource(unsigned int id);

branches/libffado-2.0/support/mixer/ffadomixer.in

@@ -273 +273 @@
-    def getAttributeName(self, idx):
-        return self.iface.getAttributeName(idx)
+
+class SamplerateSelectInterface:
+    def __init__(self, servername, devicepath):
+        self.basepath=devicepath + '/Generic/SamplerateSelect'
+        self.servername=servername
+        self.bus=dbus.SessionBus()
+        self.dev = self.bus.get_object(self.servername, self.basepath)
+        self.iface = dbus.Interface(self.dev, dbus_interface='org.ffado.Control.Element.Enum')
+    def count(self):
+        return self.iface.count()
+    def select(self, idx):
+        return self.iface.select(idx)
+    def selected(self):
+        return self.iface.selected()
+    def getEnumLabel(self, idx):
+        return self.iface.getEnumLabel(idx)
-
-class TextInterface:
@@ -396 +412 @@
-        tmp = GlobalMixer( w )
-        tmp.clockselect = ClockSelectInterface( server, basepath+"/DeviceManager/"+path )
+        tmp.samplerateselect = SamplerateSelectInterface( server, basepath+"/DeviceManager/"+path )
-        tmp.nickname = TextInterface( server, basepath+"/DeviceManager/"+path+"/Generic/Nickname" )
-        tmp.hw = hw

branches/libffado-2.0/support/mixer/mixer_global.py

@@ -41 +41 @@
-                        self.clocksource.setCurrentItem( selected )
-
+        def samplerateChanged( self, sr ):
+                print "samplerateChanged( " + str(sr) + " )"
+                self.samplerateselect.select( sr )
+                selected = self.samplerateselect.selected()
+
+                if selected != sr:
+                        srname = self.samplerateselect.getEnumLabel( sr )
+                        msg = QMessageBox()
+                        msg.question( msg, "Failed to select sample rate", \
+                                "<qt>Could not select %s as samplerate.</qt>" % srname, \
+                                QMessageBox.Ok )
+                        self.samplerate.setCurrentItem( selected )
+
-        def nicknameChanged( self, name ):
-                #print "nicknameChanged( %s )" % name
@@ -50 +63 @@
-                        self.clocksource.insertItem( self.clockselect.getEnumLabel( i ) )
-                self.clocksource.setCurrentItem( self.clockselect.selected() )
+
+                for i in range( self.samplerateselect.count() ):
+                        self.samplerate.insertItem( self.samplerateselect.getEnumLabel( i ) )
+                self.samplerate.setCurrentItem( self.samplerateselect.selected() )
+
-                self.txtNickname.setText( self.nickname.text() )
-

branches/libffado-2.0/support/mixer/mixer_global.ui

@@ -26 +26 @@
-            <x>0</x>
-            <y>0</y>
-600
+721
-            <height>191</height>
-        </rect>
@@ -41 +41 @@
-        <string>Global Mixer Options</string>
-    </property>
-grid
+hbox
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-bel" row="0" column="0
+youtWidget
-            <property name="name">
-textLabel1
+layout5
-            </property>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        </widget>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-            <property name="name">
-                <cstring>spacer1</cstring>
@@ -95 +161 @@
-            <property name="sizeHint">
-                <size>
-111
+330
-                    <height>71</height>
-                </size>
-            </property>
-        </spacer>
-grid
+hbox
-</widget>
-<connections>
@@ -115 +181 @@
-        <slot>nicknameChanged(const QString&amp;)</slot>
-    </connection>
+    <connection>
+        <sender>samplerate</sender>
+        <signal>activated(int)</signal>
+        <receiver>GlobalMixerUi</receiver>
+        <slot>samplerateChanged(int)</slot>
+    </connection>
-</connections>
-<slots>
-    <slot>clockChanged( int )</slot>
-    <slot>nicknameChanged( const QString&amp; )</slot>
+    <slot>samplerateChanged(int)</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>