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

Commit dbed4e52 authored by Amy's avatar Amy Committed by shubang
Browse files

Add classes to hold Short Audio Descriptor xml parsed data. 

ag/5641739

Test: manual
Bug: 80297701
Change-Id: If38b8c6d9e5fd4cf286dc9e8d57a111567159245
parent 2a5e2451

services/core/java/com/android/server/hdmi/Constants.java

+10 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.hdmi;



import android.annotation.IntDef;

import android.annotation.StringDef;

import android.hardware.hdmi.HdmiDeviceInfo;



import java.lang.annotation.Retention;
@@ -222,6 +223,15 @@ final class Constants { 
    static final int AUDIO_CODEC_WMAPRO = 0xE; // Support WMA-Pro

    static final int AUDIO_CODEC_MAX = 0xF;



    @StringDef({

        AUDIO_DEVICE_ARC_IN,

        AUDIO_DEVICE_SPDIF,

    })

    public @interface AudioDevice {}



    static final String AUDIO_DEVICE_ARC_IN = "ARC_IN";

    static final String AUDIO_DEVICE_SPDIF = "SPDIF";



    // Bit mask used to get the routing path of the top level device.

    // When &'d with the path 1.2.2.0 (0x1220), for instance, gives 1.0.0.0.

    static final int ROUTING_PATH_TOP_MASK = 0xF000;

services/core/java/com/android/server/hdmi/HdmiUtils.java

+29 −0
Original line number Diff line number Diff line
@@ -391,4 +391,33 @@ final class HdmiUtils { 
        }

        pw.decreaseIndent();

    }



    // Device configuration of its supported Codecs and their Short Audio Descriptors.

    public static class DeviceConfig {

        /** Name of the device. Should be {@link Constants.AudioDevice}. **/

        public final String name;

        /** List of a {@link CodecSad}. **/

        public final List<CodecSad> supportedCodecs;



        private DeviceConfig(String name, List<CodecSad> supportedCodecs) {

            this.name = name;

            this.supportedCodecs = supportedCodecs;

        }

    }



    // Short Audio Descriptor of a specific Codec

    public static class CodecSad {

        /** Audio Codec. Should be {@link Constants.AudioCodec}. **/

        public final int audioCodec;

        /**

         * Three-byte Short Audio Descriptor. See HDMI Specification 1.4b CEC 13.15.3 and

         * ANSI-CTA-861-F-FINAL 7.5.2 Audio Data Block for more details.

         */

        public final byte[] sad;



        public CodecSad(int audioCodec, byte[] sad) {

            this.audioCodec = audioCodec;

            this.sad = sad;

        }

    }

}