Changeset 439

Timestamp:

03/13/07 15:17:03 (16 years ago)

Author:

pieterpalmers

Message:

- some work on the AVC mixer & control stuff

Files:

• branches/streaming-rework/src/bebob/bebob_avplug.cpp (modified) (1 diff)
• branches/streaming-rework/src/bebob/bebob_avplug.h (modified) (2 diffs)
• branches/streaming-rework/src/debugmodule/debugmodule.cpp (modified) (1 diff)
• branches/streaming-rework/src/libavc/avc_definitions.h (modified) (1 diff)
• branches/streaming-rework/src/libavc/avc_function_block.cpp (modified) (5 diffs)
• branches/streaming-rework/src/libavc/avc_function_block.h (modified) (2 diffs)
• branches/streaming-rework/src/libavc/avc_generic.cpp (modified) (1 diff)
• branches/streaming-rework/src/libavc/avc_generic.h (modified) (1 diff)
• branches/streaming-rework/src/libavc/avc_serialize.cpp (modified) (2 diffs)
• branches/streaming-rework/src/libavc/avc_serialize.h (modified) (2 diffs)
• branches/streaming-rework/src/libieee1394/ieee1394service.cpp (modified) (2 diffs)
• branches/streaming-rework/tests/test-mixer.cpp (modified) (5 diffs)

branches/streaming-rework/src/bebob/bebob_avplug.cpp

@@ -1961 +1961 @@
-        AvPlug* plug = *it;
-        if ( plug->getFunctionBlockType() != 0xff ) {
+            std::ostringstream strstrm;
+            switch(plug->getFunctionBlockType()) {
+                case 0x80:
+                    strstrm << "Selector FB";
+                    break;
+                case 0x81:
+                    strstrm << "Feature FB";
+                    break;
+                case 0x82:
+                    strstrm << "Processing FB";
+                    break;
+                case 0x83:
+                    strstrm << "CODEC FB";
+                    break;
+                default:
+                    strstrm << plug->getFunctionBlockType();
+            }
+
-            if ( plug->getPlugDirection() == AvPlug::eAPD_Input ) {
-0x%02x,
+%s, ID 
-                        plug->getGlobalId(),
-                        plug->getName(),
-plug->getFunctionBlockType
+strstrm.str().c_str
-                        plug->getFunctionBlockId() );
-            } else {
-0x%02x,
-plug->getFunctionBlockType
+%s, ID 
+strstrm.str().c_str
-                        plug->getFunctionBlockId(),
-                        plug->getGlobalId(),

branches/streaming-rework/src/bebob/bebob_avplug.h

@@ -96 +96 @@
-
-    int getGlobalId() const
-       
+        
-    plug_id_t getPlugId() const
-       
+        
-    AVCCommand::ESubunitType getSubunitType() const
-       
+        
-    subunit_id_t getSubunitId() const
-       
+        
-    const char* getName() const
-       
+        
-    EAvPlugDirection getPlugDirection() const
-       
+        
-    sampling_frequency_t getSamplingFrequency() const
-       
+        
-    int getSampleRate() const; // 22050, 24000, 32000, ...
-    int getNrOfChannels() const;
@@ -118 +118 @@
-        { return m_addressType; }
-    EAvPlugType getPlugType() const
-       
+        
-
-    function_block_type_t getFunctionBlockType() const
-       
+        
-    function_block_id_t getFunctionBlockId() const
-        { return m_functionBlockId; }

branches/streaming-rework/src/debugmodule/debugmodule.cpp

@@ -54 +54 @@
-DebugModule::~DebugModule()
-{
-
-
-
-
-
-
+// 
+// 
+// 
+// 
+// 
+// 
-    if ( !DebugModuleManager::instance()->unregisterModule( *this ) ) {
-        cerr << "Could not unregister DebugModule at DebugModuleManager"

branches/streaming-rework/src/libavc/avc_definitions.h

@@ -71 +71 @@
-typedef byte_t control_selector_t;
-typedef byte_t control_data_length_t;
+typedef uint16_t control_data_ext_length_t;
+typedef uint16_t mixer_level_t;
+typedef byte_t mixer_programmable_state_t;
-typedef byte_t input_fb_plug_number_t;
-typedef byte_t input_audio_channel_number_t;

branches/streaming-rework/src/libavc/avc_function_block.cpp

@@ -144 +144 @@
-FunctionBlockProcessingEnhancedMixer::serialize( IOSSerialize& se )
-{
-
+
+
+
+
-    bStatus  = se.write( m_controlSelector, "FunctionBlockProcessingEnhancedMixer controlSelector" );
-    bStatus &= se.write( m_statusSelector,  "FunctionBlockProcessingEnhancedMixer statusSelector" );
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return bStatus;
-}
@@ -154 +204 @@
-FunctionBlockProcessingEnhancedMixer::deserialize( IISDeserialize& de )
-{
-
+
+
-    bStatus  = de.read( &m_controlSelector );
+
+    // NOTE: the returned value is currently bogus, so overwrite it
+    m_controlSelector=FunctionBlockProcessing::eCSE_Processing_EnhancedMixer;
+
-    bStatus &= de.read( &m_statusSelector );
+
+    byte_t data_length_hi;
+    byte_t data_length_lo;
+    bStatus &= de.read( &data_length_hi );
+    bStatus &= de.read( &data_length_lo );
+
+    m_controlDataLength = (data_length_hi << 8) + data_length_lo;
+    switch (m_statusSelector) {
+        case eSS_ProgramableState:
+            m_ProgramableStateData.clear();
+            for (int i=0;i<m_controlDataLength/8;i++) {
+                byte_t value;
+                bStatus &= de.read( &value);
+
+                for (int j=7;j>=0;j--) {
+                    byte_t bit_value;
+                    bit_value=(((1<<j) & value) ? 1 : 0);
+                    m_ProgramableStateData.push_back(bit_value);
+                }
+            }
+
+            todo=m_controlDataLength%8;
+            if (todo) {
+                byte_t value;
+                bStatus &= de.read( &value);
+
+                for (int j=7;j>7-todo;j--) {
+                    byte_t bit_value;
+                    bit_value=(((1<<j) & value) ? 1 : 0);
+                    m_ProgramableStateData.push_back(bit_value);
+                }
+            }
+            break;
+        case eSS_Level:
+            m_LevelData.clear();
+            for (int i=0;i<m_controlDataLength/2;i++) {
+                byte_t mixer_value_hi=0, mixer_value_lo=0;
+                bStatus &= de.read( &mixer_value_hi);
+                bStatus &= de.read( &mixer_value_lo);
+                mixer_level_t value = (mixer_value_hi << 8) + mixer_value_lo;
+                m_LevelData.push_back(value);
+            }
+            break;
+    }
-
-    return bStatus;
@@ -358 +457 @@
-FunctionBlockProcessing::deserialize( IISDeserialize& de )
-{
+    // NOTE: apparently the fbCmd of the STATUS type,
+    // with EnhancedMixer controlSelector returns with this
+    // controlSelector type changed to Mixer, making it
+    // impossible to choose the correct response handler
+    // based upon the response only.
+    
+    // HACK: we assume that it is the same as the sent one
+    // we also look at our data structure to figure out what we sent
+    byte_t controlSelector=eCSE_Processing_Unknown;
+    if(m_pMixer) {
+        controlSelector=eCSE_Processing_Mixer;
+    } else if(m_pEnhancedMixer) {
+        controlSelector=eCSE_Processing_EnhancedMixer;
+    }
+    
-    bool bStatus;
-    bStatus  = de.read( &m_selectorLength );
@@ -364 +478 @@
-    bStatus &= de.read( &m_outputAudioChannelNumber );
-
-
-
+
+
+
+
+
-    switch( controlSelector ) {
-    case eCSE_Processing_Mixer:
@@ -385 +502 @@
-    }
-
+    byte_t tmp;
+    if (de.peek(&tmp)) {
+        debugOutput(DEBUG_LEVEL_VERBOSE,"Unprocessed bytes:\n");
+        while (de.read(&tmp)) {
+            debugOutput(DEBUG_LEVEL_VERBOSE," %02X\n",tmp);
+        }
+    }
+
-    return bStatus;
-}

branches/streaming-rework/src/libavc/avc_function_block.h

@@ -26 +26 @@
-
-#include <libavc1394/avc1394.h>
+#include <vector>
+using namespace std;
-
-class FunctionBlockFeatureVolume: public IBusData
@@ -78 +80 @@
-    virtual FunctionBlockProcessingEnhancedMixer* clone() const;
-
-
-
+
+
+
+
+
-};
-

branches/streaming-rework/src/libavc/avc_generic.cpp

@@ -30 +30 @@
-
-IMPL_DEBUG_MODULE( AVCCommand, AVCCommand, DEBUG_LEVEL_NORMAL );
+IMPL_DEBUG_MODULE( IBusData, IBusData, DEBUG_LEVEL_VERBOSE );
-
-int AVCCommand::m_time = 0;

branches/streaming-rework/src/libavc/avc_generic.h

@@ -45 +45 @@
-
-    virtual IBusData* clone() const = 0;
+    
+protected:
+    DECLARE_DEBUG_MODULE;
-};
-

branches/streaming-rework/src/libavc/avc_serialize.cpp

@@ -26 +26 @@
-#include <netinet/in.h>
-
+IMPL_DEBUG_MODULE( CoutSerializer, CoutSerializer, DEBUG_LEVEL_NORMAL );
+
-bool
-CoutSerializer::write( byte_t d, const char* name )
-{
-printf(
+debugOutput( DEBUG_LEVEL_NORMAL,
-    m_cnt += sizeof( byte_t );
-
@@ -38 +40 @@
-CoutSerializer::write( quadlet_t d, const char* name )
-{
-printf(
+debugOutput( DEBUG_LEVEL_NORMAL,
-    m_cnt += sizeof( quadlet_t );
-    return true;

branches/streaming-rework/src/libavc/avc_serialize.h

@@ -21 +21 @@
-#ifndef Serialize_h
-#define Serialize_h
+
+#include "debugmodule/debugmodule.h"
-
-#include <libraw1394/raw1394.h> // byte_t and quadlet_t declaration
@@ -62 +64 @@
-private:
-    unsigned int m_cnt;
+    DECLARE_DEBUG_MODULE;
-
-};

branches/streaming-rework/src/libieee1394/ieee1394service.cpp

@@ -287 +287 @@
-    }
-
-    #ifdef DEBUG
-    debugOutputShort(DEBUG_LEVEL_VERY_VERBOSE, "  pre avc1394_transaction_block2\n" );
-    printBuffer( DEBUG_LEVEL_VERY_VERBOSE, len, buf );
-    #endif
-
-    fb_quadlet_t* result =
-        avc1394_transaction_block2( m_handle,
@@ -299 +294 @@
-                                    resp_len,
-                                    10 );
-
-    #ifdef DEBUG
-    debugOutputShort(DEBUG_LEVEL_VERY_VERBOSE, "  post avc1394_transaction_block2\n" );
-    printBuffer( DEBUG_LEVEL_VERY_VERBOSE, *resp_len, result );
-    #endif
-
-    for ( unsigned int i = 0; i < *resp_len; ++i ) {

branches/streaming-rework/tests/test-mixer.cpp

@@ -21 +21 @@
-#include "libavc/avc_function_block.h"
-#include "libavc/avc_serialize.h"
+#include "debugmodule/debugmodule.h"
-
-#include "libieee1394/ieee1394service.h"
+#include <string.h>
+
+DECLARE_GLOBAL_DEBUG_MODULE;
-
-const bool bVerbose = true;
@@ -38 +42 @@
-    fbCmd.m_pFBProcessing->m_pEnhancedMixer = new FunctionBlockProcessingEnhancedMixer;
-
-
+
+
+
-    fbCmd.m_pFBProcessing->m_inputAudioChannelNumber  = 0xff;
-    fbCmd.m_pFBProcessing->m_outputAudioChannelNumber = 0xff;
-    fbCmd.m_pFBProcessing->m_pEnhancedMixer->m_statusSelector
-        = FunctionBlockProcessingEnhancedMixer::eSS_ProgramableState;
-//     fbCmd.m_pFBProcessing->m_pEnhancedMixer->m_statusSelector
-//         = FunctionBlockProcessingEnhancedMixer::eSS_Level;
-
-    fbCmd.setVerbose( bVerbose );
@@ -52 +56 @@
-    
-    if ( !fbCmd.fire() ) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -71 +154 @@
-
-    if (argc < 3) {
-printf
+debugError
-        exit(0);
-    }
@@ -82 +165 @@
-
-    if (errno) {
-perror("argument parsing failed:"
+debugError("argument parsing failed: %s", strerror(errno)
-        return -1;
-    }
-    Ieee1394Service ieee1394service;
-    if ( !ieee1394service.initialize( port ) ) {
-fprintf( stderr,
+debugError(
-        return -1;
-    }
-
-    doApp( ieee1394service, node_id, fb_id );
+    doApp2( ieee1394service, node_id, fb_id );
+//     doApp3( ieee1394service, node_id, fb_id , 0 );
+//     sleep(1);
+//     doApp3( ieee1394service, node_id, fb_id , 1 );
+//     sleep(1);
+//     doApp3( ieee1394service, node_id, fb_id , 0 );
-
-    return 0;