Add DeviceAddress's AudioDevice support

Author: hidenorly

include/AndroidHalTypes.hpp

@@ -76,7 +76,7 @@ struct DeviceAddress
   } address;
   std::string busAddress;
   std::string rSubmixAddress;
-  DeviceAddress():device(AUDIO_DEVICE_OUT_DEFAULT){
+  DeviceAddress(AudioDevice device = AUDIO_DEVICE_OUT_DEFAULT):device(device){
     address.alsa.card = 0;
     address.alsa.device = 0;
   };

include/DeviceAddressHelper.hpp

@@ -31,6 +31,9 @@ class AndroidDeviceAddressHelper
   static std::tuple<AudioDevice, std::string, std::string> getTupleFromDeviceAddreess(DeviceAddress deviceAddress);
 
 public:
+  static std::string getDeviceString(AudioDevice device);
+  static AudioDevice getDeviceFromDeviceString(std::string deviceString);
+
   static std::string getStringFromDeviceAddr(DeviceAddress deviceAddress);
   static DeviceAddress getDeviceAddrFromString(std::string deviceAddrString);
 

src/AndroidHalEffectFactory.cpp

@@ -48,6 +48,7 @@ std::shared_ptr<IEffect> IEffectsFactory::createEffect(Uuid uuid, AudioSession s
       pEffect->associateFilter( AudioEffectHelper::getFilterInstance( uuid ) );
     }
 
+    // TODO: AUDIO_SESSION_DEVICE should be applied to PipedSink...
     switch(session){
       case AUDIO_SESSION_DEVICE:
       case AUDIO_SESSION_OUTPUT_STAGE:

src/AndroidHalHelper.cpp

@@ -59,10 +59,17 @@ void AndroidHalHelper::initialize(std::string filterPlugInPath, std::string uuid
   std::make_shared<ILoudnessEnhancerEffect>();
   std::make_shared<IDownmixEffect>();
   std::make_shared<IVisualizerEffect>();
+
+  // TODO: Attach Sink, Source
+  SourceSinkManager::attachSink(AUDIO_DEVICE_OUT_DEFAULT, std::make_shared<Sink>() );
+  SourceSinkManager::attachSource(AUDIO_DEVICE_IN_DEFAULT, std::make_shared<Source>() );
 }
 
 void AndroidHalHelper::terminate(void)
 {
+  // TODO: Detach Sink, Source
+
+
   // --- terminate EffectHelper
   AudioEffectHelper::terminate();
 

src/DeviceAddressHelper.cpp

@@ -15,6 +15,7 @@
 */
 
 #include "DeviceAddressHelper.hpp"
+#include "StringTokenizer.hpp"
 #include <sstream>
 
 std::string AndroidDeviceAddressHelper::getMacAddressString(MacAddress macAddress)
@@ -28,26 +29,91 @@ std::string AndroidDeviceAddressHelper::getMacAddressString(MacAddress macAddres
   return ss.str();
 }
 
+struct stDeviceString
+{
+  AudioDevice device;
+  std::string description;
+  stDeviceString(AudioDevice device, std::string description):device(device), description(description){};
+};
+
+const static stDeviceString tbl[] =
+{
+  stDeviceString(AUDIO_DEVICE_OUT_DEFAULT,        "AUDIO_DEVICE_OUT_DEFAULT"),
+  stDeviceString(AUDIO_DEVICE_OUT_LINE,           "AUDIO_DEVICE_OUT_LINE"),
+  stDeviceString(AUDIO_DEVICE_OUT_SPDIF,          "AUDIO_DEVICE_OUT_SPDIF"),
+  stDeviceString(AUDIO_DEVICE_OUT_HDMI_EARC,      "AUDIO_DEVICE_OUT_HDMI_EARC"),
+  stDeviceString(AUDIO_DEVICE_OUT_HDMI_ARC,       "AUDIO_DEVICE_OUT_HDMI_ARC"),
+  stDeviceString(AUDIO_DEVICE_OUT_USB_DEVICE,     "AUDIO_DEVICE_OUT_USB_DEVICE"),
+  stDeviceString(AUDIO_DEVICE_OUT_HDMI,           "AUDIO_DEVICE_OUT_HDMI"),
+  stDeviceString(AUDIO_DEVICE_OUT_BLUETOOTH_A2DP, "AUDIO_DEVICE_OUT_BLUETOOTH_A2DP"),
+  stDeviceString(AUDIO_DEVICE_OUT_SPEAKER,        "AUDIO_DEVICE_OUT_SPEAKER"),
+  stDeviceString(AUDIO_DEVICE_OUT_BLUETOOTH_SCO,  "AUDIO_DEVICE_OUT_BLUETOOTH_SCO"),
+  stDeviceString(AUDIO_DEVICE_IN_BUILTIN_MIC,     "AUDIO_DEVICE_IN_BUILTIN_MIC"),
+  stDeviceString(AUDIO_DEVICE_IN_HDMI,            "AUDIO_DEVICE_IN_HDMI"),
+  stDeviceString(AUDIO_DEVICE_IN_USB_DEVICE,      "AUDIO_DEVICE_IN_USB_DEVICE"),
+  stDeviceString(AUDIO_DEVICE_IN_LINE,            "AUDIO_DEVICE_IN_LINE"),
+  stDeviceString(AUDIO_DEVICE_IN_DEFAULT,         "AUDIO_DEVICE_IN_DEFAULT"),
+  stDeviceString(AUDIO_DEVICE_IN_DEFAULT,         ""),
+};
+
+
+std::string AndroidDeviceAddressHelper::getDeviceString(AudioDevice device)
+{
+  std::string result;
+
+  for( int i=0; tbl[i].device != AUDIO_DEVICE_IN_DEFAULT && !tbl[i].description.empty(); ){
+    if( tbl[i].device == device ){
+      result = tbl[i].description;
+      break;
+    }
+  }
+
+  return result;
+}
+
+AudioDevice AndroidDeviceAddressHelper::getDeviceFromDeviceString(std::string deviceString)
+{
+  AudioDevice result = AUDIO_DEVICE_OUT_DEFAULT;
+
+  for( int i=0; tbl[i].device != AUDIO_DEVICE_IN_DEFAULT && !tbl[i].description.empty(); ){
+    if( tbl[i].description == deviceString ){
+      result = tbl[i].device;
+      break;
+    }
+  }
+
+  return result;
+}
+
 std::tuple<AudioDevice, std::string, std::string> AndroidDeviceAddressHelper::getTupleFromDeviceAddreess(DeviceAddress deviceAddress)
 {
   return std::make_tuple( deviceAddress.device, getMacAddressString(deviceAddress.address.mac), deviceAddress.busAddress );
 }
 
 std::string AndroidDeviceAddressHelper::getStringFromDeviceAddr(DeviceAddress deviceAddress)
 {
-  // TODO : FIX this
   auto&& id = getTupleFromDeviceAddreess(deviceAddress);
   if( !mDeviceConnected.contains( id ) ){
     mDeviceConnected.insert_or_assign( id, std::make_tuple(deviceAddress, false) );
   }
 
-  return deviceAddress.busAddress;
+  // TODO : FIX this. Add the other identifier such as MacAddress, etc.
+  return deviceAddress.busAddress.empty() ? getDeviceString(deviceAddress.device) : getDeviceString(deviceAddress.device) + ":" + deviceAddress.busAddress;
 }
 
 DeviceAddress AndroidDeviceAddressHelper::getDeviceAddrFromString(std::string deviceAddrString)
 {
   DeviceAddress deviceAddr;
-  deviceAddr.busAddress = deviceAddrString;
+  StringTokenizer tok(deviceAddrString, ":");
+  if( tok.hasNext() ){
+    deviceAddr.device = getDeviceFromDeviceString( tok.getNext() );
+    if( tok.hasNext() ){
+      deviceAddr.busAddress = tok.getNext();
+    }
+  } else {
+    deviceAddr.device = getDeviceFromDeviceString( deviceAddrString );
+  }
+
   return deviceAddr;
 }