Merge "d2: fix VOIP" into cm-11.0

CyanogenMod · Aug 12, 2014 · 38263fb · 38263fb
2 parents 87f06e0 + 715d2c9
commit 38263fb
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/audio/audio_policy.conf b/audio/audio_policy.conf
@@ -37,10 +37,10 @@ audio_hw_modules {
         flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_LPA
       }
       voip_rx {
-        sampling_rates 8000|16000
+        sampling_rates 8000|16000|44100|48000
-        channel_masks AUDIO_CHANNEL_OUT_MONO
+        channel_masks dynamic
         formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB
-        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_ALL_USB|AUDIO_DEVICE_OUT_ALL_SCO
+        devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET|AUDIO_DEVICE_OUT_ALL_USB
         flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX
       }
       tunnel {
@@ -74,7 +74,7 @@ audio_hw_modules {
       }
       voip_tx {
         sampling_rates 8000|16000
-        channel_masks AUDIO_CHANNEL_IN_MONO
+        channel_masks dynamic
         formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_AMR_NB|AUDIO_FORMAT_AMR_WB|AUDIO_FORMAT_QCELP|AUDIO_FORMAT_EVRC|AUDIO_FORMAT_EVRCB|AUDIO_FORMAT_EVRCWB
         devices AUDIO_DEVICE_IN_COMMUNICATION
       }