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

Commit c4794915 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes I6096d12a,I5596f392 am: e261d50a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2603929



Change-Id: Ibfd173ed0d1dc7196d41cb5bdb20c29a6820ed65
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9cc09a1f e261d50a

PREUPLOAD.cfg

+1 −0
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp 
               media/libmediatranscoding/

               services/mediatranscoding/

               media/libaudioclient/tests/

               media/libaudiohal/tests/

media/libaudiohal/impl/Android.bp

+42 −30
Original line number Diff line number Diff line
@@ -240,19 +240,46 @@ cc_library_shared { 
    ]

}



cc_library_shared {

    name: "libaudiohal@aidl",

cc_defaults {

    name: "libaudiohal_aidl_default",

    defaults: [

        "libaudiohal_default",

        "latest_android_hardware_audio_common_ndk_shared",

        "latest_android_hardware_audio_core_ndk_shared",

        "latest_android_hardware_audio_effect_ndk_shared",

        "latest_android_media_audio_common_types_ndk_shared",

    ],

    shared_libs: [

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

        "libaudio_aidl_conversion_common_cpp",

        "libaudio_aidl_conversion_common_ndk",

        "libaudio_aidl_conversion_common_ndk_cpp",

        "libaudio_aidl_conversion_core_ndk",

        "libaudio_aidl_conversion_effect_ndk",

        "libaudioaidlcommon",

        "libbinder_ndk",

    ],

    header_libs: [

        "libaudio_system_headers",

        "libeffectsconfig_headers",

    ],

    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

        "-Wthread-safety",

        "-DBACKEND_CPP_NDK",

    ],

}



cc_library_shared {

    name: "libaudiohal@aidl",

    defaults: [

        "libaudiohal_default",

        "libaudiohal_aidl_default",

    ],

    srcs: [

        "DeviceHalAidl.cpp",

        "DevicesFactoryHalEntry.cpp",

        "DevicesFactoryHalAidl.cpp",

        "EffectConversionHelperAidl.cpp",

        "EffectBufferHalAidl.cpp",

        "EffectHalAidl.cpp",
@@ -274,32 +301,17 @@ cc_library_shared { 
        "effectsAidlConversion/AidlConversionVisualizer.cpp",

        "EffectsFactoryHalAidl.cpp",

        "EffectsFactoryHalEntry.cpp",

        "StreamHalAidl.cpp",

        ":audio_effectproxy_src_files"

        ":audio_effectproxy_src_files",

        ":core_audio_hal_aidl_src_files",

    ],

    static_libs: [

        "android.hardware.common-V2-ndk",

        "android.hardware.common.fmq-V1-ndk",

    ],

    shared_libs: [

        "libaudio_aidl_conversion_common_cpp",

        "libaudio_aidl_conversion_common_ndk",

        "libaudio_aidl_conversion_common_ndk_cpp",

        "libaudio_aidl_conversion_core_ndk",

        "libaudio_aidl_conversion_effect_ndk",

        "libaudioaidlcommon",

        "libbinder_ndk",

    ],

    header_libs: [

        "libaudio_system_headers",

        "libeffectsconfig_headers",

    ],

    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

        "-Wthread-safety",

        "-DBACKEND_CPP_NDK",

}



filegroup {

    name: "core_audio_hal_aidl_src_files",

    srcs: [

        "DeviceHalAidl.cpp",

        "DevicesFactoryHalAidl.cpp",

        "StreamHalAidl.cpp",

    ],

}

media/libaudiohal/tests/Android.bp

+18 −25
Original line number Diff line number Diff line
@@ -21,34 +21,34 @@ package { 
}



cc_defaults {

    name: "AudioHalTestDefaults",

    name: "libaudiohal_aidl_test_default",

    test_suites: ["device-tests"],

    defaults: [

        "latest_android_media_audio_common_types_ndk_shared",

    ],

    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

        "-Wthread-safety",

        "-DBACKEND_NDK",

        "libaudiohal_default",

        "libaudiohal_aidl_default",

    ],



    shared_libs: [

        "audioclient-types-aidl-cpp",

        "libaudio_aidl_conversion_common_ndk",

        "libaudiohal",

        "liblog",

        "libutils",

        "libvibrator",

    ],

}



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"],

    defaults: ["AudioHalTestDefaults"],

    header_libs: ["libaudiohal_headers"],

    defaults: ["libaudiohal_aidl_test_default"],

    shared_libs: [

        "libvibrator",

    ],

}



cc_test {
@@ -58,15 +58,8 @@ cc_test { 
        ":audio_effectproxy_src_files",

    ],

    defaults: [

        "AudioHalTestDefaults",

        "latest_android_hardware_audio_effect_ndk_shared",

        "libaudiohal_default",

        "libaudiohal_aidl_test_default",

        "use_libaidlvintf_gtest_helper_static",

    ],

    shared_libs: [

        "android.hardware.common.fmq-V1-ndk",

        "libbinder_ndk",

        "libfmq",

    ],

    header_libs: ["libaudiohalimpl_headers"],

}

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;