From 95becec1e2e664f360bad731f750dcd05f3d79b0 Mon Sep 17 00:00:00 2001 From: christosts Date: Thu, 28 Jul 2022 13:24:08 +0000 Subject: [PATCH] Support ApplicationVersion = 1 for HDR10+ MediaCodecRenderer allows passing HDR10+ out-of-bound metadata with ApplicationVersion = 1. PiperOrigin-RevId: 463822315 --- .../media3/exoplayer/video/MediaCodecVideoRenderer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java index cbdd31e52b..9cc8a6e937 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/video/MediaCodecVideoRenderer.java @@ -969,7 +969,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer { && ituTT35TerminalProviderCode == 0x003C && ituTT35TerminalProviderOrientedCode == 0x0001 && applicationIdentifier == 4 - && applicationVersion == 0) { + && (applicationVersion == 0 || applicationVersion == 1)) { // The metadata size may vary so allocate a new array every time. This is not too // inefficient because the metadata is only a few tens of bytes. byte[] hdr10PlusInfo = new byte[data.remaining()];