From 495567bb434d485bf8720ee7e290aab06541b3b6 Mon Sep 17 00:00:00 2001
From: wenchangliu <wenchangliu@google.com>
Date: Tue, 20 Sep 2022 18:31:19 +0800
Subject: [PATCH] [DO NOT MERGE] temporal remove CQ mode for HEVC encoder

We are too late to upgrade the latest version of libyuv in Android T
to fix color conversion (BT.709 YUV to RGB) accuracy issue in HeifWriterTest when we exposed CQ mode for H/W hevc encoder. Move CQ mode support in Android U.

Note: remove CQ mode support, HeifWriterTest will use software hevc encoder to run the test. Since software encoder only support 512x512 resolution the default color primary is using BT.601 which will not
meet color accuracy issue.

Bug: 242466144
Test: atest android.media.misc.cts.HeifWriterTest
Change-Id: I4e0cf6995980603c9473086a385617e47a16b4b9
---
 media_codecs_aosp_c2.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index a35aba11..31842ff8 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -166,11 +166,10 @@
             <Limit name="performance-point-1280x720" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
-            <Limit name="quality" range="0-100" default="57" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>
             <Feature name="qp-bounds"/>
-            <Feature name="bitrate-modes" value="VBR,CBR,CQ,CBR-FD" />
+            <Feature name="bitrate-modes" value="VBR,CBR,CBR-FD" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.mpeg4.encoder" type="video/mp4v-es">
             <Limit name="size" min="32x32" max="2048x2048" />