From 69870bd5abcc4df426f50185f0f4918015a31e66 Mon Sep 17 00:00:00 2001 From: Caren Chang Date: Fri, 12 Jul 2024 10:26:47 -0700 Subject: [PATCH 1/2] Upgrade to media3 1.4.0-rc01 --- gradle/libs.versions.toml | 2 +- samples/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index a75ee9f0..8c7c84e4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -38,7 +38,7 @@ androidxTestExtTruth = "1.5.0" androidxTestRules = "1.5.0" androidxTestRunner = "1.5.2" androidxUiAutomator = "2.2.0" -media3 = "1.2.1" +media3 = "1.4.0-rc01" appcompat = "1.6.1" material = "1.12.0-beta01" constraintlayout = "2.1.4" diff --git a/samples/README.md b/samples/README.md index a1f7381b..c7ce08cf 100644 --- a/samples/README.md +++ b/samples/README.md @@ -123,7 +123,7 @@ This sample demonstrates converting a series of UltraHDR images into a HDR - [UltraHDR x OpenGLES SurfaceView](graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/opengl/UltraHDRWithOpenGL.kt): This sample demonstrates displaying an UltraHDR image via and OpenGL Pipeline - [Video Composition using Media3 Transformer](media/video/src/main/java/com/example/platform/media/video/TransformerVideoComposition.kt): -This sample demonstrates concatenation of two video assets using Media3 +This sample demonstrates concatenation of two video assets and an image using - [Visualizing an UltraHDR Gainmap](graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/display/VisualizingAnUltraHDRGainmap.kt): This sample demonstrates visualizing the underlying gainmap of an UltraHDR - [WindowInsetsAnimation](user-interface/window-insets/src/main/java/com/example/platform/ui/insets/WindowInsetsAnimation.kt): From 67a08c55860306ca316b8466b52e8e06df9e157e Mon Sep 17 00:00:00 2001 From: Caren Chang Date: Fri, 12 Jul 2024 13:59:07 -0700 Subject: [PATCH 2/2] Fix README --- samples/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/README.md b/samples/README.md index c7ce08cf..4fa68149 100644 --- a/samples/README.md +++ b/samples/README.md @@ -123,7 +123,7 @@ This sample demonstrates converting a series of UltraHDR images into a HDR - [UltraHDR x OpenGLES SurfaceView](graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/opengl/UltraHDRWithOpenGL.kt): This sample demonstrates displaying an UltraHDR image via and OpenGL Pipeline - [Video Composition using Media3 Transformer](media/video/src/main/java/com/example/platform/media/video/TransformerVideoComposition.kt): -This sample demonstrates concatenation of two video assets and an image using +This sample demonstrates concatenation of two video assets and an image using Media3. - [Visualizing an UltraHDR Gainmap](graphics/ultrahdr/src/main/java/com/example/platform/graphics/ultrahdr/display/VisualizingAnUltraHDRGainmap.kt): This sample demonstrates visualizing the underlying gainmap of an UltraHDR - [WindowInsetsAnimation](user-interface/window-insets/src/main/java/com/example/platform/ui/insets/WindowInsetsAnimation.kt):