Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Effect AIDL: correct some code format" into main am: 697e3f89a7 am: dcfc268767 am: e725d180f9

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2757992

Change-Id: I7cd32bbd2859be9c1bf958924ac8988a695839d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shunkai Yao
2023-09-21 23:13:45 +00:00
committed by Automerger Merge Worker
parent 2ac8eb355d e725d180f9
commit 0ee800e4a3
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
audio/aidl/vts/TestUtils.h
View File

@@ -78,9 +78,9 @@ inline ::testing::AssertionResult assertResult(const char* exp_expr, const char*
EXPECT_PRED_FORMAT2(::android::hardware::audio::common::testing::detail::assertResult, \ EXPECT_PRED_FORMAT2(::android::hardware::audio::common::testing::detail::assertResult, \
expected, ret) expected, ret)
#define SKIP_TEST_IF_DATA_UNSUPPORTED(flags) \ #define SKIP_TEST_IF_DATA_UNSUPPORTED(flags) \
({ \ ({ \
if ((flags).hwAcceleratorMode == Flags::HardwareAccelerator::TUNNEL || (flags).bypass) { \ if ((flags).hwAcceleratorMode == Flags::HardwareAccelerator::TUNNEL || (flags).bypass) { \
GTEST_SKIP() << "Skip data path for offload"; \ GTEST_SKIP() << "Skip data path for offload"; \
} \ } \
}) })

12
audio/aidl/vts/VtsHalAudioEffectTargetTest.cpp
View File

@@ -42,11 +42,11 @@ using ndk::ScopedAStatus;
using aidl::android::hardware::audio::effect::CommandId; using aidl::android::hardware::audio::effect::CommandId;
using aidl::android::hardware::audio::effect::Descriptor; using aidl::android::hardware::audio::effect::Descriptor;
using aidl::android::hardware::audio::effect::Flags;
using aidl::android::hardware::audio::effect::IEffect; using aidl::android::hardware::audio::effect::IEffect;
using aidl::android::hardware::audio::effect::IFactory; using aidl::android::hardware::audio::effect::IFactory;
using aidl::android::hardware::audio::effect::Parameter; using aidl::android::hardware::audio::effect::Parameter;
using aidl::android::hardware::audio::effect::State; using aidl::android::hardware::audio::effect::State;
using aidl::android::hardware::audio::effect::Flags;
using aidl::android::media::audio::common::AudioDeviceDescription; using aidl::android::media::audio::common::AudioDeviceDescription;
using aidl::android::media::audio::common::AudioDeviceType; using aidl::android::media::audio::common::AudioDeviceType;
using aidl::android::media::audio::common::AudioMode; using aidl::android::media::audio::common::AudioMode;
@@ -87,11 +87,11 @@ class AudioEffectTest : public testing::TestWithParam<EffectTestParam>, public E
}; };
class AudioEffectDataPathTest : public AudioEffectTest { class AudioEffectDataPathTest : public AudioEffectTest {
public: public:
void SetUp() override { void SetUp() override {
AudioEffectTest::SetUp(); AudioEffectTest::SetUp();
SKIP_TEST_IF_DATA_UNSUPPORTED(mDescriptor.common.flags); SKIP_TEST_IF_DATA_UNSUPPORTED(mDescriptor.common.flags);
} }
}; };
TEST_P(AudioEffectTest, SetupAndTearDown) { TEST_P(AudioEffectTest, SetupAndTearDown) {