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

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

Merge "Fix channel masks in LVM tests" am: b8f3cf86 am: 1f0bda6c am: 39d10ce4 

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

Change-Id: I791333c7054648ecac6675857e83e2ce14e4e847
parents 5e9f0ba9 39d10ce4

media/libeffects/lvm/tests/lvmtest.cpp

+5 −5
Original line number Diff line number Diff line
@@ -94,21 +94,21 @@ constexpr audio_channel_mask_t lvmConfigChMask[] = { 
        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

+5 −5
Original line number Diff line number Diff line
@@ -79,21 +79,21 @@ constexpr audio_channel_mask_t kReverbConfigChMask[] = { 
        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);