From 5fcf70543494c4b0d498d3bb568eb1e1d560e1e1 Mon Sep 17 00:00:00 2001
From: Wen Chang Liu <wenchangliu@google.com>
Date: Sat, 14 Sep 2024 06:10:51 +0000
Subject: [PATCH 1/2] Support FEATURE_DynamicColorAspect for MPC15

[5.1/H-1-21] MUST support FEATURE_DynamicColorAspect for all
hardware video decoders (AVC, HEVC, VP9, AV1, or later).

Bug: 343864145
Flag: EXEMPT resource only update
Test: run cts -m CtsMediaPerformanceClassTestCases -- --module-arg \
      CtsMediaPerformanceClassTestCases:instrumentation-arg:media-performance-class:=35
Test: run cts -m CtsMediaV2TestCases -t android.mediav2.cts.DecoderDynamicColorAspectTest
Test: run cts -m CtsMediaV2TestCases -t android.mediav2.cts.AdaptivePlaybackTest
Change-Id: I97c2e683f2290a91e40be77f595b1043c548db6d
---
 media_codecs_aosp_c2.xml | 6 ++++++
 media_codecs_bo_c2.xml   | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index ab61ca9..a69ba56 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -33,6 +33,7 @@
             <Feature name="adaptive-playback" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="low-latency" />
+            <Feature name="dynamic-color-aspects" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.h264.decoder.secure" type="video/avc">
             <Limit name="size" min="32x32" max="3840x2160" />
@@ -48,6 +49,7 @@
             <Feature name="secure-playback" required="true" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="low-latency" />
+            <Feature name="dynamic-color-aspects" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.hevc.decoder" type="video/hevc" >
             <Limit name="size" min="64x64" max="7680x4320" />
@@ -63,6 +65,7 @@
             <Feature name="adaptive-playback" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="low-latency" />
+            <Feature name="dynamic-color-aspects" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.hevc.decoder.secure" type="video/hevc" >
             <Limit name="size" min="64x64" max="3840x2160" />
@@ -78,6 +81,7 @@
             <Feature name="secure-playback" required="true" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="low-latency" />
+            <Feature name="dynamic-color-aspects" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.mpeg4.decoder" type="video/mp4v-es">
             <Limit name="size" min="32x32" max="2048x2048" />
@@ -134,6 +138,7 @@
             <Feature name="adaptive-playback" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="low-latency" />
+            <Feature name="dynamic-color-aspects" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.decoder.secure" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2176" />
@@ -149,6 +154,7 @@
             <Feature name="secure-playback" required="true" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="low-latency" />
+            <Feature name="dynamic-color-aspects" />
         </MediaCodec>
     </Decoders>
 
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index 06e0447..ccaea74 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -31,6 +31,7 @@
           <Limit name="performance-point-3840x2160" value="60" />
           <Feature name="adaptive-playback" />
           <Feature name="can-swap-width-height" value="1" />
+          <Feature name="dynamic-color-aspects" />
         </MediaCodec>
         <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
           <Limit name="size" min="96x96" max="3840x2160" />
@@ -47,6 +48,7 @@
           <Feature name="adaptive-playback" />
           <Feature name="secure-playback" required="true" />
           <Feature name="can-swap-width-height" value="1" />
+          <Feature name="dynamic-color-aspects" />
         </MediaCodec>
     </Decoders>
     <Encoders>

From 7c7154dd1c4778275a59b8182ea8523e7a7df464 Mon Sep 17 00:00:00 2001
From: Wen Chang Liu <wenchangliu@google.com>
Date: Sat, 14 Sep 2024 06:29:02 +0000
Subject: [PATCH 2/2] Support FEATURE_HlgEditing for MPC15

[5.1/H-1-20] MUST support the Feature_HdrEditing feature for all
hardware AV1 and HEVC encoders present on the device at 4K
resolution or the largest Camera-supported resolution,
whichever is less.

Bug: 343146210
Bug: 343864145
Flag: EXEMPT resource only update
Test: run cts -m CtsMediaPerformanceClassTestCases -- --module-arg \
      CtsMediaPerformanceClassTestCases:instrumentation-arg:media-performance-class:=35
Change-Id: I362b9b8cc349f58869aa51322d35930e29a8d2b8
---
 media_codecs_aosp_c2.xml | 1 +
 media_codecs_bo_c2.xml   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index a69ba56..5a39a44 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -194,6 +194,7 @@
             <Feature name="qp-bounds"/>
             <Feature name="encoding-statistics"/>
             <Feature name="hdr-editing" />
+            <Feature name="hlg-editing" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.mpeg4.encoder" type="video/mp4v-es">
             <Limit name="size" min="32x32" max="2048x2048" />
diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index ccaea74..68c5650 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -68,6 +68,7 @@
             <Feature name="vq-minimum-quality"/>
             <Feature name="encoding-statistics"/>
             <Feature name="hdr-editing" />
+            <Feature name="hlg-editing" />
         </MediaCodec>
     </Encoders>
 </MediaCodecs>