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

Commit 872d4a65 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

audio: Put audio/aidl/common/include/Utils.h into 'aidl' NS 

These utilities are for types generated from AIDL. Since
the types end up in the 'aidl' namespace (NDK backend), it makes
sense to keep the utilities in the same namespace.

While changing the namespace, I've found numerous useless
includes of 'Utils.h' and removing them, also reorganizing
lists of includes along the way to match the style guide.

Bug: 205884982
Test: m
Test: atest --test-mapping hardware/interfaces/audio/aidl/TEST_MAPPING
Change-Id: Ib23b47092364046f632f9503b92b9baff5b902f5
parent ac46ddb9

audio/aidl/common/include/Utils.h

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <aidl/android/media/audio/common/AudioOutputFlags.h>

#include <aidl/android/media/audio/common/PcmType.h>



namespace android::hardware::audio::common {

namespace aidl::android::hardware::audio::common {



// Some values are reserved for use by the system code only.

// HALs must not accept or emit values outside from the provided list.
@@ -176,4 +176,4 @@ constexpr U makeBitPositionFlagMask(std::initializer_list<E> flags) { 
    return result;

}



}  // namespace android::hardware::audio::common
 
}  // namespace aidl::android::hardware::audio::common

audio/aidl/common/tests/utils_tests.cpp

+3 −3
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 
#define LOG_TAG "Utils_Test"

#include <log/log.h>



using aidl::android::hardware::audio::common::getChannelCount;

using aidl::android::hardware::audio::common::getFrameSizeInBytes;

using aidl::android::hardware::audio::common::getPcmSampleSizeInBytes;

using aidl::android::media::audio::common::AudioChannelLayout;

using aidl::android::media::audio::common::AudioFormatDescription;

using aidl::android::media::audio::common::AudioFormatType;

using aidl::android::media::audio::common::PcmType;

using android::hardware::audio::common::getChannelCount;

using android::hardware::audio::common::getFrameSizeInBytes;

using android::hardware::audio::common::getPcmSampleSizeInBytes;



TEST(UtilsTest, ChannelCountOddCases) {

    using Tag = AudioChannelLayout::Tag;

audio/aidl/default/Configuration.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 


#include "core-impl/Configuration.h"



using aidl::android::hardware::audio::common::makeBitPositionFlagMask;

using aidl::android::media::audio::common::AudioChannelLayout;

using aidl::android::media::audio::common::AudioDeviceDescription;

using aidl::android::media::audio::common::AudioDeviceType;
@@ -42,7 +43,6 @@ using aidl::android::media::audio::common::AudioProfile; 
using aidl::android::media::audio::common::Int;

using aidl::android::media::audio::common::MicrophoneInfo;

using aidl::android::media::audio::common::PcmType;

using android::hardware::audio::common::makeBitPositionFlagMask;



namespace aidl::android::hardware::audio::core::internal {

audio/aidl/default/Module.cpp

+3 −3
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ 
#include "core-impl/Telephony.h"

#include "core-impl/utils.h"



using aidl::android::hardware::audio::common::getFrameSizeInBytes;

using aidl::android::hardware::audio::common::isBitPositionFlagSet;

using aidl::android::hardware::audio::common::isValidAudioMode;

using aidl::android::hardware::audio::common::SinkMetadata;

using aidl::android::hardware::audio::common::SourceMetadata;

using aidl::android::hardware::audio::core::sounddose::ISoundDose;
@@ -57,9 +60,6 @@ using aidl::android::media::audio::common::Boolean; 
using aidl::android::media::audio::common::Int;

using aidl::android::media::audio::common::MicrophoneInfo;

using aidl::android::media::audio::common::PcmType;

using android::hardware::audio::common::getFrameSizeInBytes;

using android::hardware::audio::common::isBitPositionFlagSet;

using android::hardware::audio::common::isValidAudioMode;



namespace aidl::android::hardware::audio::core {

audio/aidl/default/Stream.cpp

+2 −2
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
#include "core-impl/Stream.h"



using aidl::android::hardware::audio::common::AudioOffloadMetadata;

using aidl::android::hardware::audio::common::getChannelCount;

using aidl::android::hardware::audio::common::getFrameSizeInBytes;

using aidl::android::hardware::audio::common::SinkMetadata;

using aidl::android::hardware::audio::common::SourceMetadata;

using aidl::android::media::audio::common::AudioDevice;
@@ -34,8 +36,6 @@ using aidl::android::media::audio::common::AudioOffloadInfo; 
using aidl::android::media::audio::common::AudioPlaybackRate;

using aidl::android::media::audio::common::MicrophoneDynamicInfo;

using aidl::android::media::audio::common::MicrophoneInfo;

using android::hardware::audio::common::getChannelCount;

using android::hardware::audio::common::getFrameSizeInBytes;



namespace aidl::android::hardware::audio::core {