From 795594f862ebf214fd97922b4c8e7380cb1b4cec Mon Sep 17 00:00:00 2001 From: olly Date: Mon, 17 May 2021 11:40:54 +0100 Subject: [PATCH] Update avcLevelToMaxFrameSize for AVCLevel6, 61 and 62 PiperOrigin-RevId: 374161340 --- .../android/exoplayer2/mediacodec/MediaCodecUtil.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java index 36eea4276e..7eac7a21c2 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecUtil.java @@ -841,9 +841,9 @@ public final class MediaCodecUtil { /** * Conversion values taken from ISO 14496-10 Table A-1. * - * @param avcLevel one of CodecProfileLevel.AVCLevel* constants. - * @return maximum frame size that can be decoded by a decoder with the specified avc level - * (or {@code -1} if the level is not recognized) + * @param avcLevel One of the {@link CodecProfileLevel} {@code AVCLevel*} constants. + * @return The maximum frame size that can be decoded by a decoder with the specified AVC level, + * or {@code -1} if the level is not recognized. */ private static int avcLevelToMaxFrameSize(int avcLevel) { switch (avcLevel) { @@ -873,6 +873,10 @@ public final class MediaCodecUtil { case CodecProfileLevel.AVCLevel51: case CodecProfileLevel.AVCLevel52: return 36864 * 16 * 16; + case CodecProfileLevel.AVCLevel6: + case CodecProfileLevel.AVCLevel61: + case CodecProfileLevel.AVCLevel62: + return 139264 * 16 * 16; default: return -1; }