drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tweak audio APIs for better forward/backward/sideways compatibility."

Browse Source
This commit is contained in:
Jean-Baptiste Queru
2011-05-12 14:19:41 -07:00
committed by Android Code Review
parent 71d25778c6 da94c346a5
commit 4770c79c34
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/media/EffectApi.h
View File

@ -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:

8
services/audioflinger/AudioFlinger.cpp
View File

@ -5808,10 +5808,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)