commit 48e2345526f7c00689b32f75b9df487befc4eea8
author Mikhail Naganov <mnaganov@google.com> Wed Oct 07 20:57:51 2020 +0000
committer Mikhail Naganov <mnaganov@google.com> Wed Oct 07 21:01:30 2020 +0000
tree 069f26194e478e6c331423313164901a94132af2
parent 69d16e8738bf679d7951fd75a5b993fe1d91d8aa

Fix channel masks in LVM tests

The test code was constructing index masks manually.
Use predefined values instead.

Bug: 169889714
Test: cd frameworks/av/media/libeffects/lvm/tests && ./build_and_run_all_unit_tests.sh
Change-Id: I509872d617d3b13a0a62ab4896cc13813edc745d

media/libeffects/lvm/tests/lvmtest.cpp

diff --git a/media/libeffects/lvm/tests/lvmtest.cpp b/media/libeffects/lvm/tests/lvmtest.cpp
index a1520af..5c5f646 100644
--- a/media/libeffects/lvm/tests/lvmtest.cpp
+++ b/media/libeffects/lvm/tests/lvmtest.cpp
@@ -94,21 +94,21 @@
         AUDIO_CHANNEL_OUT_QUAD_BACK,
         AUDIO_CHANNEL_OUT_QUAD_SIDE,
         AUDIO_CHANNEL_OUT_SURROUND,
-        (1 << 4) - 1,
+        AUDIO_CHANNEL_INDEX_MASK_4,
         AUDIO_CHANNEL_OUT_2POINT1POINT2,
         AUDIO_CHANNEL_OUT_3POINT0POINT2,
         AUDIO_CHANNEL_OUT_PENTA,
-        (1 << 5) - 1,
+        AUDIO_CHANNEL_INDEX_MASK_5,
         AUDIO_CHANNEL_OUT_3POINT1POINT2,
         AUDIO_CHANNEL_OUT_5POINT1,
         AUDIO_CHANNEL_OUT_5POINT1_BACK,
         AUDIO_CHANNEL_OUT_5POINT1_SIDE,
-        (1 << 6) - 1,
+        AUDIO_CHANNEL_INDEX_MASK_6,
         AUDIO_CHANNEL_OUT_6POINT1,
-        (1 << 7) - 1,
+        AUDIO_CHANNEL_INDEX_MASK_7,
         AUDIO_CHANNEL_OUT_5POINT1POINT2,
         AUDIO_CHANNEL_OUT_7POINT1,
-        (1 << 8) - 1,
+        AUDIO_CHANNEL_INDEX_MASK_8,
 };
 
 void printUsage() {

media/libeffects/lvm/tests/reverb_test.cpp

diff --git a/media/libeffects/lvm/tests/reverb_test.cpp b/media/libeffects/lvm/tests/reverb_test.cpp
index 768f655..7cbca9b 100644
--- a/media/libeffects/lvm/tests/reverb_test.cpp
+++ b/media/libeffects/lvm/tests/reverb_test.cpp
@@ -79,21 +79,21 @@
         AUDIO_CHANNEL_OUT_QUAD_BACK,
         AUDIO_CHANNEL_OUT_QUAD_SIDE,
         AUDIO_CHANNEL_OUT_SURROUND,
-        (1 << 4) - 1,
+        AUDIO_CHANNEL_INDEX_MASK_4,
         AUDIO_CHANNEL_OUT_2POINT1POINT2,
         AUDIO_CHANNEL_OUT_3POINT0POINT2,
         AUDIO_CHANNEL_OUT_PENTA,
-        (1 << 5) - 1,
+        AUDIO_CHANNEL_INDEX_MASK_5,
         AUDIO_CHANNEL_OUT_3POINT1POINT2,
         AUDIO_CHANNEL_OUT_5POINT1,
         AUDIO_CHANNEL_OUT_5POINT1_BACK,
         AUDIO_CHANNEL_OUT_5POINT1_SIDE,
-        (1 << 6) - 1,
+        AUDIO_CHANNEL_INDEX_MASK_6,
         AUDIO_CHANNEL_OUT_6POINT1,
-        (1 << 7) - 1,
+        AUDIO_CHANNEL_INDEX_MASK_7,
         AUDIO_CHANNEL_OUT_5POINT1POINT2,
         AUDIO_CHANNEL_OUT_7POINT1,
-        (1 << 8) - 1,
+        AUDIO_CHANNEL_INDEX_MASK_8,
 };
 
 constexpr int kReverbConfigChMaskCount = std::size(kReverbConfigChMask);