Audio V4: Fix issues in common raised by clang-format
This patch only contains cosmetic reformatting imposed by clang-format.
Bug: 38184704
Test: compile
Change-Id: I2f8c74d1b976e1e4e74f85dd0e8350f9b16fb31a
Signed-off-by: Kevin Rocard <krocard@google.com>
diff --git a/audio/common/2.0/default/EffectMap.h b/audio/common/2.0/default/EffectMap.h
index 82bbb1f..355b635 100644
--- a/audio/common/2.0/default/EffectMap.h
+++ b/audio/common/2.0/default/EffectMap.h
@@ -27,14 +27,14 @@
// This class needs to be in 'android' ns because Singleton macros require that.
class EffectMap : public Singleton<EffectMap> {
- public:
+ public:
static const uint64_t INVALID_ID;
uint64_t add(effect_handle_t handle);
effect_handle_t get(const uint64_t& id);
void remove(effect_handle_t handle);
- private:
+ private:
static uint64_t makeUniqueId();
std::mutex mLock;
diff --git a/audio/common/2.0/default/HidlUtils.cpp b/audio/common/2.0/default/HidlUtils.cpp
index 79cb37c..a74fb89 100644
--- a/audio/common/2.0/default/HidlUtils.cpp
+++ b/audio/common/2.0/default/HidlUtils.cpp
@@ -49,8 +49,8 @@
halConfig->frame_count = config.frameCount;
}
-void HidlUtils::audioGainConfigFromHal(
- const struct audio_gain_config& halConfig, AudioGainConfig* config) {
+void HidlUtils::audioGainConfigFromHal(const struct audio_gain_config& halConfig,
+ AudioGainConfig* config) {
config->index = halConfig.index;
config->mode = AudioGainMode(halConfig.mode);
config->channelMask = AudioChannelMask(halConfig.channel_mask);
@@ -60,8 +60,8 @@
config->rampDurationMs = halConfig.ramp_duration_ms;
}
-void HidlUtils::audioGainConfigToHal(
- const AudioGainConfig& config, struct audio_gain_config* halConfig) {
+void HidlUtils::audioGainConfigToHal(const AudioGainConfig& config,
+ struct audio_gain_config* halConfig) {
halConfig->index = config.index;
halConfig->mode = static_cast<audio_gain_mode_t>(config.mode);
halConfig->channel_mask = static_cast<audio_channel_mask_t>(config.channelMask);
@@ -94,8 +94,8 @@
halGain->max_ramp_ms = gain.maxRampMs;
}
-void HidlUtils::audioOffloadInfoFromHal(
- const audio_offload_info_t& halOffload, AudioOffloadInfo* offload) {
+void HidlUtils::audioOffloadInfoFromHal(const audio_offload_info_t& halOffload,
+ AudioOffloadInfo* offload) {
offload->sampleRateHz = halOffload.sample_rate;
offload->channelMask = AudioChannelMask(halOffload.channel_mask);
offload->format = AudioFormat(halOffload.format);
@@ -109,8 +109,8 @@
offload->usage = static_cast<AudioUsage>(halOffload.usage);
}
-void HidlUtils::audioOffloadInfoToHal(
- const AudioOffloadInfo& offload, audio_offload_info_t* halOffload) {
+void HidlUtils::audioOffloadInfoToHal(const AudioOffloadInfo& offload,
+ audio_offload_info_t* halOffload) {
*halOffload = AUDIO_INFO_INITIALIZER;
halOffload->sample_rate = offload.sampleRateHz;
halOffload->channel_mask = static_cast<audio_channel_mask_t>(offload.channelMask);
@@ -125,8 +125,8 @@
halOffload->usage = static_cast<audio_usage_t>(offload.usage);
}
-void HidlUtils::audioPortConfigFromHal(
- const struct audio_port_config& halConfig, AudioPortConfig* config) {
+void HidlUtils::audioPortConfigFromHal(const struct audio_port_config& halConfig,
+ AudioPortConfig* config) {
config->id = halConfig.id;
config->role = AudioPortRole(halConfig.role);
config->type = AudioPortType(halConfig.type);
@@ -136,13 +136,13 @@
config->format = AudioFormat(halConfig.format);
audioGainConfigFromHal(halConfig.gain, &config->gain);
switch (halConfig.type) {
- case AUDIO_PORT_TYPE_NONE: break;
+ case AUDIO_PORT_TYPE_NONE:
+ break;
case AUDIO_PORT_TYPE_DEVICE: {
config->ext.device.hwModule = halConfig.ext.device.hw_module;
config->ext.device.type = AudioDevice(halConfig.ext.device.type);
- memcpy(config->ext.device.address.data(),
- halConfig.ext.device.address,
- AUDIO_DEVICE_MAX_ADDRESS_LEN);
+ memcpy(config->ext.device.address.data(), halConfig.ext.device.address,
+ AUDIO_DEVICE_MAX_ADDRESS_LEN);
break;
}
case AUDIO_PORT_TYPE_MIX: {
@@ -162,8 +162,8 @@
}
}
-void HidlUtils::audioPortConfigToHal(
- const AudioPortConfig& config, struct audio_port_config* halConfig) {
+void HidlUtils::audioPortConfigToHal(const AudioPortConfig& config,
+ struct audio_port_config* halConfig) {
memset(halConfig, 0, sizeof(audio_port_config));
halConfig->id = config.id;
halConfig->role = static_cast<audio_port_role_t>(config.role);
@@ -174,13 +174,13 @@
halConfig->format = static_cast<audio_format_t>(config.format);
audioGainConfigToHal(config.gain, &halConfig->gain);
switch (config.type) {
- case AudioPortType::NONE: break;
+ case AudioPortType::NONE:
+ break;
case AudioPortType::DEVICE: {
halConfig->ext.device.hw_module = config.ext.device.hwModule;
halConfig->ext.device.type = static_cast<audio_devices_t>(config.ext.device.type);
- memcpy(halConfig->ext.device.address,
- config.ext.device.address.data(),
- AUDIO_DEVICE_MAX_ADDRESS_LEN);
+ memcpy(halConfig->ext.device.address, config.ext.device.address.data(),
+ AUDIO_DEVICE_MAX_ADDRESS_LEN);
break;
}
case AudioPortType::MIX: {
@@ -188,24 +188,24 @@
halConfig->ext.mix.handle = config.ext.mix.ioHandle;
if (config.role == AudioPortRole::SOURCE) {
halConfig->ext.mix.usecase.source =
- static_cast<audio_source_t>(config.ext.mix.useCase.source);
+ static_cast<audio_source_t>(config.ext.mix.useCase.source);
} else if (config.role == AudioPortRole::SINK) {
halConfig->ext.mix.usecase.stream =
- static_cast<audio_stream_type_t>(config.ext.mix.useCase.stream);
+ static_cast<audio_stream_type_t>(config.ext.mix.useCase.stream);
}
break;
}
case AudioPortType::SESSION: {
halConfig->ext.session.session =
- static_cast<audio_session_t>(config.ext.session.session);
+ static_cast<audio_session_t>(config.ext.session.session);
break;
}
}
}
-void HidlUtils::audioPortConfigsFromHal(
- unsigned int numHalConfigs, const struct audio_port_config *halConfigs,
- hidl_vec<AudioPortConfig> *configs) {
+void HidlUtils::audioPortConfigsFromHal(unsigned int numHalConfigs,
+ const struct audio_port_config* halConfigs,
+ hidl_vec<AudioPortConfig>* configs) {
configs->resize(numHalConfigs);
for (unsigned int i = 0; i < numHalConfigs; ++i) {
audioPortConfigFromHal(halConfigs[i], &(*configs)[i]);
@@ -213,7 +213,7 @@
}
std::unique_ptr<audio_port_config[]> HidlUtils::audioPortConfigsToHal(
- const hidl_vec<AudioPortConfig>& configs) {
+ const hidl_vec<AudioPortConfig>& configs) {
std::unique_ptr<audio_port_config[]> halConfigs(new audio_port_config[configs.size()]);
for (size_t i = 0; i < configs.size(); ++i) {
audioPortConfigToHal(configs[i], &halConfigs[i]);
@@ -244,13 +244,13 @@
}
audioPortConfigFromHal(halPort.active_config, &port->activeConfig);
switch (halPort.type) {
- case AUDIO_PORT_TYPE_NONE: break;
+ case AUDIO_PORT_TYPE_NONE:
+ break;
case AUDIO_PORT_TYPE_DEVICE: {
port->ext.device.hwModule = halPort.ext.device.hw_module;
port->ext.device.type = AudioDevice(halPort.ext.device.type);
- memcpy(port->ext.device.address.data(),
- halPort.ext.device.address,
- AUDIO_DEVICE_MAX_ADDRESS_LEN);
+ memcpy(port->ext.device.address.data(), halPort.ext.device.address,
+ AUDIO_DEVICE_MAX_ADDRESS_LEN);
break;
}
case AUDIO_PORT_TYPE_MIX: {
@@ -271,21 +271,20 @@
halPort->id = port.id;
halPort->role = static_cast<audio_port_role_t>(port.role);
halPort->type = static_cast<audio_port_type_t>(port.type);
- memcpy(halPort->name,
- port.name.c_str(),
- std::min(port.name.size(), static_cast<size_t>(AUDIO_PORT_MAX_NAME_LEN)));
+ memcpy(halPort->name, port.name.c_str(),
+ std::min(port.name.size(), static_cast<size_t>(AUDIO_PORT_MAX_NAME_LEN)));
halPort->num_sample_rates =
- std::min(port.sampleRates.size(), static_cast<size_t>(AUDIO_PORT_MAX_SAMPLING_RATES));
+ std::min(port.sampleRates.size(), static_cast<size_t>(AUDIO_PORT_MAX_SAMPLING_RATES));
for (size_t i = 0; i < halPort->num_sample_rates; ++i) {
halPort->sample_rates[i] = port.sampleRates[i];
}
halPort->num_channel_masks =
- std::min(port.channelMasks.size(), static_cast<size_t>(AUDIO_PORT_MAX_CHANNEL_MASKS));
+ std::min(port.channelMasks.size(), static_cast<size_t>(AUDIO_PORT_MAX_CHANNEL_MASKS));
for (size_t i = 0; i < halPort->num_channel_masks; ++i) {
halPort->channel_masks[i] = static_cast<audio_channel_mask_t>(port.channelMasks[i]);
}
halPort->num_formats =
- std::min(port.formats.size(), static_cast<size_t>(AUDIO_PORT_MAX_FORMATS));
+ std::min(port.formats.size(), static_cast<size_t>(AUDIO_PORT_MAX_FORMATS));
for (size_t i = 0; i < halPort->num_formats; ++i) {
halPort->formats[i] = static_cast<audio_format_t>(port.formats[i]);
}
@@ -295,20 +294,20 @@
}
audioPortConfigToHal(port.activeConfig, &halPort->active_config);
switch (port.type) {
- case AudioPortType::NONE: break;
+ case AudioPortType::NONE:
+ break;
case AudioPortType::DEVICE: {
halPort->ext.device.hw_module = port.ext.device.hwModule;
halPort->ext.device.type = static_cast<audio_devices_t>(port.ext.device.type);
- memcpy(halPort->ext.device.address,
- port.ext.device.address.data(),
- AUDIO_DEVICE_MAX_ADDRESS_LEN);
+ memcpy(halPort->ext.device.address, port.ext.device.address.data(),
+ AUDIO_DEVICE_MAX_ADDRESS_LEN);
break;
}
case AudioPortType::MIX: {
halPort->ext.mix.hw_module = port.ext.mix.hwModule;
halPort->ext.mix.handle = port.ext.mix.ioHandle;
halPort->ext.mix.latency_class =
- static_cast<audio_mix_latency_class_t>(port.ext.mix.latencyClass);
+ static_cast<audio_mix_latency_class_t>(port.ext.mix.latencyClass);
break;
}
case AudioPortType::SESSION: {
diff --git a/audio/common/2.0/default/HidlUtils.h b/audio/common/2.0/default/HidlUtils.h
index 3fde4d7..09ed288 100644
--- a/audio/common/2.0/default/HidlUtils.h
+++ b/audio/common/2.0/default/HidlUtils.h
@@ -34,28 +34,28 @@
namespace android {
class HidlUtils {
- public:
+ public:
static void audioConfigFromHal(const audio_config_t& halConfig, AudioConfig* config);
static void audioConfigToHal(const AudioConfig& config, audio_config_t* halConfig);
- static void audioGainConfigFromHal(
- const struct audio_gain_config& halConfig, AudioGainConfig* config);
- static void audioGainConfigToHal(
- const AudioGainConfig& config, struct audio_gain_config* halConfig);
+ static void audioGainConfigFromHal(const struct audio_gain_config& halConfig,
+ AudioGainConfig* config);
+ static void audioGainConfigToHal(const AudioGainConfig& config,
+ struct audio_gain_config* halConfig);
static void audioGainFromHal(const struct audio_gain& halGain, AudioGain* gain);
static void audioGainToHal(const AudioGain& gain, struct audio_gain* halGain);
- static void audioOffloadInfoFromHal(
- const audio_offload_info_t& halOffload, AudioOffloadInfo* offload);
- static void audioOffloadInfoToHal(
- const AudioOffloadInfo& offload, audio_offload_info_t* halOffload);
- static void audioPortConfigFromHal(
- const struct audio_port_config& halConfig, AudioPortConfig* config);
- static void audioPortConfigToHal(
- const AudioPortConfig& config, struct audio_port_config* halConfig);
- static void audioPortConfigsFromHal(
- unsigned int numHalConfigs, const struct audio_port_config *halConfigs,
- hidl_vec<AudioPortConfig> *configs);
+ static void audioOffloadInfoFromHal(const audio_offload_info_t& halOffload,
+ AudioOffloadInfo* offload);
+ static void audioOffloadInfoToHal(const AudioOffloadInfo& offload,
+ audio_offload_info_t* halOffload);
+ static void audioPortConfigFromHal(const struct audio_port_config& halConfig,
+ AudioPortConfig* config);
+ static void audioPortConfigToHal(const AudioPortConfig& config,
+ struct audio_port_config* halConfig);
+ static void audioPortConfigsFromHal(unsigned int numHalConfigs,
+ const struct audio_port_config* halConfigs,
+ hidl_vec<AudioPortConfig>* configs);
static std::unique_ptr<audio_port_config[]> audioPortConfigsToHal(
- const hidl_vec<AudioPortConfig>& configs);
+ const hidl_vec<AudioPortConfig>& configs);
static void audioPortFromHal(const struct audio_port& halPort, AudioPort* port);
static void audioPortToHal(const AudioPort& port, struct audio_port* halPort);
static void uuidFromHal(const audio_uuid_t& halUuid, Uuid* uuid);
diff --git a/audio/common/test/utility/include/utility/AssertOk.h b/audio/common/test/utility/include/utility/AssertOk.h
index d8aa451..1b8abb5 100644
--- a/audio/common/test/utility/include/utility/AssertOk.h
+++ b/audio/common/test/utility/include/utility/AssertOk.h
@@ -96,7 +96,7 @@
inline ::testing::AssertionResult assertOk(const char* expr, const Return<Result>& ret) {
return continueIfIsOk(expr, ret, [&] { return assertOk(expr, Result{ret}); });
}
-}
+} // namespace detail
#define ASSERT_IS_OK(ret) ASSERT_PRED_FORMAT1(detail::assertIsOk, ret)
#define EXPECT_IS_OK(ret) EXPECT_PRED_FORMAT1(detail::assertIsOk, ret)
@@ -108,11 +108,11 @@
#define ASSERT_RESULT(expected, ret) ASSERT_PRED_FORMAT2(detail::assertResult, expected, ret)
#define EXPECT_RESULT(expected, ret) EXPECT_PRED_FORMAT2(detail::assertResult, expected, ret)
-} // utility
-} // test
-} // common
-} // audio
-} // test
-} // utility
+} // namespace utility
+} // namespace test
+} // namespace common
+} // namespace audio
+} // namespace hardware
+} // namespace android
#endif // ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_ASSERTOK_H
diff --git a/audio/common/test/utility/include/utility/Documentation.h b/audio/common/test/utility/include/utility/Documentation.h
index a45cad6..e10cf79 100644
--- a/audio/common/test/utility/include/utility/Documentation.h
+++ b/audio/common/test/utility/include/utility/Documentation.h
@@ -60,11 +60,11 @@
}
} // namespace doc
-} // utility
-} // test
-} // common
-} // audio
-} // test
-} // utility
+} // namespace utility
+} // namespace test
+} // namespace common
+} // namespace audio
+} // namespace hardware
+} // namespace android
#endif // ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_ENVIRONMENT_TEARDOWN
diff --git a/audio/common/test/utility/include/utility/EnvironmentTearDown.h b/audio/common/test/utility/include/utility/EnvironmentTearDown.h
index 15b0bd8..81d92c2 100644
--- a/audio/common/test/utility/include/utility/EnvironmentTearDown.h
+++ b/audio/common/test/utility/include/utility/EnvironmentTearDown.h
@@ -48,11 +48,11 @@
std::list<TearDownFunc> tearDowns;
};
-} // utility
-} // test
-} // common
-} // audio
-} // test
-} // utility
+} // namespace utility
+} // namespace test
+} // namespace common
+} // namespace audio
+} // namespace hardware
+} // namespace android
#endif // ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_ENVIRONMENT_TEARDOWN_H
diff --git a/audio/common/test/utility/include/utility/ReturnIn.h b/audio/common/test/utility/include/utility/ReturnIn.h
index 08d502f..2b92a21 100644
--- a/audio/common/test/utility/include/utility/ReturnIn.h
+++ b/audio/common/test/utility/include/utility/ReturnIn.h
@@ -65,11 +65,11 @@
return {ts...};
}
-} // utility
-} // test
-} // common
-} // audio
-} // test
-} // utility
+} // namespace utility
+} // namespace test
+} // namespace common
+} // namespace audio
+} // namespace hardware
+} // namespace android
#endif // ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_RETURN_IN_H
diff --git a/audio/common/test/utility/include/utility/ValidateXml.h b/audio/common/test/utility/include/utility/ValidateXml.h
index d718839..95080d1 100644
--- a/audio/common/test/utility/include/utility/ValidateXml.h
+++ b/audio/common/test/utility/include/utility/ValidateXml.h
@@ -70,11 +70,11 @@
::android::hardware::audio::common::test::utility::validateXmlMultipleLocations, \
xmlFileName, xmlFileLocations, xsdFilePath)
-} // utility
-} // test
-} // common
-} // audio
-} // test
-} // utility
+} // namespace utility
+} // namespace test
+} // namespace common
+} // namespace audio
+} // namespace hardware
+} // namespace android
#endif // ANDROID_HARDWARE_AUDIO_COMMON_TEST_UTILITY_VALIDATE_XML_H
diff --git a/audio/common/test/utility/src/ValidateXml.cpp b/audio/common/test/utility/src/ValidateXml.cpp
index 30dec30..5030af5 100644
--- a/audio/common/test/utility/src/ValidateXml.cpp
+++ b/audio/common/test/utility/src/ValidateXml.cpp
@@ -163,9 +163,9 @@
<< "\n Which is: " << ::testing::PrintToString(xmlFileLocations);
}
-} // utility
-} // test
-} // common
-} // audio
-} // test
-} // utility
+} // namespace utility
+} // namespace test
+} // namespace common
+} // namespace audio
+} // namespace hardware
+} // namespace android