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

Commit deaa8d94 authored by Phil Burk's avatar Phil Burk
Browse files

Settings: add ENCODED_SURROUND_OUTPUT 



Support AUTO, ALWAYS or NEVER preference for using AC3 and DTS.

Bug: 24541671
Change-Id: I423969882d18d99ce93bea57d10bdb1da7063b7a
Signed-off-by: default avatarPhil Burk <philburk@google.com>
parent f5725e65

core/java/android/provider/Settings.java

+47 −0
Original line number Diff line number Diff line
@@ -7865,6 +7865,52 @@ public final class Settings { 
         */

        public static final String DOCK_AUDIO_MEDIA_ENABLED = "dock_audio_media_enabled";



        /**

         * The surround sound formats AC3, DTS or IEC61937 are

         * available for use if they are detected.

         * This is the default mode.

         *

         * Note that AUTO is equivalent to ALWAYS for Android TVs and other

         * devices that have an S/PDIF output. This is because S/PDIF

         * is unidirectional and the TV cannot know if a decoder is

         * connected. So it assumes they are always available.

         * @hide

         */

         public static final int ENCODED_SURROUND_OUTPUT_AUTO = 0;



        /**

         * AC3, DTS or IEC61937 are NEVER available, even if they

         * are detected by the hardware. Those formats will not be

         * reported.

         *

         * An example use case would be an AVR reports that it is capable of

         * surround sound decoding but is broken. If NEVER is chosen

         * then apps must use PCM output instead of encoded output.

         * @hide

         */

         public static final int ENCODED_SURROUND_OUTPUT_NEVER = 1;



        /**

         * AC3, DTS or IEC61937 are ALWAYS available, even if they

         * are not detected by the hardware. Those formats will be

         * reported as part of the HDMI output capability. Applications

         * are then free to use either PCM or encoded output.

         *

         * An example use case would be a when TV was connected over

         * TOS-link to an AVR. But the TV could not see it because TOS-link

         * is unidirectional.

         * @hide

         */

         public static final int ENCODED_SURROUND_OUTPUT_ALWAYS = 2;



        /**

         * Set to ENCODED_SURROUND_OUTPUT_AUTO,

         * ENCODED_SURROUND_OUTPUT_NEVER or

         * ENCODED_SURROUND_OUTPUT_ALWAYS

         * @hide

         */

        public static final String ENCODED_SURROUND_OUTPUT = "encoded_surround_output";



        /**

         * Persisted safe headphone volume management state by AudioService

         * @hide
@@ -8172,6 +8218,7 @@ public final class Settings { 
            EMERGENCY_TONE,

            CALL_AUTO_RETRY,

            DOCK_AUDIO_MEDIA_ENABLED,

            ENCODED_SURROUND_OUTPUT,

            LOW_POWER_MODE_TRIGGER_LEVEL

        };