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

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

Merge "AIDL: Consider both inputs and output of r_submix to be "virtual"" into... 

Merge "AIDL: Consider both inputs and output of r_submix to be "virtual"" into main am: a017705a am: 6581d405 am: 014a7639

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



Change-Id: I7e13ea71159bb88ab693e3952b7975d58d45e4f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 56aaeaa9 014a7639

media/audioaidlconversion/AidlConversionCppNdk.cpp

+5 −9
Original line number Diff line number Diff line
@@ -508,15 +508,6 @@ const detail::AudioDevicePairs& getAudioDevicePairs() { 
            {

                AUDIO_DEVICE_IN_ECHO_REFERENCE, make_AudioDeviceDescription(

                        AudioDeviceType::IN_ECHO_REFERENCE)

            },

            {

                AUDIO_DEVICE_IN_REMOTE_SUBMIX, make_AudioDeviceDescription(

                         AudioDeviceType::IN_SUBMIX)

            },

            {

                AUDIO_DEVICE_OUT_REMOTE_SUBMIX, make_AudioDeviceDescription(

                        AudioDeviceType::OUT_SUBMIX,

                        GET_DEVICE_DESC_CONNECTION(VIRTUAL))

            }

        }};

        append_AudioDeviceDescription(pairs,
@@ -592,6 +583,11 @@ const detail::AudioDevicePairs& getAudioDevicePairs() { 
                AUDIO_DEVICE_IN_BLE_HEADSET, AUDIO_DEVICE_OUT_BLE_HEADSET,

                AudioDeviceType::IN_HEADSET, AudioDeviceType::OUT_HEADSET,

                GET_DEVICE_DESC_CONNECTION(BT_LE));

        append_AudioDeviceDescription(pairs,

                AUDIO_DEVICE_IN_REMOTE_SUBMIX, AUDIO_DEVICE_OUT_REMOTE_SUBMIX,

                AudioDeviceType::IN_SUBMIX, AudioDeviceType::OUT_SUBMIX,

                GET_DEVICE_DESC_CONNECTION(VIRTUAL));



        return pairs;

    }();

    return pairs;