Merge remote-tracking branch 'aokp/kitkat' into sm-4.4

AOKPK · Aug 14, 2014 · 185a114 · 185a114
2 parents df74188 + 80f8207
commit 185a114
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 9 deletions.
diff --git a/audio_effects.conf b/audio_effects.conf
@@ -9,12 +9,18 @@ libraries {
   bundle {
     path /system/lib/soundfx/libbundlewrapper.so
   }
+  cm {
+    path /system/lib/soundfx/libcyanogen-dsp.so
+  }
   reverb {
     path /system/lib/soundfx/libreverbwrapper.so
   }
   visualizer {
     path /system/lib/soundfx/libvisualizer.so
   }
+  pre_processing {
+    path /system/lib/soundfx/libaudiopreprocessing.so
+  }
   qcom_pre_processing {
     path /system/lib/soundfx/libqcomvoiceprocessing.so
   }
@@ -42,17 +48,21 @@ libraries {
 #    }
 
 effects {
+  compression {
+    library cm
+    uuid f27317f4-c984-4de6-9a90-545759495bf2
+  }
   bassboost {
-    library bundle
-    uuid 8631f300-72e2-11df-b57e-0002a5d5c51b
+    library cm
+    uuid 42b5cbf5-4dd8-4e79-a5fb-cceb2cb54e13
   }
   virtualizer {
-    library bundle
-    uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b
+    library cm
+    uuid 7c6cc5f8-6f34-4449-a282-bed84f1a5b5a
   }
   equalizer {
-    library bundle
-    uuid ce772f20-847d-11df-bb17-0002a5d5c51b
+    library cm
+    uuid 58bc9000-0d7f-462e-90d2-035eddd8b434
   }
   volume {
     library bundle
@@ -82,6 +92,10 @@ effects {
     library downmix
     uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
   }
+  agc {
+    library pre_processing
+    uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b
+  }
   aec {
     library qcom_pre_processing
     uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109
@@ -90,6 +104,10 @@ effects {
     library loudness_enhancer
     uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
   }
+  ns {
+    library pre_processing
+    uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b
+  }
 }
 # Audio preprocessor configurations.
 # The pre processor configuration consists in a list of elements each describing
@@ -126,3 +144,13 @@ effects {
 #        }
 #        ...
 #    }
+
+#
+# TODO: add default audio pre processor configurations after debug and tuning phase
+#
+
+pre_processing {
+  voice_communication {
+    aec {}
+  }
+}
diff --git a/media_codecs.xml b/media_codecs.xml
@@ -78,11 +78,8 @@
 
         <!--  ffmpeg video codecs  -->
         <MediaCodec name="OMX.ffmpeg.mpeg2v.decoder" type="video/mpeg2"/>
-        <MediaCodec name="OMX.ffmpeg.h263.decoder" type="video/3gpp"/>
-        <MediaCodec name="OMX.ffmpeg.mpeg4.decoder" type="video/mp4v-es"/>
         <MediaCodec name="OMX.ffmpeg.wmv.decoder" type="video/x-ms-wmv"/>
         <MediaCodec name="OMX.ffmpeg.rv.decoder" type="video/vnd.rn-realvideo"/>
-        <MediaCodec name="OMX.ffmpeg.h264.decoder" type="video/avc"/>
         <MediaCodec name="OMX.ffmpeg.vc1.decoder" type="video/vc1"/>
         <MediaCodec name="OMX.ffmpeg.flv1.decoder" type="video/x-flv"/>
         <MediaCodec name="OMX.ffmpeg.divx.decoder" type="video/divx"/>