Android-x86
Fork
Donation

  • R/O
  • HTTP
  • SSH
  • HTTPS

hardware-libaudio: Commit

hardware/libaudio


Commit MetaInfo

Revisión01114219537e61b01d7526aa1a9654f5b7e5a812 (tree)
Tiempo2019-11-20 02:34:15
AutorMichael Goffioul <michael.goffioul@linc...>
Commiterserver158

Log Message

Use XML files for audio configuration.

v2: move XML files to vendor (cwhuang)

Cambiar Resumen

Diferencia incremental

--- a/alsa.mk
+++ b/alsa.mk
@@ -43,7 +43,12 @@ copy_init := \
4343 PRODUCT_COPY_FILES := \
4444 $(foreach f,$(copy_conf),$(LOCAL_ALSA_CONF_DIR)/$(f):$(TARGET_ALSA_CONF_DIR)/$(f)) \
4545 $(foreach f,$(copy_init),$(LOCAL_ALSA_INIT_DIR)/$(f):$(TARGET_ALSA_CONF_DIR)/init/$(f)) \
46- $(if $(wildcard $(PRODUCT_DIR)audio_policy.conf),$(PRODUCT_DIR),$(LOCAL_PATH)/)audio_policy.conf:system/etc/audio_policy.conf \
46+ $(LOCAL_PATH)/primary_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/primary_audio_policy_configuration.xml \
47+ frameworks/av/services/audiopolicy/config/audio_policy_configuration_generic.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
48+ frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
49+ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
50+ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
51+ frameworks/av/services/audiopolicy/config/surround_sound_configuration_5_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/surround_sound_configuration_5_0.xml
4752
4853 PRODUCT_PACKAGES := \
4954 alsa_amixer \
--- /dev/null
+++ b/primary_audio_policy_configuration.xml
@@ -0,0 +1,33 @@
1+<?xml version="1.0" encoding="UTF-8"?>
2+<!-- Default Primary Audio HAL Module Audio Policy Configuration include file -->
3+<module name="primary" halVersion="2.0">
4+ <attachedDevices>
5+ <item>Speaker</item>
6+ <item>Built-In Mic</item>
7+ </attachedDevices>
8+ <defaultOutputDevice>Speaker</defaultOutputDevice>
9+ <mixPorts>
10+ <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
11+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
12+ samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
13+ </mixPort>
14+ <mixPort name="primary input" role="sink">
15+ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
16+ samplingRates="8000,11025,16000,22050,24000,32000,44100,48000"
17+ channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
18+ </mixPort>
19+ </mixPorts>
20+ <devicePorts>
21+ <devicePort tagName="Speaker" type="AUDIO_DEVICE_OUT_SPEAKER" role="sink">
22+ </devicePort>
23+
24+ <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
25+ </devicePort>
26+ </devicePorts>
27+ <routes>
28+ <route type="mix" sink="Speaker"
29+ sources="primary output"/>
30+ <route type="mix" sink="primary input"
31+ sources="Built-In Mic"/>
32+ </routes>
33+</module>
Show on old repository browser