diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml
index 6b661c5..add0925 100644
--- a/audio/audio_effects.xml
+++ b/audio/audio_effects.xml
@@ -1,5 +1,5 @@
-
+
@@ -82,7 +82,6 @@
-
@@ -113,8 +112,5 @@
-
-
-
diff --git a/audio/audio_io_policy.conf b/audio/audio_io_policy.conf
index 1f2a403..3dbd1c5 100644
--- a/audio/audio_io_policy.conf
+++ b/audio/audio_io_policy.conf
@@ -18,13 +18,6 @@ outputs {
bit_width 16
app_type 69937
}
- default_24bit {
- flags AUDIO_OUTPUT_FLAG_PRIMARY
- formats AUDIO_FORMAT_PCM_24_BIT_PACKED
- sampling_rates 48000
- bit_width 24
- app_type 69937
- }
proaudio {
flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW
formats AUDIO_FORMAT_PCM_16_BIT
@@ -33,7 +26,7 @@ outputs {
app_type 69943
}
voip_rx {
- flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT
+ flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX
formats AUDIO_FORMAT_PCM_16_BIT
sampling_rates 8000|16000|32000|48000
bit_width 16
@@ -46,13 +39,6 @@ outputs {
bit_width 16
app_type 69936
}
- deep_buffer_24 {
- flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER
- formats AUDIO_FORMAT_PCM_24_BIT_PACKED
- sampling_rates 48000
- bit_width 24
- app_type 69940
- }
direct_pcm_16 {
flags AUDIO_OUTPUT_FLAG_DIRECT
formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT
@@ -62,7 +48,7 @@ outputs {
}
direct_pcm_24 {
flags AUDIO_OUTPUT_FLAG_DIRECT
- formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT
+ formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT
sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000
bit_width 24
app_type 69940
@@ -90,7 +76,7 @@ outputs {
}
compress_offload_24 {
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING
- formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO
+ formats AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO
sampling_rates 44100|48000|88200|96000|176400|192000
bit_width 24
app_type 69940
@@ -100,7 +86,7 @@ outputs {
inputs {
record_16bit {
formats AUDIO_FORMAT_PCM_16_BIT
- sampling_rates 8000|16000|32000|48000|88200|96000|176400|192000
+ sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000
bit_width 16
app_type 69938
}
@@ -116,4 +102,39 @@ inputs {
bit_width 32
app_type 69949
}
+ record_compress_16 {
+ flags AUDIO_INPUT_FLAG_COMPRESS
+ formats AUDIO_FORMAT_PCM_16_BIT
+ sampling_rates 8000|16000|32000|44100|48000|88200|96000|176400|192000
+ bit_width 16
+ app_type 69938
+ }
+ record_compress_24 {
+ flags AUDIO_INPUT_FLAG_COMPRESS
+ formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_24_BIT
+ sampling_rates 44100|48000|88200|96000|176400|192000
+ bit_width 24
+ app_type 69948
+ }
+ record_compress_32 {
+ flags AUDIO_INPUT_FLAG_COMPRESS
+ formats AUDIO_FORMAT_PCM_32_BIT|AUDIO_FORMAT_PCM_FLOAT
+ sampling_rates 44100|48000|88200|96000|176400|192000
+ bit_width 32
+ app_type 69949
+ }
+ voip_tx {
+ flags AUDIO_INPUT_FLAG_VOIP_TX
+ formats AUDIO_FORMAT_PCM_16_BIT
+ sampling_rates 8000|16000|32000|48000
+ bit_width 16
+ app_type 69946
+ }
+ low_latency_voip_tx {
+ flags AUDIO_INPUT_FLAG_FAST|AUDIO_INPUT_FLAG_VOIP_TX
+ formats AUDIO_FORMAT_PCM_16_BIT
+ sampling_rates 48000
+ bit_width 16
+ app_type 69946
+ }
}
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml
index 4222348..dedb561 100644
--- a/audio/audio_policy_configuration.xml
+++ b/audio/audio_policy_configuration.xml
@@ -1,5 +1,5 @@
-
+
- - Speaker
- - Speaker Safe
- Earpiece
+ - Speaker
- Telephony Tx
- Built-In Mic
- Built-In Back Mic
+ - FM Tuner
- Telephony Rx
Speaker
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+ samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000"
+ channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/>
+
+
+
+
@@ -80,21 +113,41 @@
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
+
+
+
+
+
+
+
+
-
-
-
+ flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX">
+ samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
@@ -102,22 +155,39 @@
samplingRates="8000,16000,48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-
-
-
-
-
-
-
+
+
+ channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -127,96 +197,174 @@
samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3"/>
-
+
+
+ samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
+ channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
-
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
-
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out"/>
+
+
+
+
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>
+ sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx,mmap_no_irq_out,hifi_playback"/>
-
-
-
-
+
+
+
+
-
+
+
+
+
+
-
+
@@ -239,18 +387,18 @@
-
+
-
+
-
-
+
+
diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml
index 91abed4..8fa7be3 100644
--- a/audio/audio_policy_volumes.xml
+++ b/audio/audio_policy_volumes.xml
@@ -44,7 +44,7 @@ volume index from 0 to 100.
+ ref="DEFAULT_HEARING_AID_VOLUME_CURVE"/>
1,-3000
33,-2600
@@ -73,23 +73,27 @@ volume index from 0 to 100.
ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/>
-
+
+ 1,-6500
+ 33,-4500
+ 73,-1400
+ 100,-50
+
- 1,-6200
- 13,-5300
- 20,-4700
- 27,-4100
- 33,-3500
- 40,-2950
- 47,-2600
- 53,-2250
- 60,-1900
- 66,-1600
- 73,-1250
- 80,-900
- 87,-550
- 93,-300
+ 1,-7100
+ 13,-5700
+ 20,-5000
+ 27,-4400
+ 33,-3800
+ 40,-3200
+ 47,-2700
+ 53,-2300
+ 60,-2000
+ 66,-1700
+ 73,-1400
+ 80,-1000
+ 87,-700
+ 93,-400
100,0
- 0,-4200
- 33,-2800
- 66,-1400
+ 0,-420
+ 33,-280
+ 66,-140
100,0
@@ -196,16 +200,6 @@ volume index from 0 to 100.
ref="DEFAULT_NON_MUTABLE_VOLUME_CURVE"/>
-
-
-
-
-