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

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

Merge "Support 192kHz sample rate in AIDL remote submix" into main am: d146de22 

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



Change-Id: Id8940779f3dcc7bf96934a740f909f7e6f7730a8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f3c6e624 d146de22

audio/aidl/default/Configuration.cpp

+3 −3
Original line number Diff line number Diff line
@@ -324,9 +324,9 @@ std::unique_ptr<Configuration> getPrimaryConfiguration() { 
//

// Mix ports:

//  * "r_submix output", maximum 10 opened streams, maximum 10 active streams

//    - profile PCM 16-bit; STEREO; 8000, 11025, 16000, 32000, 44100, 48000

//    - profile PCM 16-bit; STEREO; 8000, 11025, 16000, 32000, 44100, 48000, 192000

//  * "r_submix input", maximum 10 opened streams, maximum 10 active streams

//    - profile PCM 16-bit; STEREO; 8000, 11025, 16000, 32000, 44100, 48000

//    - profile PCM 16-bit; STEREO; 8000, 11025, 16000, 32000, 44100, 48000, 192000

//

// Routes:

//  "r_submix output" -> "Remote Submix Out"
@@ -337,7 +337,7 @@ std::unique_ptr<Configuration> getRSubmixConfiguration() { 
        Configuration c;

        const std::vector<AudioProfile> remoteSubmixPcmAudioProfiles{

                createProfile(PcmType::INT_16_BIT, {AudioChannelLayout::LAYOUT_STEREO},

                              {8000, 11025, 16000, 32000, 44100, 48000})};

                              {8000, 11025, 16000, 32000, 44100, 48000, 192000})};



        // Device ports