Changeset 323

Timestamp:

11/12/06 09:11:57 (17 years ago)

Author:

wagi

Message:

2006-11-12 Daniel Wagner <wagi@newton.monom.org>

• basic function block AV/C commands added.
  test program for setting the volume added.
  

Files:

• trunk/libfreebob/ChangeLog (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_definitions.h (modified) (1 diff)
• trunk/libfreebob/src/libfreebobavc/avc_function_block.cpp (moved) (moved from trunk/libfreebob/src/libfreebobavc/avc_feature_function_block.cpp) (5 diffs)
• trunk/libfreebob/src/libfreebobavc/avc_function_block.h (moved) (moved from trunk/libfreebob/src/libfreebobavc/avc_feature_function_block.h) (6 diffs)
• trunk/libfreebob/src/Makefile.am (modified) (1 diff)
• trunk/libfreebob/tests/test-volume.cpp (modified) (4 diffs)

trunk/libfreebob/ChangeLog

@@ +1 @@
+2006-11-12  Daniel Wagner  <wagi@newton.monom.org>
+
+        * basic function block AV/C commands added.
+        test program for setting the volume added.
+
-2006-11-11  Daniel Wagner  <wagi@newton.monom.org>
-

trunk/libfreebob/src/libfreebobavc/avc_definitions.h

@@ -70 +70 @@
-typedef byte_t control_selector_t;
-typedef byte_t control_data_length_t;
+typedef byte_t input_fb_plug_number_t;
+typedef byte_t input_audio_channel_number_t;
+typedef byte_t output_audio_channel_number_t;
-
-typedef quadlet_t company_id_t;

trunk/libfreebob/src/libfreebobavc/avc_function_block.cpp

@@ -1 @@
-eature_f
+
- * Copyright (C) 2006 by Daniel Wagner
- *
@@ -19 +19 @@
- */
-
-eature_f
+
-#include "serialize.h"
-#include "ieee1394service.h"
-
-
-
-
-
-
+
+
+
+
+
+
-    , m_controlDataLength( 2 )
-    , m_volume( 0 )
@@ -33 +34 @@
-}
-
-
-
-
-
+
+
-    , m_controlDataLength( rhs.m_controlDataLength )
-    , m_volume( rhs.m_volume )
@@ -42 +41 @@
-}
-
-eatureFunctionBlockVolume::~FeatureFunctionBlock
-
-
-
-
-eatureFunctionBlock
+unctionBlockFeatureVolume::~FunctionBlockFeature
+
+
+
+
+unctionBlockFeature
-{
-    bool bStatus;
-    byte_t val;
-
-
-
-
+
+
-    val = (byte_t)(m_volume >> 8);
-eatureFunctionBlock
+unctionBlockFeature
-    val = m_volume & 0xff;
-eatureFunctionBlock
-
-
-
-
-
-eatureFunctionBlock
+unctionBlockFeature
+
+
+
+
+
+unctionBlockFeature
-{
-    bool bStatus;
-    byte_t val;
-    bStatus = de.read( &m_selectorLength );
-    bStatus = de.read( &m_audioChannelNumber );
-    bStatus = de.read( &m_controlSelector );
-
-
+&
+&
-    m_volume = val << 8;
-
+&
-    m_volume |= val;
-
@@ -80 +75 @@
-}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    : AVCCommand( ieee1394service, AVC1394_FUNCTION_BLOCK_CMD )
-
-
-
+
+
+
+
+
+
+
-{
-    setSubunitType( eST_Audio );
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    : AVCCommand( rhs )
-    , m_functionBlockType( rhs.m_functionBlockType )
-    , m_functionBlockId( rhs.m_functionBlockId )
-    , m_controlAttribute( rhs.m_controlAttribute )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    bStatus &= de.read( &m_functionBlockType );
-    bStatus &= de.read( &m_functionBlockId );
-    bStatus &= de.read( &m_controlAttribute );
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/libfreebob/src/libfreebobavc/avc_function_block.h

@@ -1 @@
-eature_f
+
- * Copyright (C) 2006 by Daniel Wagner
- *
@@ -19 +19 @@
- */
-
-EATUREF
-EATUREF
+
+
-
-#include "avc_extended_cmd_generic.h"
@@ -27 +27 @@
-#include <libavc1394/avc1394.h>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    control_selector_t     m_controlSelector;
-    control_data_length_t  m_controlDataLength;
@@ -64 +45 @@
-///////////////////////////////////////////
-
+class FunctionBlockProcessingMixer: public IBusData
+{
+public:
+    FunctionBlockProcessingMixer();
+    FunctionBlockProcessingMixer( const FunctionBlockProcessingMixer& rhs );
+    virtual ~FunctionBlockProcessingMixer();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual FunctionBlockProcessingMixer* clone() const;
+
+    control_selector_t m_controlSelector;
+};
+
+///////////////////////////////////////////
+///////////////////////////////////////////
+
+class FunctionBlockSelector: public IBusData
+{
+// untested
+public:
+    // Control selector encoding
+    enum EControlSelectorEncoding {
+        eCSE_Selector_Selector          = 0x01,
+    };
+
+    FunctionBlockSelector();
+    FunctionBlockSelector( const FunctionBlockSelector& rhs );
+    virtual ~FunctionBlockSelector();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual FunctionBlockSelector* clone() const;
+
+    selector_length_t      m_selectorLength;
+    input_fb_plug_number_t m_inputFbPlugNumber;
+    control_selector_t     m_controlSelector;
+};
+
+///////////////////////////////////////////
+
+class FunctionBlockFeature: public IBusData
+{
+// no complete implementation
+public:
+    // Control selector encoding
+    enum EControlSelectorEncoding {
+        eCSE_Feature_Mute               = 0x01,
+        eCSE_Feature_Volume             = 0x02,
+        eCSE_Feature_LRBalance          = 0x03,
+        eCSE_Feature_FRBalance          = 0x04,
+        eCSE_Feature_Bass               = 0x05,
+        eCSE_Feature_Mid                = 0x06,
+        eCSE_Feature_Treble             = 0x07,
+        eCSE_Feature_GEQ                = 0x08,
+        eCSE_Feature_AGC                = 0x09,
+        eCSE_Feature_Delay              = 0x0a,
+        eCSE_Feature_BassBoost          = 0x0b,
+        eCSE_Feature_Loudness           = 0x0c,
+    };
+
+    FunctionBlockFeature();
+    FunctionBlockFeature( const FunctionBlockFeature& rhs );
+    virtual ~FunctionBlockFeature();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual FunctionBlockFeature* clone() const;
+
+    selector_length_t      m_selectorLength;
+    audio_channel_number_t m_audioChannelNumber;
+
+    FunctionBlockFeatureVolume*     m_pVolume;
+};
+
+///////////////////////////////////////////
+
+class FunctionBlockProcessing: public IBusData
+{
+// no complete implementation
+public:
+    // Function block selector
+    enum EProcessingTypeEncoding {
+        ePTE_Mixer                      = 0x01,
+        ePTE_Generic                    = 0x02,
+        ePTE_UpDown                     = 0x03,
+        ePTE_DolbyProLogic              = 0x04,
+        ePTE_3dStereoExtender           = 0x05,
+        ePTE_Reverberation              = 0x06,
+        ePTE_Chorus                     = 0x07,
+        ePTE_DynamicRangeCompression    = 0x08,
+    };
+
+    // Control selector encoding
+    enum EControlSelectorEncoding {
+        eCSE_Processing_Enable          = 0x01,
+        eCSE_Processing_Mode            = 0x02,
+        eCSE_Processing_Mixer           = 0x03,
+        // lots of definition missing
+    };
+
+    FunctionBlockProcessing();
+    FunctionBlockProcessing( const FunctionBlockProcessing& rhs );
+    virtual ~FunctionBlockProcessing();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual FunctionBlockProcessing* clone() const;
+
+    selector_length_t             m_selectorLength;
+    input_fb_plug_number_t        m_fbInputPlugNumber;
+    input_audio_channel_number_t  m_inputAudioChannelNumber;
+    output_audio_channel_number_t m_outputAudioChannelNumber;
+
+    FunctionBlockProcessingMixer*   m_pMixer;
+};
+
+///////////////////////////////////////////
+
+class FunctionBlockCodec: public IBusData
+{
+// dummy implementation
+public:
+    // CODEC type endcoding
+    enum ECodecTypeEncoding {
+        eCTE_Ac3Decoder                 = 0x01,
+        eCTE_MpegDecoder                = 0x02,
+        eCTE_DtsDecoder                 = 0x03,
+    };
+
+    FunctionBlockCodec();
+    FunctionBlockCodec( const FunctionBlockCodec& rhs );
+    virtual ~FunctionBlockCodec();
+
+    virtual bool serialize( IOSSerialize& se );
+    virtual bool deserialize( IISDeserialize& de );
+    virtual FunctionBlockCodec* clone() const;
+};
+
+///////////////////////////////////////////
+///////////////////////////////////////////
+
-#define AVC1394_FUNCTION_BLOCK_CMD 0xB8
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    enum EControlAttribute {
-        eCA_Resolution = 0x01,
@@ -78 +207 @@
-        eCA_Current    = 0x10,
-        eCA_Move       = 0x18,
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    virtual const char* getCmdName() const
-
-
-
-
-
-
-
+
-
-    function_block_type_t m_functionBlockType;
@@ -102 +228 @@
-    control_attribute_t   m_controlAttribute;
-
-
-
+
+
+
+
-};
-

trunk/libfreebob/src/Makefile.am

@@ -62 +62 @@
-        libfreebobavc/avc_extended_stream_format.cpp    \
-        libfreebobavc/avc_extended_subunit_info.cpp     \
-eature_function_block.cpp
-eature_function_block.h
+unction_block.cpp   
+unction_block.h     
-        libfreebobavc/avc_generic.cpp                   \
-        libfreebobavc/avc_plug_info.cpp                 \

trunk/libfreebob/tests/test-volume.cpp

@@ -1 +1 @@
-/* test-volume.cpp
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-eature_f
+
-#include "libfreebobavc/serialize.h"
-#include "libfreebobavc/ieee1394service.h"
-
-
+
+
+
+
+
-{
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        printf( "cmd failed\n" );
-    }
-    return ffbCmd.m_volumeControl.m_volume;
-}
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-}
-
-bool
-doApp(
+setVolume( 
-{
-
-
+
+
+
+
+
+
+
+
+
-
-printf("max volume value = %d\n", maxVolume
-printf("min volume value = %d\n", minVolume
+fbCmd.setVerbose( bVerbose 
+ieee1394service.setVerbose( bVerbose 
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        printf( "cmd failed\n" );
-    }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return true;
@@ -104 +108 @@
-
-    if (argc < 3) {
-F
+
-        exit(0);
-    }
@@ -111 +115 @@
-    char* tail;
-    int node_id = strtol( argv[1], &tail, 0 );
-fb_id
+b_id 
-    int vol     = strtol( argv[3], &tail, 0 );
-
-    if (errno) {
-       
-       
+        
+        
-    }
-    Ieee1394Service ieee1394service;
@@ -124 +128 @@
-    }
-
-f
+
-
-    return 0;