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

Commit c30a9096 authored by Dorin Drimus's avatar Dorin Drimus Committed by Automerger Merge Worker
Browse files

Merge "Separate DTS-MA and DTS-UHD P2 to independent configs" am: a222e65f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2317040



Change-Id: Ic3205c68dc79f5bebb1d55a45663cd2a4f2ca558
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 22257733 a222e65f

services/audiopolicy/common/managerdefinitions/include/AudioPolicyConfig.h

+4 −2
Original line number Diff line number Diff line
@@ -193,8 +193,10 @@ public: 
            {AUDIO_FORMAT_AC3, {}},

            {AUDIO_FORMAT_E_AC3, {}},

            {AUDIO_FORMAT_DTS, {}},

            {AUDIO_FORMAT_DTS_HD, {AUDIO_FORMAT_DTS_HD_MA}},

            {AUDIO_FORMAT_DTS_UHD, {AUDIO_FORMAT_DTS_UHD_P2}},

            {AUDIO_FORMAT_DTS_HD, {}},

            {AUDIO_FORMAT_DTS_HD_MA, {}},

            {AUDIO_FORMAT_DTS_UHD, {}},

            {AUDIO_FORMAT_DTS_UHD_P2, {}},

            {AUDIO_FORMAT_AAC_LC, {

                    AUDIO_FORMAT_AAC_HE_V1, AUDIO_FORMAT_AAC_HE_V2, AUDIO_FORMAT_AAC_ELD,

                    AUDIO_FORMAT_AAC_XHE}},

services/audiopolicy/config/surround_sound_configuration_aidl.xml

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

<!-- Copyright (C) 2018 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.

-->

<surroundSound>

  <!-- Each of the listed formats gets an entry in Surround Settings dialog on TV devices.

       There must be a corresponding Java ENCODING_... constant defined in AudioFormat.java,

       and a display name defined in AudioFormat.toDisplayName. For the formats that don't

       need a dedicated Surround Settings dialog entry, a subformats list has to be used. -->

  <formats>

    <format name="AUDIO_FORMAT_AC3" />

    <format name="AUDIO_FORMAT_E_AC3" />

    <format name="AUDIO_FORMAT_E_AC3_JOC" />

    <format name="AUDIO_FORMAT_DOLBY_TRUEHD" />

    <format name="AUDIO_FORMAT_DTS" />

    <format name="AUDIO_FORMAT_DTS_HD" />

    <format name="AUDIO_FORMAT_DTS_HD_MA" />

    <format name="AUDIO_FORMAT_DTS_UHD" />

    <format name="AUDIO_FORMAT_DTS_UHD_P2" />

    <format name="AUDIO_FORMAT_AAC_LC" subformats="AUDIO_FORMAT_AAC_HE_V1 AUDIO_FORMAT_AAC_HE_V2 AUDIO_FORMAT_AAC_ELD AUDIO_FORMAT_AAC_XHE" />

    <format name="AUDIO_FORMAT_AC4" />

  </formats>

</surroundSound>