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

Commit 5149f107 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better... 

am 20fd3f0d: am 4770c79c: Merge "Tweak audio APIs for better forward/backward/sideways compatibility."

* commit '20fd3f0d83d4665a6ac33a10f4a48a0f6f159068':
  Tweak audio APIs for better forward/backward/sideways compatibility.
parents 77e827c4 ac0aafc3

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,      // device idle

    AUDIO_MODE_RINGTONE,    // device ringing

    AUDIO_MODE_IN_CALL      // audio call connected (VoIP or telephony)

    AUDIO_EFFECT_MODE_NORMAL,   // device idle

    AUDIO_EFFECT_MODE_RINGTONE, // device ringing

    AUDIO_EFFECT_MODE_IN_CALL   // audio call connected (VoIP or telephony)

};



// Values for "accessMode" field of buffer_config_t:

services/audioflinger/AudioFlinger.cpp

+4 −4
Original line number Diff line number Diff line
@@ -5717,10 +5717,10 @@ uint32_t AudioFlinger::EffectModule::deviceAudioSystemToEffectApi(uint32_t devic 


// update this table when AudioSystem::audio_mode or audio_mode_e (in EffectApi.h) are modified

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_COMMUNICATION, same conversion as for MODE_IN_CALL

    AUDIO_EFFECT_MODE_NORMAL,   // AudioSystem::MODE_NORMAL

    AUDIO_EFFECT_MODE_RINGTONE, // AudioSystem::MODE_RINGTONE

    AUDIO_EFFECT_MODE_IN_CALL,  // AudioSystem::MODE_IN_CALL

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

};



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