Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87c117f9 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge "audiopolicy: Read supported encoded formats from config file"

parents d49da02d 0c1c7a23

services/audiopolicy/common/managerdefinitions/src/DeviceDescriptor.cpp

+6 −2
Original line number Diff line number Diff line
@@ -42,8 +42,12 @@ DeviceDescriptor::DeviceDescriptor(audio_devices_t type, const FormatVector &enc 
    if (type == AUDIO_DEVICE_IN_REMOTE_SUBMIX || type == AUDIO_DEVICE_OUT_REMOTE_SUBMIX ) {

        mAddress = String8("0");

    }

    /* FIXME: read from APM config file */

    if (type == AUDIO_DEVICE_OUT_HDMI) {

    /* If framework runs against a pre 5.0 Audio HAL, encoded formats are absent from the config.

     * FIXME: APM should know the version of the HAL and don't add the formats for V5.0.

     * For now, the workaround to remove AC3 and IEC61937 support on HDMI is to declare

     * something like 'encodedFormats="AUDIO_FORMAT_PCM_16_BIT"' on the HDMI devicePort.

     */

    if (type == AUDIO_DEVICE_OUT_HDMI && mEncodedFormats.isEmpty()) {

        mEncodedFormats.add(AUDIO_FORMAT_AC3);

        mEncodedFormats.add(AUDIO_FORMAT_IEC61937);

    }

services/audiopolicy/config/audio_policy_configuration_generic.xml

+6 −0
Original line number Diff line number Diff line
@@ -37,4 +37,10 @@ 


    <!-- End of Volume section -->



    <!-- Surround Sound configuration -->



    <xi:include href="surround_sound_configuration_5_0.xml"/>



    <!-- End of Surround Sound configuration -->



</audioPolicyConfiguration>

services/audiopolicy/config/audio_policy_configuration_generic_tv.xml

0 → 100644
+49 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (C) 2019 The Android Open Source Project



     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.

-->



<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">

    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->



    <!-- Global configuration Decalaration -->

    <globalConfiguration speaker_drc_enabled="false"/>



    <modules>

        <!-- Primary Audio HAL -->

        <xi:include href="primary_audio_policy_configuration_tv.xml"/>



        <!-- Usb Audio HAL -->

        <xi:include href="usb_audio_policy_configuration.xml"/>



        <!-- Remote Submix Audio HAL -->

        <xi:include href="r_submix_audio_policy_configuration.xml"/>



    </modules>

    <!-- End of Modules section -->



    <!-- Volume section -->



    <xi:include href="audio_policy_volumes.xml"/>

    <xi:include href="default_volume_tables.xml"/>



    <!-- End of Volume section -->



    <!-- Surround Sound configuration -->



    <xi:include href="surround_sound_configuration_5_0.xml"/>



    <!-- End of Surround Sound configuration -->



</audioPolicyConfiguration>

services/audiopolicy/config/audio_policy_configuration_stub.xml

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,9 @@ 
-->



<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">

    <!-- Global configuration Decalaration -->

    <globalConfiguration speaker_drc_enabled="false"/>



    <modules>

        <!-- Stub Audio HAL -->

        <xi:include href="stub_audio_policy_configuration.xml"/>
@@ -26,5 +29,6 @@ 


    <xi:include href="audio_policy_volumes.xml"/>

    <xi:include href="default_volume_tables.xml"/>

    <xi:include href="surround_sound_configuration_5_0.xml"/>



</audioPolicyConfiguration>

services/audiopolicy/config/primary_audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- Default Primary Audio HAL Module Audio Policy Configuration include flie -->

<!-- Default Primary Audio HAL Module Audio Policy Configuration include file -->

<module name="primary" halVersion="2.0">

    <attachedDevices>

        <item>Speaker</item>