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

Commit 626c2985 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

libaudiohal@aidl: Process screen state and rotation parameters 

Translate "screen_state" set parameter into a call
to IModule.updateScreenState, and "rotation" into a call
to IModule.updateScreenRotation.

Bug: 280527932
Test: atest CoreAudioHalAidlTest
Change-Id: I6096d12ac90447bf981f8c405bce19a669cb2ff7
parent 7d717ec0

media/libaudiohal/impl/Android.bp

+10 −3
Original line number Diff line number Diff line
@@ -279,9 +279,7 @@ cc_library_shared { 
        "libaudiohal_aidl_default",

    ],

    srcs: [

        "DeviceHalAidl.cpp",

        "DevicesFactoryHalEntry.cpp",

        "DevicesFactoryHalAidl.cpp",

        "EffectConversionHelperAidl.cpp",

        "EffectBufferHalAidl.cpp",

        "EffectHalAidl.cpp",
@@ -303,8 +301,17 @@ cc_library_shared { 
        "effectsAidlConversion/AidlConversionVisualizer.cpp",

        "EffectsFactoryHalAidl.cpp",

        "EffectsFactoryHalEntry.cpp",

        ":audio_effectproxy_src_files",

        ":core_audio_hal_aidl_src_files",

    ],

}



filegroup {

    name: "core_audio_hal_aidl_src_files",

    srcs: [

        "DeviceHalAidl.cpp",

        "DevicesFactoryHalAidl.cpp",

        "StreamHalAidl.cpp",

        ":audio_effectproxy_src_files"

    ],

}

media/libaudiohal/tests/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -32,6 +32,16 @@ cc_defaults { 
    ],

}



cc_test {

    name: "CoreAudioHalAidlTest",

    srcs: [

        "CoreAudioHalAidl_test.cpp",

        ":core_audio_hal_aidl_src_files",

    ],

    defaults: ["libaudiohal_aidl_test_default"],

    header_libs: ["libaudiohalimpl_headers"],

}



cc_test {

    name: "EffectsFactoryHalInterfaceTest",

    srcs: ["EffectsFactoryHalInterface_test.cpp"],

media/libaudiohal/tests/CoreAudioHalAidl_test.cpp

0 → 100644
+253 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <memory>



#define LOG_TAG "CoreAudioHalAidlTest"

#include <gtest/gtest.h>



#include <DeviceHalAidl.h>

#include <aidl/android/hardware/audio/core/BnModule.h>

#include <utils/Log.h>



namespace {



class ModuleMock : public ::aidl::android::hardware::audio::core::BnModule {

  public:

    bool isScreenTurnedOn() const { return mIsScreenTurnedOn; }

    ScreenRotation getScreenRotation() const { return mScreenRotation; }



  private:

    ndk::ScopedAStatus setModuleDebug(

            const ::aidl::android::hardware::audio::core::ModuleDebug&) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getTelephony(

            std::shared_ptr<::aidl::android::hardware::audio::core::ITelephony>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getBluetooth(

            std::shared_ptr<::aidl::android::hardware::audio::core::IBluetooth>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getBluetoothA2dp(

            std::shared_ptr<::aidl::android::hardware::audio::core::IBluetoothA2dp>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getBluetoothLe(

            std::shared_ptr<::aidl::android::hardware::audio::core::IBluetoothLe>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus connectExternalDevice(

            const ::aidl::android::media::audio::common::AudioPort&,

            ::aidl::android::media::audio::common::AudioPort*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus disconnectExternalDevice(int32_t) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getAudioPatches(

            std::vector<::aidl::android::hardware::audio::core::AudioPatch>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getAudioPort(int32_t,

                                    ::aidl::android::media::audio::common::AudioPort*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getAudioPortConfigs(

            std::vector<::aidl::android::media::audio::common::AudioPortConfig>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getAudioPorts(

            std::vector<::aidl::android::media::audio::common::AudioPort>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getAudioRoutes(

            std::vector<::aidl::android::hardware::audio::core::AudioRoute>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getAudioRoutesForAudioPort(

            int32_t, std::vector<::aidl::android::hardware::audio::core::AudioRoute>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus openInputStream(const OpenInputStreamArguments&,

                                       OpenInputStreamReturn*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus openOutputStream(const OpenOutputStreamArguments&,

                                        OpenOutputStreamReturn*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getSupportedPlaybackRateFactors(SupportedPlaybackRateFactors*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus setAudioPatch(const ::aidl::android::hardware::audio::core::AudioPatch&,

                                     ::aidl::android::hardware::audio::core::AudioPatch*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus setAudioPortConfig(

            const ::aidl::android::media::audio::common::AudioPortConfig&,

            ::aidl::android::media::audio::common::AudioPortConfig*, bool*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus resetAudioPatch(int32_t) override { return ndk::ScopedAStatus::ok(); }

    ndk::ScopedAStatus resetAudioPortConfig(int32_t) override { return ndk::ScopedAStatus::ok(); }

    ndk::ScopedAStatus getMasterMute(bool*) override { return ndk::ScopedAStatus::ok(); }

    ndk::ScopedAStatus setMasterMute(bool) override { return ndk::ScopedAStatus::ok(); }

    ndk::ScopedAStatus getMasterVolume(float*) override { return ndk::ScopedAStatus::ok(); }

    ndk::ScopedAStatus setMasterVolume(float) override { return ndk::ScopedAStatus::ok(); }

    ndk::ScopedAStatus getMicMute(bool*) override { return ndk::ScopedAStatus::ok(); }

    ndk::ScopedAStatus setMicMute(bool) override { return ndk::ScopedAStatus::ok(); }

    ndk::ScopedAStatus getMicrophones(

            std::vector<::aidl::android::media::audio::common::MicrophoneInfo>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus updateAudioMode(::aidl::android::media::audio::common::AudioMode) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus updateScreenRotation(ScreenRotation in_rotation) override {

        mScreenRotation = in_rotation;

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus updateScreenState(bool in_isTurnedOn) override {

        mIsScreenTurnedOn = in_isTurnedOn;

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getSoundDose(

            std::shared_ptr<::aidl::android::hardware::audio::core::sounddose::ISoundDose>*)

            override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus generateHwAvSyncId(int32_t*) override { return ndk::ScopedAStatus::ok(); }

    ndk::ScopedAStatus getVendorParameters(

            const std::vector<std::string>&,

            std::vector<::aidl::android::hardware::audio::core::VendorParameter>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus setVendorParameters(

            const std::vector<::aidl::android::hardware::audio::core::VendorParameter>&,

            bool) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus addDeviceEffect(

            int32_t,

            const std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>&) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus removeDeviceEffect(

            int32_t,

            const std::shared_ptr<::aidl::android::hardware::audio::effect::IEffect>&) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getMmapPolicyInfos(

            ::aidl::android::media::audio::common::AudioMMapPolicyType,

            std::vector<::aidl::android::media::audio::common::AudioMMapPolicyInfo>*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus supportsVariableLatency(bool*) override { return ndk::ScopedAStatus::ok(); }

    ndk::ScopedAStatus getAAudioMixerBurstCount(int32_t*) override {

        return ndk::ScopedAStatus::ok();

    }

    ndk::ScopedAStatus getAAudioHardwareBurstMinUsec(int32_t*) override {

        return ndk::ScopedAStatus::ok();

    }



    bool mIsScreenTurnedOn = false;

    ScreenRotation mScreenRotation = ScreenRotation::DEG_0;

};



android::String8 createParameterString(const char* key, const char* value) {

    android::AudioParameter params;

    params.add(android::String8(key), android::String8(value));

    return params.toString();

}



android::String8 createParameterString(const char* key, int value) {

    android::AudioParameter params;

    params.addInt(android::String8(key), value);

    return params.toString();

}



template <typename>

struct mf_traits {};

template <class T, class U>

struct mf_traits<U T::*> {

    using member_type = U;

};



}  // namespace



// Provide value printers for types generated from AIDL

// They need to be in the same namespace as the types we intend to print

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

template <typename P>

std::enable_if_t<std::is_function_v<typename mf_traits<decltype(&P::toString)>::member_type>,

                 std::ostream&>

operator<<(std::ostream& os, const P& p) {

    return os << p.toString();

}

template <typename E>

std::enable_if_t<std::is_enum_v<E>, std::ostream&> operator<<(std::ostream& os, const E& e) {

    return os << toString(e);

}

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



using namespace android;



class DeviceHalAidlTest : public testing::Test {

  public:

    void SetUp() override {

        mModule = ndk::SharedRefBase::make<ModuleMock>();

        mDevice = sp<DeviceHalAidl>::make("test", mModule);

    }

    void TearDown() override {

        mDevice.clear();

        mModule.reset();

    }



  protected:

    std::shared_ptr<ModuleMock> mModule;

    sp<DeviceHalAidl> mDevice;

};



TEST_F(DeviceHalAidlTest, ScreenState) {

    EXPECT_FALSE(mModule->isScreenTurnedOn());

    EXPECT_EQ(OK, mDevice->setParameters(createParameterString(AudioParameter::keyScreenState,

                                                               AudioParameter::valueOn)));

    EXPECT_TRUE(mModule->isScreenTurnedOn());

    EXPECT_EQ(OK, mDevice->setParameters(createParameterString(AudioParameter::keyScreenState,

                                                               AudioParameter::valueOff)));

    EXPECT_FALSE(mModule->isScreenTurnedOn());

    // The adaptation layer only logs a warning.

    EXPECT_EQ(OK, mDevice->setParameters(

                          createParameterString(AudioParameter::keyScreenState, "blah")));

    EXPECT_FALSE(mModule->isScreenTurnedOn());

}



TEST_F(DeviceHalAidlTest, ScreenRotation) {

    using ScreenRotation = ::aidl::android::hardware::audio::core::IModule::ScreenRotation;

    EXPECT_EQ(ScreenRotation::DEG_0, mModule->getScreenRotation());

    EXPECT_EQ(OK,

              mDevice->setParameters(createParameterString(AudioParameter::keyScreenRotation, 90)));

    EXPECT_EQ(ScreenRotation::DEG_90, mModule->getScreenRotation());

    EXPECT_EQ(OK,

              mDevice->setParameters(createParameterString(AudioParameter::keyScreenRotation, 0)));

    EXPECT_EQ(ScreenRotation::DEG_0, mModule->getScreenRotation());

    // The adaptation layer only logs a warning.

    EXPECT_EQ(OK,

              mDevice->setParameters(createParameterString(AudioParameter::keyScreenRotation, 42)));

    EXPECT_EQ(ScreenRotation::DEG_0, mModule->getScreenRotation());

}

media/libmediahelper/AudioParameter.cpp

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ const char * const AudioParameter::keyChannels = AUDIO_PARAMETER_STREAM_CHANNELS 
const char * const AudioParameter::keyFrameCount = AUDIO_PARAMETER_STREAM_FRAME_COUNT;

const char * const AudioParameter::keyInputSource = AUDIO_PARAMETER_STREAM_INPUT_SOURCE;

const char * const AudioParameter::keyScreenState = AUDIO_PARAMETER_KEY_SCREEN_STATE;

const char * const AudioParameter::keyScreenRotation = AUDIO_PARAMETER_KEY_ROTATION;

const char * const AudioParameter::keyClosing = AUDIO_PARAMETER_KEY_CLOSING;

const char * const AudioParameter::keyExiting = AUDIO_PARAMETER_KEY_EXITING;

const char * const AudioParameter::keyBtSco = AUDIO_PARAMETER_KEY_BT_SCO;

media/libmediahelper/include/media/AudioParameter.h

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public: 
    //  keyInputSource: to change audio input source, value is an int in audio_source_t

    //     (defined in media/mediarecorder.h)

    //  keyScreenState: either "on" or "off"

    //  keyScreenRotation: one of: 0, 90, 180, 270

    static const char * const keyRouting;

    static const char * const keySamplingRate;

    static const char * const keyFormat;
@@ -48,6 +49,7 @@ public: 
    static const char * const keyFrameCount;

    static const char * const keyInputSource;

    static const char * const keyScreenState;

    static const char * const keyScreenRotation;



    // TODO(b/73175392) consider improvement to AIDL StreamOut interface.

    // keyClosing: "true" when AudioOutputDescriptor is closing.  Used by A2DP HAL.