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

Commit 87ca9c43 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ic2064352bbe4a58734596fac0855b4f268a62aaf
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6150f711 fdd4b4ec

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, 192000

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

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

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

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

//

// 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, 192000})};

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



        // Device ports