From ccd044049a16fd68bb363cc05687cf00b77b649e Mon Sep 17 00:00:00 2001
From: Ruofei Ma <ruofeim@google.com>
Date: Thu, 15 Apr 2021 21:59:16 +0000
Subject: [PATCH] Publish performance points for AV1 codec

Publish performance points and fix capabilities.

BUG: 184694421

Signed-off-by: Ruofei Ma <ruofeim@google.com>
Change-Id: I9ca128c0055249967035bf0052a857a043939b43
---
 media_codecs_bo_c2.xml | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/media_codecs_bo_c2.xml b/media_codecs_bo_c2.xml
index a3d3fc3a..ad4ad7df 100644
--- a/media_codecs_bo_c2.xml
+++ b/media_codecs_bo_c2.xml
@@ -17,23 +17,29 @@
     <Include href="media_codecs_aosp_c2.xml" />
     <Decoders>
         <MediaCodec name="c2.google.av1.decoder" type="video/av01">
-          <Limit name="size" min="96x96" max="4096x2304" />
+          <Limit name="size" min="96x96" max="3840x2160" />
           <Limit name="alignment" value="2x2" />
           <Limit name="block-size" value="16x16" />
-          <Limit name="blocks-per-second" min="24" max="2073600" />
+          <Limit name="block-count" range="36-32400" />
+          <Limit name="blocks-per-second" min="24" max="1944000" />
           <Limit name="bitrate" range="1-120000000" />
-          <Limit name="frame-rate" range="1-60" />
+          <Limit name="frame-rate" range="1-120" />
           <Limit name="concurrent-instances" max="16" />
+          <Limit name="performance-point-1920x1080" value="120" />
+          <Limit name="performance-point-3840x2160" value="60" />
           <!--Feature name="adaptive-playback" /-->
         </MediaCodec>
         <MediaCodec name="c2.google.av1.decoder.secure" type="video/av01">
-          <Limit name="size" min="96x96" max="4096x2304" />
+          <Limit name="size" min="96x96" max="3840x2160" />
           <Limit name="alignment" value="2x2" />
           <Limit name="block-size" value="16x16" />
-          <Limit name="blocks-per-second" min="24" max="2073600" />
+          <Limit name="block-count" range="36-32400" />
+          <Limit name="blocks-per-second" min="24" max="1944000" />
           <Limit name="bitrate" range="1-120000000" />
-          <Limit name="frame-rate" range="1-60" />
+          <Limit name="frame-rate" range="1-120" />
           <Limit name="concurrent-instances" max="16" />
+          <Limit name="performance-point-1920x1080" value="120" />
+          <Limit name="performance-point-3840x2160" value="60" />
           <!--Feature name="adaptive-playback" /-->
           <Feature name="secure-playback" required="true" />
         </MediaCodec>