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

Commit ef273947 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "Support float/32-bit/24-bit PCM MSD patches" into main am: a5083f6e... 

Merge "Support float/32-bit/24-bit PCM MSD patches" into main am: a5083f6e am: e039cae4 am: 186cb853

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



Change-Id: I15c4f5877407221984b93b057babe41583b6f342
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39790a7f 186cb853

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1751,7 +1751,8 @@ status_t AudioPolicyManager::getBestMsdConfig(bool hwAvSync, 
    // Compressed formats for MSD module, ordered from most preferred to least preferred.

    static const std::vector<audio_format_t> formatsOrder = {{

            AUDIO_FORMAT_IEC60958, AUDIO_FORMAT_MAT_2_1, AUDIO_FORMAT_MAT_2_0, AUDIO_FORMAT_E_AC3,

            AUDIO_FORMAT_AC3, AUDIO_FORMAT_PCM_16_BIT }};

            AUDIO_FORMAT_AC3, AUDIO_FORMAT_PCM_FLOAT, AUDIO_FORMAT_PCM_32_BIT,

            AUDIO_FORMAT_PCM_8_24_BIT, AUDIO_FORMAT_PCM_24_BIT_PACKED, AUDIO_FORMAT_PCM_16_BIT }};

    static const std::vector<audio_channel_mask_t> channelMasksOrder = [](){

        // Channel position masks for MSD module, 3D > 2D > 1D ordering (most preferred to least

        // preferred).