diff options
| author | Giulio Cervera <giulio.cervera@gmail.com> | 2012-07-17 12:55:59 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-07-17 12:55:59 +0400 |
| commit | 6e3ab90992b396dece23fbf20da7dca8932cb2e1 (patch) | |
| tree | 7c1f63059913b4a1f1577df9f979ed72151f5ae1 | |
| parent | b67707bf877576eb813073a0483b4039b3c162e2 (diff) | |
| parent | 8c6ee6889e2b7f4d85d58649f7a8c7533bb885ae (diff) | |
| download | android_hardware_qcom_media-6e3ab90992b396dece23fbf20da7dca8932cb2e1.tar.gz android_hardware_qcom_media-6e3ab90992b396dece23fbf20da7dca8932cb2e1.tar.bz2 android_hardware_qcom_media-6e3ab90992b396dece23fbf20da7dca8932cb2e1.zip | |
Merge "audio/msm8660: Add support for sony camcorder mic" into ics
| -rw-r--r-- | audio/msm8660/Android.mk | 4 | ||||
| -rw-r--r-- | audio/msm8660/AudioHardware.cpp | 12 | ||||
| -rw-r--r--[-rwxr-xr-x] | audio/msm8660/AudioHardware.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | audio/msm8660/AudioPolicyManager.cpp | 0 |
4 files changed, 13 insertions, 3 deletions
diff --git a/audio/msm8660/Android.mk b/audio/msm8660/Android.mk index 298a03fc..b86fa1ee 100644 --- a/audio/msm8660/Android.mk +++ b/audio/msm8660/Android.mk @@ -48,6 +48,10 @@ ifeq ($(BOARD_HAVE_SAMSUNG_AUDIO),true) LOCAL_CFLAGS += -DSAMSUNG_AUDIO endif +ifeq ($(BOARD_HAVE_SONY_AUDIO),true) +LOCAL_CFLAGS += -DSONY_AUDIO +endif + ifeq ($(BOARD_HAVE_BACK_MIC_CAMCORDER),true) LOCAL_CFLAGS += -DBACK_MIC_CAMCORDER endif diff --git a/audio/msm8660/AudioHardware.cpp b/audio/msm8660/AudioHardware.cpp index 3aeeb805..3aa05aed 100644 --- a/audio/msm8660/AudioHardware.cpp +++ b/audio/msm8660/AudioHardware.cpp @@ -155,8 +155,9 @@ static const uint32_t DEVICE_HEADSET_CALL_RX = 64; // headset_call_rx static const uint32_t DEVICE_HEADSET_CALL_TX = 65; // headset_call_tx static const uint32_t DEVICE_SPEAKER_VR_TX = 82; // speaker_vr_tx static const uint32_t DEVICE_HEADSET_VR_TX = 83; // headset_vr_tx -static const uint32_t DEVICE_CAMCORDER_TX = 105; // camcoder_tx (misspelled by Samsung) #endif +static const uint32_t DEVICE_CAMCORDER_TX = 105; // camcoder_tx (misspelled by Samsung) + // secondary_mic_tx (sony) static uint32_t FLUENCE_MODE_ENDFIRE = 0; static uint32_t FLUENCE_MODE_BROADSIDE = 1; @@ -821,9 +822,14 @@ AudioHardware::AudioHardware() : index = DEVICE_SPEAKER_VR_TX; else if(strcmp((char* )name[i], "headset_vr_tx") == 0) index = DEVICE_HEADSET_VR_TX; - else if(strcmp((char* )name[i], "camcoder_tx") == 0) - index = DEVICE_CAMCORDER_TX; #endif + else if((strcmp((char* )name[i], "camcoder_tx") == 0) || +#ifdef SONY_AUDIO + (strcmp((char* )name[i], "secondary_mic_tx") == 0)) +#else + (strcmp((char* )name[i], "camcorder_tx") == 0)) +#endif + index = DEVICE_CAMCORDER_TX; else continue; LOGV("index = %d",index); diff --git a/audio/msm8660/AudioHardware.h b/audio/msm8660/AudioHardware.h index b148675b..b148675b 100755..100644 --- a/audio/msm8660/AudioHardware.h +++ b/audio/msm8660/AudioHardware.h diff --git a/audio/msm8660/AudioPolicyManager.cpp b/audio/msm8660/AudioPolicyManager.cpp index fd150720..fd150720 100755..100644 --- a/audio/msm8660/AudioPolicyManager.cpp +++ b/audio/msm8660/AudioPolicyManager.cpp |