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

Commit b466f2f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "HAL V7.0: Update example APM config files" am: 7aacb78d 

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

Change-Id: I35b82c12a6519ab404eb9068599afef81d46653d
parents e8133c15 7aacb78d

services/audiopolicy/config/audio_policy_configuration_7_0.xml

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="compressed_offload" role="source"

                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                         flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="AUDIO_FORMAT_MP3"

                             samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_MONO"/>

services/audiopolicy/config/msd_audio_policy_configuration_7_0.xml

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
                     samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

        <mixPort name="ms12 compressed input" role="source"

                flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                flags="AUDIO_OUTPUT_FLAG_DIRECT AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD AUDIO_OUTPUT_FLAG_NON_BLOCKING">

            <profile name="" format="AUDIO_FORMAT_AC3"

                     samplingRates="32000 44100 48000"

                     channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_5POINT1"/>
@@ -40,7 +40,7 @@ 
                     channelMasks="AUDIO_CHANNEL_OUT_MONO AUDIO_CHANNEL_OUT_STEREO AUDIO_CHANNEL_OUT_5POINT1 AUDIO_CHANNEL_OUT_7POINT1"/>

        </mixPort>

        <!-- The HW AV Sync flag is not required, but is recommended -->

        <mixPort name="ms12 output" role="sink" flags="AUDIO_INPUT_FLAG_HW_AV_SYNC|AUDIO_INPUT_FLAG_DIRECT">

        <mixPort name="ms12 output" role="sink" flags="AUDIO_INPUT_FLAG_HW_AV_SYNC AUDIO_INPUT_FLAG_DIRECT">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>

            <profile name="" format="AUDIO_FORMAT_AC3"