From a991d6bdc2572972c7aa2a72c603867e9f02b489 Mon Sep 17 00:00:00 2001 From: Jean-Michel Trivi Date: Tue, 26 Oct 2021 09:13:07 -0700 Subject: [PATCH] MediaFormat: fix key value for KEY_MAX_OUTPUT_CHANNEL_COUNT Fix type that used "_" instead of "-" Bug: 198197610 Test: TBA on new decoder Change-Id: Ief5ae1f708b27347bf5a700abfd51f9c53e2c888 --- core/api/current.txt | 2 +- media/java/android/media/MediaFormat.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/api/current.txt b/core/api/current.txt index e015169cf69ae..a658dd5fc8fac 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -22582,7 +22582,7 @@ package android.media { field public static final String KEY_MAX_FPS_TO_ENCODER = "max-fps-to-encoder"; field public static final String KEY_MAX_HEIGHT = "max-height"; field public static final String KEY_MAX_INPUT_SIZE = "max-input-size"; - field public static final String KEY_MAX_OUTPUT_CHANNEL_COUNT = "max-output-channel_count"; + field public static final String KEY_MAX_OUTPUT_CHANNEL_COUNT = "max-output-channel-count"; 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"; diff --git a/media/java/android/media/MediaFormat.java b/media/java/android/media/MediaFormat.java index 028ae2b3487c5..0847be34d90f0 100644 --- a/media/java/android/media/MediaFormat.java +++ b/media/java/android/media/MediaFormat.java @@ -693,7 +693,7 @@ public final class MediaFormat { *

This key is only used during decoding. */ public static final String KEY_MAX_OUTPUT_CHANNEL_COUNT = - "max-output-channel_count"; + "max-output-channel-count"; /** * A key describing the number of frames to trim from the start of the decoded audio stream.