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

Commit c39aa13d authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 2ba92c71: do not merge bug 3370834 Cherrypick from master 

* commit '2ba92c71b5684dce700cf848bf157153c156df1d':
  do not merge bug 3370834 Cherrypick from master
parents 1a082f30 bfa2f13f

include/media/AudioSystem.h

+5 −1
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ public: 
        MODE_NORMAL = 0,

        MODE_RINGTONE,

        MODE_IN_CALL,

        MODE_IN_COMMUNICATION,

        NUM_MODES  // not a valid entry, denotes end-of-list

    };
@@ -466,7 +467,7 @@ public: 
    AudioParameter(const String8& keyValuePairs);

    virtual ~AudioParameter();



    // reserved parameter keys for changeing standard parameters with setParameters() function.

    // reserved parameter keys for changing standard parameters with setParameters() function.

    // Using these keys is mandatory for AudioFlinger to properly monitor audio output/input

    // configuration changes and act accordingly.

    //  keyRouting: to change audio routing, value is an int in AudioSystem::audio_devices
@@ -474,11 +475,14 @@ public: 
    //  keyFormat: to change audio format, value is an int in AudioSystem::audio_format

    //  keyChannels: to change audio channel configuration, value is an int in AudioSystem::audio_channels

    //  keyFrameCount: to change audio output frame count, value is an int

    //  keyInputSource: to change audio input source, value is an int in audio_source

    //     (defined in media/mediarecorder.h)

    static const char *keyRouting;

    static const char *keySamplingRate;

    static const char *keyFormat;

    static const char *keyChannels;

    static const char *keyFrameCount;

    static const char *keyInputSource;



    String8 toString();

include/media/EffectApi.h

+3 −3
Original line number Diff line number Diff line
@@ -602,9 +602,9 @@ enum audio_device_e { 


// Audio mode

enum audio_mode_e {

    AUDIO_MODE_NORMAL,      // phone idle

    AUDIO_MODE_RINGTONE,    // phone ringing

    AUDIO_MODE_IN_CALL      // phone call connected

    AUDIO_MODE_NORMAL,      // device idle

    AUDIO_MODE_RINGTONE,    // device ringing

    AUDIO_MODE_IN_CALL      // audio call connected (VoIP or telephony)

};



// Values for "accessMode" field of buffer_config_t:

include/media/mediarecorder.h

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,8 @@ enum audio_source { 
    AUDIO_SOURCE_VOICE_CALL = 4,

    AUDIO_SOURCE_CAMCORDER = 5,

    AUDIO_SOURCE_VOICE_RECOGNITION = 6,

    AUDIO_SOURCE_MAX = AUDIO_SOURCE_VOICE_RECOGNITION,

    AUDIO_SOURCE_VOICE_COMMUNICATION = 7,

    AUDIO_SOURCE_MAX = AUDIO_SOURCE_VOICE_COMMUNICATION,



    AUDIO_SOURCE_LIST_END  // must be last - used to validate audio source type

};

media/libmedia/AudioSystem.cpp

+1 −0
Original line number Diff line number Diff line
@@ -835,6 +835,7 @@ const char *AudioParameter::keySamplingRate = "sampling_rate"; 
const char *AudioParameter::keyFormat = "format";

const char *AudioParameter::keyChannels = "channels";

const char *AudioParameter::keyFrameCount = "frame_count";

const char *AudioParameter::keyInputSource = "input_source";



AudioParameter::AudioParameter(const String8& keyValuePairs)

{

services/audioflinger/AudioFlinger.cpp

+2 −1
Original line number Diff line number Diff line
@@ -5810,7 +5810,8 @@ uint32_t AudioFlinger::EffectModule::deviceAudioSystemToEffectApi(uint32_t devic 
const uint32_t AudioFlinger::EffectModule::sModeConvTable[] = {

    AUDIO_MODE_NORMAL,   // AudioSystem::MODE_NORMAL

    AUDIO_MODE_RINGTONE, // AudioSystem::MODE_RINGTONE

    AUDIO_MODE_IN_CALL   // AudioSystem::MODE_IN_CALL

    AUDIO_MODE_IN_CALL,  // AudioSystem::MODE_IN_CALL

    AUDIO_MODE_IN_CALL   // AudioSystem::MODE_IN_COMMUNICATION, same conversion as for MODE_IN_CALL

};



int AudioFlinger::EffectModule::modeAudioSystemToEffectApi(uint32_t mode)