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

Commit e1bfbd68 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "MediaFormat: Update constants for MPEG-H codecs" am: ca57ecee am:... 

Merge "MediaFormat: Update constants for MPEG-H codecs" am: ca57ecee am: 3d46fe52 am: f286036a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1680925

Change-Id: I68b1d8518691cb7858a29de7675384d3792e1b1a
parents e838a48f f286036a

core/api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -22487,6 +22487,9 @@ package android.media { 
    field public static final String KEY_MAX_PTS_GAP_TO_ENCODER = "max-pts-gap-to-encoder";

    field public static final String KEY_MAX_WIDTH = "max-width";

    field public static final String KEY_MIME = "mime";

    field public static final String KEY_MPEGH_COMPATIBLE_SETS = "mpegh-compatible-sets";

    field public static final String KEY_MPEGH_PROFILE_LEVEL_INDICATION = "mpegh-profile-level-indication";

    field public static final String KEY_MPEGH_REFERENCE_CHANNEL_LAYOUT = "mpegh-reference-channel-layout";

    field public static final String KEY_OPERATING_RATE = "operating-rate";

    field public static final String KEY_OUTPUT_REORDER_DEPTH = "output-reorder-depth";

    field public static final String KEY_PCM_ENCODING = "pcm-encoding";

media/java/android/media/MediaFormat.java

+33 −0
Original line number Diff line number Diff line
@@ -109,6 +109,15 @@ import java.util.stream.Collectors; 
 * <tr><td>{@link #KEY_ENCODER_DELAY}</td><td>Integer</td><td>optional, the number of frames to trim from the start of the decoded audio stream.</td></tr>

 * <tr><td>{@link #KEY_ENCODER_PADDING}</td><td>Integer</td><td>optional, the number of frames to trim from the end of the decoded audio stream.</td></tr>

 * <tr><td>{@link #KEY_FLAC_COMPRESSION_LEVEL}</td><td>Integer</td><td><b>encoder-only</b>, optional, if content is FLAC audio, specifies the desired compression level.</td></tr>

 * <tr><td>{@link #KEY_MPEGH_PROFILE_LEVEL_INDICATION}</td><td>Integer</td>

 *     <td><b>decoder-only</b>, optional, if content is MPEG-H audio,

 *         specifies the profile and level of the stream.</td></tr>

 * <tr><td>{@link #KEY_MPEGH_COMPATIBLE_SETS}</td><td>ByteBuffer</td>

 *     <td><b>decoder-only</b>, optional, if content is MPEG-H audio,

 *         specifies the compatible sets (profile and level) of the stream.</td></tr>

 * <tr><td>{@link #KEY_MPEGH_REFERENCE_CHANNEL_LAYOUT}</td>

 *     <td>Integer</td><td><b>decoder-only</b>, optional, if content is MPEG-H audio,

 *         specifies the preferred reference channel layout of the stream.</td></tr>

 * </table>

 *

 * Subtitle formats have the following keys:
@@ -866,6 +875,30 @@ public final class MediaFormat { 
     */

    public static final String KEY_FLAC_COMPRESSION_LEVEL = "flac-compression-level";



    /**

     * A key describing the MPEG-H stream profile-level indication.

     *

     * See ISO_IEC_23008-3;2019 MHADecoderConfigurationRecord mpegh3daProfileLevelIndication.

     */

    public static final String KEY_MPEGH_PROFILE_LEVEL_INDICATION =

            "mpegh-profile-level-indication";



    /**

     * A key describing the MPEG-H stream compatible sets.

     *

     * See FDAmd_2 of ISO_IEC_23008-3;2019 MHAProfileAndLevelCompatibilitySetBox.

     */

    public static final String KEY_MPEGH_COMPATIBLE_SETS = "mpegh-compatible-sets";



    /**

     * A key describing the MPEG-H stream reference channel layout.

     *

     * See ISO_IEC_23008-3;2019 MHADecoderConfigurationRecord referenceChannelLayout

     * and ISO_IEC_23001‐8 ChannelConfiguration value.

     */

    public static final String KEY_MPEGH_REFERENCE_CHANNEL_LAYOUT =

            "mpegh-reference-channel-layout";



    /**

     * A key describing the encoding complexity.

     * The associated value is an integer.  These values are device and codec specific,