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

Commit aed58850 authored by Dean Wheatley's avatar Dean Wheatley Committed by Automerger Merge Worker
Browse files

Support remote submix for 44.1kHz am: b984183e 

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



Change-Id: Ieaf8fe65fa676c63e3d49bf074faf793b5cd583e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85b91878 b984183e

media/libaudioclient/tests/audiorouting_tests.cpp

+21 −3
Original line number Diff line number Diff line
@@ -86,7 +86,18 @@ TEST(AudioTrackTest, TestPerformanceMode) { 
    }

}



TEST(AudioTrackTest, DefaultRoutingTest) {

class AudioTrackTest

        : public ::testing::TestWithParam<int> {



public:

    AudioTrackTest()

            : mSampleRate(GetParam()){};



    const uint32_t mSampleRate;



};



TEST_P(AudioTrackTest, DefaultRoutingTest) {

    audio_port_v7 port;

    if (OK != getPortByAttributes(AUDIO_PORT_ROLE_SOURCE, AUDIO_PORT_TYPE_DEVICE,

                                  AUDIO_DEVICE_IN_REMOTE_SUBMIX, "0", port)) {
@@ -95,7 +106,8 @@ TEST(AudioTrackTest, DefaultRoutingTest) { 


    // create record instance

    sp<AudioCapture> capture = sp<AudioCapture>::make(

            AUDIO_SOURCE_REMOTE_SUBMIX, 48000, AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_IN_STEREO);

            AUDIO_SOURCE_REMOTE_SUBMIX, mSampleRate, AUDIO_FORMAT_PCM_16_BIT,

            AUDIO_CHANNEL_IN_STEREO);

    ASSERT_NE(nullptr, capture);

    ASSERT_EQ(OK, capture->create()) << "record creation failed";

    sp<OnAudioDeviceUpdateNotifier> cbCapture = sp<OnAudioDeviceUpdateNotifier>::make();
@@ -103,7 +115,7 @@ TEST(AudioTrackTest, DefaultRoutingTest) { 


    // create playback instance

    sp<AudioPlayback> playback = sp<AudioPlayback>::make(

            48000 /* sampleRate */, AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_OUT_STEREO,

            mSampleRate, AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_OUT_STEREO,

            AUDIO_OUTPUT_FLAG_NONE, AUDIO_SESSION_NONE);

    ASSERT_NE(nullptr, playback);

    ASSERT_EQ(OK, playback->loadResource("/data/local/tmp/bbb_2ch_24kHz_s16le.raw"))
@@ -133,6 +145,12 @@ TEST(AudioTrackTest, DefaultRoutingTest) { 
    playback->stop();

}



INSTANTIATE_TEST_SUITE_P(

        AudioTrackParameterizedTest,

        AudioTrackTest,

        ::testing::Values(44100, 48000)

);



class AudioRoutingTest : public ::testing::Test {

  public:

    void SetUp() override {

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+14 −2
Original line number Diff line number Diff line
@@ -7995,9 +7995,21 @@ status_t AudioPolicyManager::setInputDevice(audio_io_handle_t input, 
                        if (result.source == AUDIO_SOURCE_HOTWORD && !inputDesc->isSoundTrigger()) {

                            result.source = AUDIO_SOURCE_VOICE_RECOGNITION;

                        }

                        return result; }).

                        return result; });

            //only one input device for now

                    addSource(device);

            if (audio_is_remote_submix_device(device->type())) {

                // remote submix HAL does not support audio conversion, need source device

                // audio config to match the sink input descriptor audio config, otherwise AIDL

                // HAL patching will fail

                audio_port_config srcDevicePortConfig = {};

                device->toAudioPortConfig(&srcDevicePortConfig, nullptr);

                srcDevicePortConfig.sample_rate = inputDesc->getSamplingRate();

                srcDevicePortConfig.channel_mask = inputDesc->getChannelMask();

                srcDevicePortConfig.format = inputDesc->getFormat();

                patchBuilder.addSource(srcDevicePortConfig);

            } else {

                patchBuilder.addSource(device);

            }

            status = installPatch(__func__, patchHandle, inputDesc.get(), patchBuilder.patch(), 0);

        }

    }