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

Commit 9bb3a1e0 authored by jiabin's avatar jiabin
Browse files

Make AudioProfile as a common class and create AudioProfileVectorBase. 

AudioProfile is a class that contains information for an audio profile.
AudioProfileVectorBase is a base class that contains operations for a
vector of audio profiles. AudioProfileVector derives from
AudioProfileVectorBase and contains policy related stuff.

Bug: 135621476
Test: CTS for AudioRecord, AudioTrack, AudioManager
Test: audio smoke test, audiopolicy_tests
Test: dumpsys media.audio_policy
Change-Id: Ic2e08efcc5efa99e499a931811b7042fbd5ddf04
parent e46870e9

media/libaudiofoundation/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -10,17 +10,20 @@ cc_library_shared { 


    srcs: [

        "AudioGain.cpp",

        "AudioProfile.cpp",

    ],



    shared_libs: [

        "libbase",

        "libbinder",

        "liblog",

        "libmedia_helper",

        "libutils",

    ],



    header_libs: [

        "libaudio_system_headers",

        "libaudioclient_headers",

        "libaudiofoundation_headers",

    ],

media/libaudiofoundation/AudioProfile.cpp

+42 −407

File changed.

Preview size limit exceeded, changes collapsed.

media/libaudiofoundation/include/media/AudioProfile.h

+18 −54

File changed.

Preview size limit exceeded, changes collapsed.

services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h

+3 −2
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <AudioPolicyMix.h>

#include <EffectDescriptor.h>

#include <SoundTriggerSession.h>

#include <media/AudioProfile.h>



namespace android {
@@ -118,9 +119,9 @@ public: 
        mSource = "AudioPolicyConfig::setDefault";

        mEngineLibraryNameSuffix = kDefaultEngineLibraryNameSuffix;

        mDefaultOutputDevice = new DeviceDescriptor(AUDIO_DEVICE_OUT_SPEAKER);

        mDefaultOutputDevice->addAudioProfile(AudioProfile::createFullDynamic());

        mDefaultOutputDevice->addAudioProfile(AudioProfile::createFullDynamic(gDynamicFormat));

        sp<DeviceDescriptor> defaultInputDevice = new DeviceDescriptor(AUDIO_DEVICE_IN_BUILTIN_MIC);

        defaultInputDevice->addAudioProfile(AudioProfile::createFullDynamic());

        defaultInputDevice->addAudioProfile(AudioProfile::createFullDynamic(gDynamicFormat));

        sp<AudioProfile> micProfile = new AudioProfile(

                AUDIO_FORMAT_PCM_16_BIT, AUDIO_CHANNEL_IN_MONO, 8000);

        defaultInputDevice->addAudioProfile(micProfile);

services/audiopolicy/common/managerdefinitions/include/AudioProfileVector.h

+16 −89

File changed.

Preview size limit exceeded, changes collapsed.