tank: move audio_effects and ds-default to device

configs/audio_effects.conf

@@ -0,0 +1,212 @@
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# List of effect libraries to load. Each library element must contain a "path" element
+# giving the full path of the library .so file.
+#    libraries {
+#        <lib name> {
+#          path <lib path>
+#        }
+#    }
+libraries {
+# This is a proxy library that will be an abstraction for
+# the HW and SW effects
+
+  #proxy {
+    #path /system/lib/soundfx/libeffectproxy.so
+  #}
+
+# This is the SW implementation library of the effect
+  #libSW {
+    #path /system/lib/soundfx/libswwrapper.so
+  #}
+
+# This is the HW implementation library for the effect
+  #libHW {
+    #path /system/lib/soundfx/libhwwrapper.so
+  #}
+
+  bundle {
+    path /system/lib/soundfx/libbundlewrapper.so
+  }
+  reverb {
+    path /system/lib/soundfx/libreverbwrapper.so
+  }
+  visualizer {
+    path /system/lib/soundfx/libvisualizer.so
+  }
+  downmix {
+    path /system/lib/soundfx/libdownmix.so
+  }
+  loudness_enhancer {
+    path /system/lib/soundfx/libldnhncr.so
+  }
+#DOLBY_DAP
+  dap {
+    path /system/vendor/lib/soundfx/libswdap.so
+  }
+#DOLBY_END
+}
+
+# Default pre-processing library. Add to audio_effect.conf "libraries" section if
+# audio HAL implements support for default software audio pre-processing effects
+#
+#  pre_processing {
+#    path /system/lib/soundfx/libaudiopreprocessing.so
+#  }
+
+# list of effects to load. Each effect element must contain a "library" and a "uuid" element.
+# The value of the "library" element must correspond to the name of one library element in the
+# "libraries" element.
+# The name of the effect element is indicative, only the value of the "uuid" element
+# designates the effect.
+# The uuid is the implementation specific UUID as specified by the effect vendor. This is not the
+# generic effect type UUID.
+#    effects {
+#        <fx name> {
+#            library <lib name>
+#            uuid <effect uuid>
+#        }
+#        ...
+#    }
+
+effects {
+
+# additions for the proxy implementation
+# Proxy implementation
+  #effectname {
+    #library proxy
+    #uuid  xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
+
+    # SW implemetation of the effect. Added as a node under the proxy to
+    # indicate this as a sub effect.
+      #libsw {
+         #library libSW
+         #uuid  yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy
+      #} End of SW effect
+
+    # HW implementation of the effect. Added as a node under the proxy to
+    # indicate this as a sub effect.
+      #libhw {
+         #library libHW
+         #uuid  zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz
+      #}End of HW effect
+  #} End of effect proxy
+
+  bassboost {
+    library bundle
+    uuid 8631f300-72e2-11df-b57e-0002a5d5c51b
+  }
+  virtualizer {
+    library bundle
+    uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b
+  }
+  equalizer {
+    library bundle
+    uuid ce772f20-847d-11df-bb17-0002a5d5c51b
+  }
+  volume {
+    library bundle
+    uuid 119341a0-8469-11df-81f9-0002a5d5c51b
+  }
+  reverb_env_aux {
+    library reverb
+    uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b
+  }
+  reverb_env_ins {
+    library reverb
+    uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b
+  }
+  reverb_pre_aux {
+    library reverb
+    uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b
+  }
+  reverb_pre_ins {
+    library reverb
+    uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b
+  }
+  visualizer {
+    library visualizer
+    uuid d069d9e0-8329-11df-9168-0002a5d5c51b
+  }
+  downmix {
+    library downmix
+    uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
+  }
+  loudness_enhancer {
+    library loudness_enhancer
+    uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
+  }
+#DOLBY_DAP
+  dap {
+    library dap
+    uuid 9d4921da-8225-4f29-aefa-39537a04bcaa
+  }
+#DOLBY_END
+}
+
+# Default pre-processing effects. Add to audio_effect.conf "effects" section if
+# audio HAL implements support for them.
+#
+#  agc {
+#    library pre_processing
+#    uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b
+#  }
+#  aec {
+#    library pre_processing
+#    uuid bb392ec0-8d4d-11e0-a896-0002a5d5c51b
+#  }
+#  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
+# pre processor settings for a given input source. Valid input source names are:
+# "mic", "camcorder", "voice_recognition", "voice_communication"
+# Each input source element contains a list of effects elements. The name of the effect
+# element must be the name of one of the effects in the "effects" list of the file.
+# Each effect element may optionally contain a list of parameters and their
+# default value to apply when the pre processor effect is created.
+# A parameter is defined by a "param" element and a "value" element. Each of these elements
+# consists in one or more elements specifying a type followed by a value.
+# The types defined are: "int", "short", "float", "bool" and "string"
+# When both "param" and "value" are a single int, a simple form is allowed where just
+# the param and value pair is present in the parameter description
+#    pre_processing {
+#        <input source name> {
+#            <fx name> {
+#                <param 1 name> {
+#                    param {
+#                        int|short|float|bool|string <value>
+#                        [ int|short|float|bool|string <value> ]
+#                        ...
+#                    }
+#                    value {
+#                        int|short|float|bool|string <value>
+#                        [ int|short|float|bool|string <value> ]
+#                        ...
+#                    }
+#                }
+#                <param 2 name > {<param> <value>}
+#                ...
+#            }
+#            ...
+#        }
+#        ...
+#    }
+
+#
+# TODO: add default audio pre processor configurations after debug and tuning phase
+#

configs/ds-default.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>
+<profiledata xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <format_version>4</format_version>
+  <tool_version>3</tool_version>
+  <preset id="ieq_open">
+    <data>iebt=[117, 133, 188, 176, 141, 149, 175, 185, 185, 200, 236, 242, 228, 213, 182, 132, 110, 68, -27, -240]</data>
+  </preset>
+  <preset id="ieq_rich">
+    <data>iebt=[67, 95, 172, 163, 168, 201, 189, 242, 196, 221, 192, 186, 168, 139, 102, 57, 35, 9, -55, -235]</data>
+  </preset>
+  <preset id="ieq_focused">
+    <data>iebt=[-419, -112, 75, 116, 113, 160, 165, 80, 61, 79, 98, 121, 64, 70, 44, -71, -33, -100, -238, -411]</data>
+  </preset>
+  <profile id="movie" name="Movie">
+    <data>aoon=[2] dea=[5] ded=[0] deon=[1] dhrg=[0] dhsb=[96] dssb=[96] dssf=[200] dvla=[7] dvle=[1] dvme=[0] gebg=[96, 80, 80, 45, 16, 0, 0, 0, 0, -16, -36, -45, -36, -16, 0, 12, 25, 45, 80, 112] geon=[1] iea=[10] ieon=[0] ngon=[2] plb=[0] plmd=[4] vdhe=[2] vmb=[144] vmon=[2] vspe=[2]</data>
+    <include preset="ieq_open" />
+  </profile>
+  <profile id="music" name="Music">
+    <data>aoon=[2] dea=[0] ded=[0] deon=[0] dhrg=[0] dhsb=[48] dssb=[0] dssf=[200] dvla=[4] dvle=[1] dvme=[0] gebg=[96, 80, 80, 45, 16, 0, 0, 0, 0, -16, -36, -45, -36, -16, 0, 12, 25, 45, 80, 112] geon=[1] iea=[10] ieon=[0] ngon=[2] plb=[0] plmd=[4] vdhe=[2] vmb=[144] vmon=[2] vspe=[2]</data>
+    <include preset="ieq_open" />
+  </profile>
+  <profile id="game" name="Game">
+    <data>aoon=[2] dea=[7] ded=[1] deon=[0] dhrg=[0] dhsb=[0] dssb=[0] dssf=[200] dvla=[0] dvle=[1] dvme=[0] gebg=[96, 80, 80, 45, 16, 0, 0, 0, 0, -16, -36, -45, -36, -16, 0, 12, 25, 45, 80, 112] geon=[1] iea=[10] ieon=[0] ngon=[2] plb=[0] plmd=[4] vdhe=[2] vmb=[144] vmon=[2] vspe=[2]</data>
+    <include preset="ieq_open" />
+  </profile>
+  <profile id="voice" name="Voice">
+    <data>aoon=[2] dea=[16] ded=[0] deon=[1] dhrg=[0] dhsb=[0] dssb=[0] dssf=[200] dvla=[7] dvle=[1] dvme=[0] gebg=[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] geon=[0] iea=[10] ieon=[0] ngon=[2] plb=[0] plmd=[4] vdhe=[0] vmb=[160] vmon=[1] vspe=[0]</data>
+    <include preset="ieq_rich" />
+  </profile>
+  <profile id="user1" name="Custom 1">
+    <data>aoon=[2] dea=[7] ded=[0] deon=[0] dhrg=[0] dhsb=[0] dssb=[0] dssf=[200] dvla=[0] dvle=[0] dvme=[0] gebg=[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] geon=[0] iea=[10] ieon=[0] ngon=[2] plb=[0] plmd=[4] vdhe=[0] vmb=[0] vmon=[0] vspe=[0]</data>
+    <include preset="ieq_rich" />
+  </profile>
+  <profile id="user2" name="Custom 2">
+    <data>aoon=[2] dea=[7] ded=[0] deon=[0] dhrg=[0] dhsb=[48] dssb=[48] dssf=[200] dvla=[5] dvle=[0] dvme=[0] gebg=[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] geon=[0] iea=[0] ieon=[0] ngon=[2] plb=[0] plmd=[4] vdhe=[0] vmb=[0] vmon=[2] vspe=[0]</data>
+    <include preset="ieq_rich" />
+  </profile>
+  <profile id="off" name="Off">
+    <data>aoon=[0] dea=[0] ded=[0] deon=[0] dhrg=[0] dhsb=[0] dssb=[0] dssf=[200] dvla=[0] dvle=[0] dvme=[0] gebg=[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] geon=[0] iea=[0] ieon=[0] ngon=[0] plb=[0] plmd=[1] vdhe=[0] vmb=[0] vmon=[0] vspe=[0]</data>
+    <include preset="ieq_open" />
+  </profile>
+  <!--NOTE: <tuning> with endpoint other than SPEAKER do not use the band gain, UNLESS aoon is set 1 (from 2) and plmd is set to 2 (not 4).-->
+  <tuning id="tune0" name="DEFAULT ENDPOINT" endpoint="SPEAKER" tuned_rate="48000">
+    <data>aobf=[46, 140, 234, 328, 468, 656, 843, 1031, 1312, 1687, 2250, 3000, 3750, 4687, 5812, 7125, 9000, 11250, 13875, 19687] aobg=[2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] arbf=[47, 141, 234, 328, 469, 656, 844, 1031, 1313, 1688, 2250, 3000, 3750, 4688, 5813, 7125, 9000, 11250, 13875, 19688] arbh=[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] arbl=[-192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192] arbi=[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] arod=[0] artp=[12] dssa=[10]</data>
+  </tuning>
+  <constant>
+    <data>aocc=[2] aonb=[20] arnb=[20] dvli=[-320] dvlo=[-320] dvmc=[0] gebf=[43, 129, 215, 301, 431, 603, 775, 947, 1206, 1550, 2067, 2756, 3618, 4651, 5685, 7063, 8958, 11025, 13781, 18777] genb=[20] iebf=[65, 136, 223, 332, 467, 634, 841, 1098, 1416, 1812, 2302, 2909, 3663, 4598, 5756, 7194, 8976, 11186, 13927, 17326] ienb=[20]</data>
+  </constant>
+  <authorized_technologies sku_name="Dolby Custom SKU" device="android" bundle="dapv1">
+    <audio_optimizer>true</audio_optimizer>
+    <audio_regulator>true</audio_regulator>
+    <volume_leveler>true</volume_leveler>
+    <volume_maximizer>true</volume_maximizer>
+    <graphic_equalizer>true</graphic_equalizer>
+    <intelligent_equalizer>true</intelligent_equalizer>
+    <dialog_enhancer>true</dialog_enhancer>
+    <surround_virtualizer_headphone>true</surround_virtualizer_headphone>
+    <surround_virtualizer_speaker>true</surround_virtualizer_speaker>
+  </authorized_technologies>
+</profiledata>

full_tank.mk

@@ -158,7 +158,8 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:system/etc/media_codecs_google_video_le.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
-    frameworks/av/media/libeffects/data/audio_effects.conf:system/etc/audio_effects.conf \
+    device/amazon/tank/configs/audio_effects.conf:vendor/etc/audio_effects.conf \
+    device/amazon/tank/configs/ds-default.xml:vendor/etc/dolby/ds-default.xml \
     device/amazon/tank/configs/audio_policy.conf:system/etc/audio_policy.conf \
     device/amazon/tank/configs/media_codecs.xml:system/etc/media_codecs.xml \
     device/amazon/tank/configs/media_profiles.xml:system/etc/media_profiles.xml \

proprietary-files.txt

@@ -218,8 +218,8 @@ vendor/data/ttp/skype-raider.rsa
 vendor/data/ttp/tecla-2013.rsa
 vendor/data/ttp/tecla-2014.rsa
 vendor/data/ttp/viber-voip.rsa
-vendor/etc/audio_effects.conf
-vendor/etc/dolby/ds-default.xml
+#vendor/etc/audio_effects.conf
+#vendor/etc/dolby/ds-default.xml
 vendor/firmware/BCM43569A2_001.003.004.0172.0000_Generic_UART_40MHz_fcbga_BU_AmazonTank.hcd
 vendor/firmware/brcm/bcm43569a2-firmware-test.bin
 vendor/firmware/brcm/bcm43569a2-firmware.bin