Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 543bf9cb authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Audio HAL: Simplify types updates for 'common' and 'audio' packages 

Instead of importing every single type individually ("using <type>"),
import entire namespaces of
::android::hardware::audio::CPP_VERSION and
::android::hardware::audio::common::CPP_VERSION
inside the "implementation" namespace in the default implementation.

This simplifies modifying types, as it is not needed anymore
to surround "using <type>" directives with #if MAJOR_VERSION ...

Note that the contents of the namespaces are imported inside
the "implementation" namespace, which reduces risks of name collision

Also, fixed the namespace for HidlUtils--it needs to be in
'implementation'.

Test: make
Change-Id: I81bbb3074b5763717ae72e747a075fd46dc36d18
parent 31500204

audio/common/all-versions/default/HidlUtils.cpp

+4 −12
Original line number Diff line number Diff line
@@ -19,18 +19,6 @@ 
#include <common/all-versions/VersionUtils.h>

#include <string.h>



using ::android::hardware::audio::common::CPP_VERSION::AudioChannelMask;

using ::android::hardware::audio::common::CPP_VERSION::AudioDevice;

using ::android::hardware::audio::common::CPP_VERSION::AudioFormat;

using ::android::hardware::audio::common::CPP_VERSION::AudioGainMode;

using ::android::hardware::audio::common::CPP_VERSION::AudioMixLatencyClass;

using ::android::hardware::audio::common::CPP_VERSION::AudioPortConfigMask;

using ::android::hardware::audio::common::CPP_VERSION::AudioPortRole;

using ::android::hardware::audio::common::CPP_VERSION::AudioPortType;

using ::android::hardware::audio::common::CPP_VERSION::AudioSource;

using ::android::hardware::audio::common::CPP_VERSION::AudioStreamType;

using ::android::hardware::audio::common::CPP_VERSION::AudioUsage;



using ::android::hardware::audio::common::utils::EnumBitfield;



namespace android {
@@ -38,6 +26,9 @@ namespace hardware { 
namespace audio {

namespace common {

namespace CPP_VERSION {

namespace implementation {



using namespace ::android::hardware::audio::common::CPP_VERSION;



void HidlUtils::audioConfigFromHal(const audio_config_t& halConfig, AudioConfig* config) {

    config->sampleRateHz = halConfig.sample_rate;
@@ -356,6 +347,7 @@ void HidlUtils::uuidToHal(const Uuid& uuid, audio_uuid_t* halUuid) { 
    memcpy(halUuid->node, uuid.node.data(), uuid.node.size());

}



}  // namespace implementation

}  // namespace CPP_VERSION

}  // namespace common

}  // namespace audio

audio/common/all-versions/default/HidlUtils.h

+4 −7
Original line number Diff line number Diff line
@@ -24,19 +24,15 @@ 
#include <system/audio.h>



using ::android::hardware::hidl_vec;

using ::android::hardware::audio::common::CPP_VERSION::AudioConfig;

using ::android::hardware::audio::common::CPP_VERSION::AudioGain;

using ::android::hardware::audio::common::CPP_VERSION::AudioGainConfig;

using ::android::hardware::audio::common::CPP_VERSION::AudioOffloadInfo;

using ::android::hardware::audio::common::CPP_VERSION::AudioPort;

using ::android::hardware::audio::common::CPP_VERSION::AudioPortConfig;

using ::android::hardware::audio::common::CPP_VERSION::Uuid;



namespace android {

namespace hardware {

namespace audio {

namespace common {

namespace CPP_VERSION {

namespace implementation {



using namespace ::android::hardware::audio::common::CPP_VERSION;



class HidlUtils {

   public:
@@ -69,6 +65,7 @@ class HidlUtils { 
    static void uuidToHal(const Uuid& uuid, audio_uuid_t* halUuid);

};



}  // namespace implementation

}  // namespace CPP_VERSION

}  // namespace common

}  // namespace audio

audio/core/all-versions/default/Conversions.cpp

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ namespace audio { 
namespace CPP_VERSION {

namespace implementation {



using ::android::hardware::audio::common::CPP_VERSION::AudioDevice;

using namespace ::android::hardware::audio::common::CPP_VERSION;



std::string deviceAddressToHal(const DeviceAddress& address) {

    // HAL assumes that the address is NUL-terminated.

audio/core/all-versions/default/Device.cpp

+2 −2
Original line number Diff line number Diff line
@@ -31,14 +31,14 @@ 


#include <android/log.h>



using ::android::hardware::audio::common::CPP_VERSION::HidlUtils;



namespace android {

namespace hardware {

namespace audio {

namespace CPP_VERSION {

namespace implementation {



using ::android::hardware::audio::common::CPP_VERSION::implementation::HidlUtils;



Device::Device(audio_hw_device_t* device) : mDevice(device) {}



Device::~Device() {

audio/core/all-versions/default/StreamIn.cpp

+3 −3
Original line number Diff line number Diff line
@@ -28,15 +28,15 @@ 
#include <utils/Trace.h>

#include <memory>



using ::android::hardware::audio::common::CPP_VERSION::ThreadInfo;

using ::android::hardware::audio::CPP_VERSION::MessageQueueFlagBits;



namespace android {

namespace hardware {

namespace audio {

namespace CPP_VERSION {

namespace implementation {



using namespace ::android::hardware::audio::common::CPP_VERSION;

using namespace ::android::hardware::audio::CPP_VERSION;



namespace {



class ReadThread : public Thread {