Last Known Stable

Change-Id: I6ece0266082be385106fc311b3042e89c97261b0

4 files changed, 147 insertions, 210 deletions

diff --git a/BoardConfig.mk b/BoardConfig.mk
index ee0ec97..47e4baf 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -68,7 +68,7 @@ BACKLIGHT_PATH := "/sys/class/backlight/panel/brightness"
 CHARGING_ENABLED_PATH := "/sys/class/power_supply/battery/batt_lp_charging"
 
 # Kernel
-TARGET_KERNEL_SOURCE := kernel/samsung/exynos5420
+TARGET_KERNEL_SOURCE := kernel/samsung/ha3g
 TARGET_KERNEL_CONFIG := cm_ha3g_defconfig
 #TARGET_KERNEL_SELINUX_CONFIG := selinux_defconfig
 #BOARD_KERNEL_CMDLINE := console=null vmalloc=512M androidboot.console=null user_debug=31
diff --git a/configs/media_codecs.xml b/configs/media_codecs.xml
index 25dbc04..cc0e04b 100644
--- a/configs/media_codecs.xml
+++ b/configs/media_codecs.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright (C) 2012 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,11 @@
 
 <MediaCodecs>
     <Decoders>
-        <MediaCodec name="OMX.Exynos.mpeg4.dec" type="video/mp4v-es" >
+        <MediaCodec name="OMX.Exynos.MPEG4.Decoder" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Quirk name="video-controller-check-enable" />
-            <Limit name="size" min="32x32" max="2048x2048" />
+            <Limit name="size" min="32x32" max="1920x1088" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="489600" />
@@ -29,22 +28,21 @@
             <Feature name="adaptive-playback" />
         </MediaCodec>
 
-        <MediaCodec name="OMX.Exynos.h263.dec" type="video/3gpp" >
+        <MediaCodec name="OMX.Exynos.H263.Decoder" type="video/3gpp" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Quirk name="video-controller-check-enable" />
-            <Limit name="size" min="32x32" max="2048x1152" />
+            <Limit name="size" min="32x32" max="1088x1152" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="489600" />
             <Limit name="bitrate" range="1-80000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <MediaCodec name="OMX.Exynos.avc.dec" type="video/avc" >
+
+        <MediaCodec name="OMX.Exynos.AVC.Decoder" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Quirk name="video-controller-check-enable" />
             <Limit name="size" min="32x32" max="8192x8192" />
             <Limit name="alignment" value="2x2" />
@@ -54,10 +52,9 @@
             <Feature name="adaptive-playback" />
         </MediaCodec>
 
-        <MediaCodec name="OMX.Exynos.vp8.dec" type="video/x-vnd.on2.vp8" >
+        <MediaCodec name="OMX.Exynos.VP8.Decoder" type="video/x-vnd.on2.vp8" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
-            <Quirk name="decoder-ignores-streamcorrupt-error" />
             <Quirk name="video-controller-check-enable" />
             <Limit name="size" min="32x32" max="8192x8192" />
             <Limit name="alignment" value="2x2" />
@@ -69,20 +66,35 @@
     </Decoders>
 
     <Encoders>
-        <MediaCodec name="OMX.Exynos.AVC.Encoder" type="video/avc" >
+        <MediaCodec name="OMX.Exynos.MPEG4.Encoder" type="video/mp4v-es" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="video-controller-check-enable" />
+            <Limit name="size" min="32x32" max="1920x1088" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="489600" />
+            <Limit name="bitrate" range="1-40000000" />
         </MediaCodec>
         <MediaCodec name="OMX.Exynos.H263.Encoder" type="video/3gpp" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="video-controller-check-enable" />
+            <Limit name="size" min="32x32" max="1088x1152" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="489600" />
+            <Limit name="bitrate" range="1-40000000" />
         </MediaCodec>
-        <MediaCodec name="OMX.Exynos.MPEG4.Encoder" type="video/mp4v-es" >
+        <MediaCodec name="OMX.Exynos.AVC.Encoder" type="video/avc" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
             <Quirk name="video-controller-check-enable" />
+            <Limit name="size" min="32x32" max="8192x8192" />
+            <Limit name="alignment" value="2x2" />
+            <Limit name="block-size" value="16x16" />
+            <Limit name="blocks-per-second" min="1" max="489600" />
+            <Limit name="bitrate" range="1-40000000" />
         </MediaCodec>
     </Encoders>
     <Include href="media_codecs_google_audio.xml" />
diff --git a/configs/ysound.xml b/configs/ysound.xml
index 6b9c5ee..4f7045a 100644
--- a/configs/ysound.xml
+++ b/configs/ysound.xml
@@ -23,7 +23,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -60,7 +60,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -258,7 +258,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -295,7 +295,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -468,7 +468,7 @@
         <mixer name="Ref Input Volume" value0="76" value1="76" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -505,7 +505,7 @@
         <mixer name="Ref Input Volume" value0="76" value1="76" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -547,7 +547,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -585,7 +585,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -752,7 +752,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -790,7 +790,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -952,7 +952,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -990,7 +990,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1028,7 +1028,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1071,7 +1071,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1108,7 +1108,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1139,7 +1139,7 @@
         <parameter name="VoiceCall" file="aec_config.dat" />
         <parameter name="VoiceCall" file="aec_fdsp_bypass_nb.dat" />
         <parameter name="VoiceCall" file="aec_hp_dac0.dat" />
-        <parameter name="VoiceCall" file="aec_sidetone.dat" />
+        <parameter name="VoiceCall" file="aec_sidetone.dat" /> 
         <parameter name="VoiceCall" file="aec_sidetone_vol_nb.dat" />
         <parameter name="VoiceCall" file="aec_adc.dat" />
         <mixer name="Voice Rate" value0="10" />
@@ -1155,7 +1155,7 @@
         <parameter name="VoiceCall" file="aec_config.dat" />
         <parameter name="VoiceCall" file="aec_fdsp_bypass_wb.dat" />
         <parameter name="VoiceCall" file="aec_hp_dac0.dat" />
-        <parameter name="VoiceCall" file="aec_sidetone.dat" />
+        <parameter name="VoiceCall" file="aec_sidetone.dat" /> 
         <parameter name="VoiceCall" file="aec_sidetone_vol_wb.dat" />
         <parameter name="VoiceCall" file="aec_adc.dat" />
         <mixer name="Voice Rate" value0="6" />
@@ -1196,7 +1196,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1233,7 +1233,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1270,7 +1270,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1312,7 +1312,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1351,7 +1351,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1385,7 +1385,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1416,7 +1416,7 @@
         <parameter name="VoiceCall (1MIC)" file="aec_config.dat" />
         <parameter name="VoiceCall (1MIC)" file="aec_fdsp_bypass_nb.dat" />
         <parameter name="VoiceCall (1MIC)" file="aec_hp_dac0.dat" />
-        <parameter name="VoiceCall (1MIC)" file="aec_sidetone.dat" />
+        <parameter name="VoiceCall (1MIC)" file="aec_sidetone.dat" /> 
         <parameter name="VoiceCall (1MIC)" file="aec_sidetone_vol_nb.dat" />
         <parameter name="VoiceCall (1MIC)" file="aec_adc.dat" />
         <mixer name="Voice Rate" value0="10" />
@@ -1432,7 +1432,7 @@
         <parameter name="VoiceCall (1MIC)" file="aec_config.dat" />
         <parameter name="VoiceCall (1MIC)" file="aec_fdsp_bypass_wb.dat" />
         <parameter name="VoiceCall (1MIC)" file="aec_hp_dac0.dat" />
-        <parameter name="VoiceCall (1MIC)" file="aec_sidetone.dat" />
+        <parameter name="VoiceCall (1MIC)" file="aec_sidetone.dat" /> 
         <parameter name="VoiceCall (1MIC)" file="aec_sidetone_vol_wb.dat" />
         <parameter name="VoiceCall (1MIC)" file="aec_adc.dat" />
         <mixer name="Voice Rate" value0="6" />
@@ -1470,7 +1470,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1504,7 +1504,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1538,7 +1538,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1577,7 +1577,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1610,7 +1610,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -1631,7 +1631,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -1717,7 +1717,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -1738,7 +1738,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -1759,7 +1759,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -1794,7 +1794,7 @@
         <mixer name="Ref Input Volume" value0="96" value1="96" />
         <mixer name="Ref Input Switch" value0="1" value1="1" />
         <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Input Volume" value0="96" value1="96" />
         <mixer name="Ext Input Switch" value0="1" value1="1" />
@@ -1843,61 +1843,6 @@
         <mixer name="Voice Physical Port" value0="2" />
         <parameter name="VoiceCall" file="aec_control_path_resume.dat" />
     </group>
-    <group name="ACPU_Incall">
-        <!-- transmit -->
-        <mixer name="Voice Output Volume" value0="96" value1="96" />
-        <mixer name="Voice Output Switch" value0="1" value1="1" />
-        <mixer name="Ext Input Volume" value0="96" value1="96" />
-        <mixer name="Ext Input Switch" value0="1" value1="1" />
-        <!-- Lch: transmit, Rch: receive(for incall recording) -->
-        <mixer name="Ref Input Volume" value0="96" value1="96" />
-        <mixer name="Ref Input Switch" value0="1" value1="1" />
-        <!-- receive -->
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
-        <mixer name="Voice Input Switch" value0="1" value1="1" />
-        <mixer name="Ext Output Volume" value0="96" value1="96" />
-        <mixer name="Ext Output Switch" value0="1" value1="1" />
-        <mixer name="Voice In Swap" value0="2" />
-        <mixer name="Ext In Swap" value0="2" />
-        <mixer name="Ext Out Swap" value0="2" />
-        <!-- AEC reference -->
-        <mixer name="Ref Output Volume" value0="96" value1="96" />
-        <mixer name="Ref Output Switch" value0="1" value1="1" />
-    </group>
-    <group name="ACPU_Incall_NB">
-        <mixer name="Clear Dsp Parameter" value0="ON" />
-        <parameter name="VoiceCall" file="aec_control_path_off.dat" />
-        <parameter name="VoiceCall" file="aec_ae1_through.dat" />
-        <parameter name="VoiceCall" file="aec_config.dat" />
-        <parameter name="VoiceCall" file="aec_fdsp_bypass_nb_bt.dat" />
-        <mixer name="Ext MasterSlave" value0="1" />
-        <mixer name="Ext Rate" value0="0" />
-        <mixer name="Ext Bitclock Rate" value0="2" />
-        <mixer name="Ext Interface" value0="0" />
-        <mixer name="Ext Input DA Format" value0="1" />
-        <mixer name="Ext Output DA Format" value0="1" />
-        <mixer name="Voice Rate" value0="10" />
-        <mixer name="Ext Physical Port" value0="0" />
-        <mixer name="Voice Physical Port" value0="1" />
-        <parameter name="VoiceCall" file="aec_control_path_resume.dat" />
-    </group>
-    <group name="ACPU_Incall_WB">
-        <mixer name="Clear Dsp Parameter" value0="ON" />
-        <parameter name="VoiceCall" file="aec_control_path_off.dat" />
-        <parameter name="VoiceCall" file="aec_ae1_through.dat" />
-        <parameter name="VoiceCall" file="aec_config.dat" />
-        <parameter name="VoiceCall" file="aec_fdsp_bypass_wb_bt.dat" />
-        <mixer name="Ext MasterSlave" value0="1" />
-        <mixer name="Ext Rate" value0="0" />
-        <mixer name="Ext Bitclock Rate" value0="2" />
-        <mixer name="Ext Interface" value0="0" />
-        <mixer name="Ext Input DA Format" value0="1" />
-        <mixer name="Ext Output DA Format" value0="1" />
-        <mixer name="Voice Rate" value0="6" />
-        <mixer name="Ext Physical Port" value0="0" />
-        <mixer name="Voice Physical Port" value0="1" />
-        <parameter name="VoiceCall" file="aec_control_path_resume.dat" />
-    </group>
 <!-- Group for Incommunication -->
     <group name="Earpiece_Incommunication">
         <!-- transmit -->
@@ -1917,7 +1862,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="98" value1="98" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
@@ -1992,7 +1937,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
@@ -2023,7 +1968,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
@@ -2054,7 +1999,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac1 Output Volume" value0="96" value1="96" />
         <mixer name="Dac1 Output Switch" value0="1" value1="1" />
@@ -2130,7 +2075,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac1 Output Volume" value0="96" value1="96" />
         <mixer name="Dac1 Output Switch" value0="1" value1="1" />
@@ -2162,7 +2107,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac1 Output Volume" value0="96" value1="96" />
         <mixer name="Dac1 Output Switch" value0="1" value1="1" />
@@ -2202,7 +2147,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
@@ -2241,7 +2186,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
@@ -2280,7 +2225,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
@@ -2316,7 +2261,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="86" value1="86" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
@@ -2352,7 +2297,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
@@ -2388,7 +2333,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
@@ -2423,7 +2368,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -2454,7 +2399,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -2485,7 +2430,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -2516,7 +2461,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -2547,7 +2492,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -2578,7 +2523,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Ext Output Volume" value0="96" value1="96" />
         <mixer name="Ext Output Switch" value0="1" value1="1" />
@@ -2613,7 +2558,7 @@
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="2" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
@@ -3039,18 +2984,6 @@
         <group name="Bluetooth_Incall_BT16_WB_Type3" />
         <mixer name="Audio Mode Playback" value0="incall2" />
     </scenario>
-    <scenario name="AndroidPlayback_ACPU_Incall_NB">
-        <mixer name="Output Path" value0="BT" />
-        <group name="ACPU_Incall" />
-        <group name="ACPU_Incall_NB" />
-        <mixer name="Audio Mode Playback" value0="incall2" />
-    </scenario>
-    <scenario name="AndroidPlayback_ACPU_Incall_WB">
-        <mixer name="Output Path" value0="BT" />
-        <group name="ACPU_Incall" />
-        <group name="ACPU_Incall_WB" />
-        <mixer name="Audio Mode Playback" value0="incall2" />
-    </scenario>
 <!-- Audio+Incall_NB (Earpiece) -->
     <scenario name="AndroidPlayback_Audio_Earpiece_Incall_NB_Type0">
         <mixer name="Output Path" value0="RC" />
@@ -3493,19 +3426,6 @@
         <group name="Bluetooth_Incall_BT16_WB_Type3" />
         <mixer name="Audio Mode Playback" value0="audio+incall2" />
     </scenario>
-<!-- Audio+Incall_ACPU -->
-    <scenario name="AndroidPlayback_Audio_ACPU_Incall_NB">
-        <mixer name="Output Path" value0="BT" />
-        <group name="ACPU_Incall" />
-        <group name="ACPU_Incall_NB" />
-        <mixer name="Audio Mode Playback" value0="incall2" />
-    </scenario>
-    <scenario name="AndroidPlayback_Audio_ACPU_Incall_WB">
-        <mixer name="Output Path" value0="BT" />
-        <group name="ACPU_Incall" />
-        <group name="ACPU_Incall_WB" />
-        <mixer name="Audio Mode Playback" value0="incall2" />
-    </scenario>
 <!-- Audio(Playback) -->
     <scenario name="AndroidPlayback_Audio_Earpiece_Normal">
         <mixer name="Output Path" value0="RC" />
@@ -3646,7 +3566,7 @@
         <mixer name="Dpath Da Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
-        <mixer name="Headphone Volume" value0="85" value1="85" />
+        <mixer name="Headphone Volume" value0="127" value1="127" />
         <mixer name="Headphone Switch" value0="1" value1="1" />
         <mixer name="Dac0 Swap" value0="0" />
         <mixer name="Audio Mode Playback" value0="audio" />
@@ -3700,7 +3620,7 @@
         <mixer name="Dpath Da Switch" value0="1" value1="1" />
         <mixer name="Dac0 Output Volume" value0="96" value1="96" />
         <mixer name="Dac0 Output Switch" value0="1" value1="1" />
-        <mixer name="Headphone Volume" value0="85" value1="85" />
+        <mixer name="Headphone Volume" value0="127" value1="127" />
         <mixer name="Headphone Switch" value0="1" value1="1" />
         <mixer name="Dac0 Swap" value0="0" />
         <mixer name="Audio Mode Playback" value0="audio" />
@@ -3883,7 +3803,7 @@
         <parameter name="DSP (Output)" file="aec_ae0_through.dat" />
         <parameter name="DSP (Output)" file="aec_hp_dac0.dat" />
         <parameter name="DSP (Output)" file="aec_sp_dac1.dat" />
-        <parameter name="DSP (Output)" file="aec_lrmix_dac1.dat" />
+        <parameter name="DSP (Output)" file="aec_lrmix.dat" />
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="0" />
@@ -3984,7 +3904,7 @@
         <parameter name="DSP (Output)" file="aec_ae0_through.dat" />
         <parameter name="DSP (Output)" file="aec_line1_dac0.dat" />
         <parameter name="DSP (Output)" file="aec_sp_dac1.dat" />
-        <parameter name="DSP (Output)" file="aec_lrmix_dac1.dat" />
+        <parameter name="DSP (Output)" file="aec_lrmix.dat" />
         <mixer name="Music Input Volume" value0="96" value1="96" />
         <mixer name="Music Input Switch" value0="1" value1="1" />
         <mixer name="Music In0 Swap" value0="0" />
@@ -4022,10 +3942,6 @@
         <mixer name="Voice Out Swap" value0="2" />
         <mixer name="Audio Mode Capture" value0="incall" />
     </scenario>
-    <scenario name="AndroidCapture_ACPU_Incall">
-        <mixer name="Voice Out Swap" value0="2" />
-        <mixer name="Audio Mode Capture" value0="incall" />
-    </scenario>
 <!-- Audio(Record) + Incall(Talker) -->
     <scenario name="AndroidCapture_VoiceRec_IncallMic_Incall">
         <mixer name="Music Output Volume" value0="96" value1="96" />
@@ -4276,34 +4192,6 @@
         <mixer name="Input Path" value0="Bluetooth" />
         <mixer name="Audio Mode Capture" value0="audio+incall" />
     </scenario>
-    <scenario name="AndroidCapture_VoiceRec_ACPU_Incall">
-        <mixer name="Voice Out Swap" value0="2" />
-        <mixer name="Audio Mode Capture" value0="incall" />
-    </scenario>
-    <scenario name="AndroidCapture_VoiceUplink_ACPU_Incall">
-        <mixer name="Voice Out Swap" value0="2" />
-        <mixer name="Audio Mode Capture" value0="incall" />
-    </scenario>
-    <scenario name="AndroidCapture_VoiceDownlink_ACPU_Incall">
-        <mixer name="Voice Out Swap" value0="2" />
-        <mixer name="Audio Mode Capture" value0="incall" />
-    </scenario>
-    <scenario name="AndroidCapture_VoiceCall_ACPU_Incall">
-        <mixer name="Voice Out Swap" value0="2" />
-        <mixer name="Audio Mode Capture" value0="incall" />
-    </scenario>
-    <scenario name="AndroidCapture_CamCorder_ACPU_Incall">
-        <mixer name="Voice Out Swap" value0="2" />
-        <mixer name="Audio Mode Capture" value0="incall" />
-    </scenario>
-    <scenario name="AndroidCapture_VoiceSearch_ACPU_Incall">
-        <mixer name="Voice Out Swap" value0="2" />
-        <mixer name="Audio Mode Capture" value0="incall" />
-    </scenario>
-    <scenario name="AndroidCapture_VoiceCommunication_ACPU_Incall">
-        <mixer name="Voice Out Swap" value0="2" />
-        <mixer name="Audio Mode Capture" value0="incall" />
-    </scenario>
 <!-- Audio(Record) -->
     <scenario name="AndroidCapture_VoiceRec_MainMic_Normal">
         <mixer name="Clear Dsp Parameter" value0="ON" />
@@ -4313,7 +4201,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4343,7 +4231,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4367,7 +4255,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4410,7 +4298,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4448,7 +4336,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4519,7 +4407,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4553,7 +4441,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4583,7 +4471,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4619,7 +4507,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4657,7 +4545,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4685,7 +4573,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4716,7 +4604,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4744,7 +4632,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4774,7 +4662,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4804,7 +4692,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4897,7 +4785,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4927,7 +4815,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -4958,7 +4846,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -5012,7 +4900,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -5039,7 +4927,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -5069,7 +4957,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -5096,7 +4984,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -5186,7 +5074,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -5213,7 +5101,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
@@ -5285,7 +5173,7 @@
         <mixer name="Music Output Switch" value0="1" value1="1" />
         <mixer name="Dpath Ad Volume" value0="96" value1="96" />
         <mixer name="Dpath Ad Switch" value0="1" value1="1" />
-        <mixer name="Voice Input Volume" value0="96" value1="96" />
+<mixer name="Voice Input Volume" value0="96" value1="96" />
         <mixer name="Voice Input Switch" value0="1" value1="1" />
         <mixer name="Voice Output Volume" value0="96" value1="96" />
         <mixer name="Voice Output Switch" value0="1" value1="1" />
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 465fe2f..0c38efb 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -20,11 +20,16 @@ lib/libmysound.so
 lib/libaudiosa.so
 lib/lib_SA_GoogleFX_ver124b.so
 lib/soundfx/libaudiosa_sec.so
+#lib/soundfx/libbundlewrapper.so
 lib/lib_SoundAlive_play_ver125e.so
 vendor/lib/liblvverx_3.20.03.so
 vendor/lib/liblvvetx_3.20.03.so
 # csc/sales_code.dat
 usr/share/alsa/alsa.conf
+#safar
+#lib/libsetproperty.so
+
+
 
 vendor/firmware/srp_cga.bin
 vendor/firmware/srp_data.bin
@@ -50,6 +55,9 @@ lib/liboemcrypto.so
 lib/hw/camera.universal5420.so:lib/hw/camera.vendor.universal5420.so
 lib/libexynoscamera.so
 lib/libvdis.so
+# Camera Other 
+lib/libliveframework.so
+lib/libarcsoft_nighthawk.so
 
 # Widevine (DRM)
 bin/drmserver:bin/drmserver.samsung
@@ -62,7 +70,13 @@ vendor/lib/libWVStreamControlAPI_L1.so
 lib/drm/libdrmwvmplugin.so
 vendor/lib/libwvm.so
 vendor/lib/mediadrm/libwvdrmengine.so
+
 lib/libExynosOMX_Core.so
+lib/libcsc.so
+lib/libexynosgscaler.so
+lib/libexynosscaler.so
+lib/libexynosutils.so
+
 lib/omx/libOMX.Exynos.AVC.Decoder.so
 lib/omx/libOMX.Exynos.AVC.Encoder.so
 lib/omx/libOMX.Exynos.MPEG4.Decoder.so
@@ -80,6 +94,29 @@ bin/gpsd
 lib/hw/gps.default.so
 lib/libwrappergps.so
 
+# LPM
+bin/lpm
+lib/libQmageDecoder.so
+media/battery_cover.spi
+media/battery_error.spi
+media/battery_low.spi
+media/battery_temperature_error.spi
+media/battery_temperature_limit.spi
+media/bootsamsung.qmg
+media/bootsamsungloop.qmg
+media/bootsamsungmini.qmg
+media/bootsamsungminiloop.qmg
+media/dock_error.spi
+media/incompatible_charger.spi
+media/particle_intro.spi
+media/particle_loop.spi
+media/percentage.spi
+media/shutdown.qmg
+media/shutdown.qmg.cover
+media/wave_loop.spi
+media/wireless_left.spi
+media/wireless_right.spi
+
 # Media
 vendor/firmware/fimc_is_fw2_3L2.bin
 vendor/firmware/fimc_is_fw2.bin
@@ -155,4 +192,4 @@ etc/wifi/nvram_net.txt_wisol
 
 # Input (not exist anymore)
 # usr/idc/sec_e-pen.idc
-# usr/idc/sec_touchscreen.idc
+# usr/idc/sec_touchscreen.idc
\ No newline at end of file