diff options
| author | Dave Burke <daveburke@google.com> | 2012-04-30 12:45:40 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-30 12:45:40 -0700 |
| commit | 80f21d5d3ff761d2905d99548c2e6f1bab078eae (patch) | |
| tree | 709e6a42bbefd266f347373c9c933aef0ca324d6 | |
| parent | 2dc9bc1f87be40c2e4903b97a3df353d0f7c6781 (diff) | |
| parent | 180113a6240e8cabbcb8df10f70e7c43334d9c43 (diff) | |
| download | omap4xxx-80f21d5d3ff761d2905d99548c2e6f1bab078eae.tar.gz | |
Merge "Renaming AAC variants to their more technical forms." into jb-dev
| -rw-r--r-- | test/CameraHal/camera_test_menu.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp index 1430ea4..8f3ae50 100644 --- a/test/CameraHal/camera_test_menu.cpp +++ b/test/CameraHal/camera_test_menu.cpp @@ -291,8 +291,7 @@ audio_Codecs audioCodecs[] = { { AUDIO_ENCODER_AMR_NB, "AMR_NB" }, { AUDIO_ENCODER_AMR_WB, "AMR_WB" }, { AUDIO_ENCODER_AAC, "AAC" }, - { AUDIO_ENCODER_AAC_PLUS, "AAC+" }, - { AUDIO_ENCODER_EAAC_PLUS, "EAAC+" }, + { AUDIO_ENCODER_HE_AAC, "AAC+" }, { AUDIO_ENCODER_LIST_END, "disabled"}, }; @@ -2506,4 +2505,3 @@ int main(int argc, char *argv[]) { system("echo camerahal_test > /sys/power/wake_unlock"); return 0; } - |