Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MediaFormat: fix key value for KEY_MAX_OUTPUT_CHANNEL_COUNT am: a991d6bdc2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16118478

Change-Id: I1ac97f50922e7c36e21be16cf033292aeb4943f8
This commit is contained in:
Jean-Michel Trivi
2021-10-26 18:34:24 +00:00
committed by Automerger Merge Worker
parent 92bf843da4 a991d6bdc2
commit 42bf4dc517
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -22600,7 +22600,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_FPS_TO_ENCODER = "max-fps-to-encoder";
field public static final String KEY_MAX_HEIGHT = "max-height"; 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_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_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_MAX_WIDTH = "max-width";
field public static final String KEY_MIME = "mime"; field public static final String KEY_MIME = "mime";

2
media/java/android/media/MediaFormat.java
View File

@@ -693,7 +693,7 @@ public final class MediaFormat {
* <p>This key is only used during decoding. * <p>This key is only used during decoding.
*/ */
public static final String KEY_MAX_OUTPUT_CHANNEL_COUNT = 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. * A key describing the number of frames to trim from the start of the decoded audio stream.