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

Commit dc874e08 authored by Kevin Rocard's avatar Kevin Rocard
Browse files

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: default avatarKevin Rocard <krocard@google.com>
parent a737427b

audio/common/2.0/default/HidlUtils.cpp

+41 −42
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ void HidlUtils::audioConfigToHal(const AudioConfig& config, audio_config_t* halC 
    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 @@ void HidlUtils::audioGainConfigFromHal( 
    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 @@ void HidlUtils::audioGainToHal(const AudioGain& gain, struct audio_gain* halGain 
    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 @@ void HidlUtils::audioOffloadInfoFromHal( 
    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 @@ void HidlUtils::audioOffloadInfoToHal( 
    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,12 +136,12 @@ void HidlUtils::audioPortConfigFromHal( 
    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,

            memcpy(config->ext.device.address.data(), halConfig.ext.device.address,

                   AUDIO_DEVICE_MAX_ADDRESS_LEN);

            break;

        }
@@ -162,8 +162,8 @@ void HidlUtils::audioPortConfigFromHal( 
    }

}



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,12 +174,12 @@ void HidlUtils::audioPortConfigToHal( 
    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(),

            memcpy(halConfig->ext.device.address, config.ext.device.address.data(),

                   AUDIO_DEVICE_MAX_ADDRESS_LEN);

            break;

        }
@@ -203,8 +203,8 @@ void HidlUtils::audioPortConfigToHal( 
    }

}



void HidlUtils::audioPortConfigsFromHal(

        unsigned int numHalConfigs, const struct audio_port_config *halConfigs,

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) {
@@ -244,12 +244,12 @@ void HidlUtils::audioPortFromHal(const struct audio_port& halPort, AudioPort* po 
    }

    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,

            memcpy(port->ext.device.address.data(), halPort.ext.device.address,

                   AUDIO_DEVICE_MAX_ADDRESS_LEN);

            break;

        }
@@ -271,8 +271,7 @@ void HidlUtils::audioPortToHal(const AudioPort& port, struct audio_port* halPort 
    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(),

    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));
@@ -295,12 +294,12 @@ void HidlUtils::audioPortToHal(const AudioPort& port, struct audio_port* halPort 
    }

    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(),

            memcpy(halPort->ext.device.address, port.ext.device.address.data(),

                   AUDIO_DEVICE_MAX_ADDRESS_LEN);

            break;

        }

audio/common/2.0/default/HidlUtils.h

+17 −17
Original line number Diff line number Diff line
@@ -37,22 +37,22 @@ class HidlUtils { 
   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,

    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);

audio/common/test/utility/include/utility/AssertOk.h

+7 −7
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ inline ::testing::AssertionResult assertOk(const char* expr, Result result) { 
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 @@ inline ::testing::AssertionResult assertOk(const char* expr, const Return<Result 
#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

audio/common/test/utility/include/utility/Documentation.h

+6 −6
Original line number Diff line number Diff line
@@ -60,11 +60,11 @@ void note(const std::string& note) { 
}

}  // 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

audio/common/test/utility/include/utility/EnvironmentTearDown.h

+6 −6
Original line number Diff line number Diff line
@@ -48,11 +48,11 @@ class Environment : public ::testing::Environment { 
    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