Revert "update performance-point for media performance class 13" am: 079810e65b am: 5ba37dc273

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: I85bf075111c3e9a1a5dff1a731074505dc1ea3bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Ruofei Ma 2022-06-16 18:14:34 +00:00 committed by Automerger Merge Worker
commit 0fea45335f
2 changed files with 15 additions and 13 deletions

View file

@ -26,7 +26,7 @@
<Limit name="block-count" range="1-32400" /> <Limit name="block-count" range="1-32400" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-120000000" /> <Limit name="bitrate" range="1-120000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="16" /> <Limit name="concurrent-instances" max="16" />
<Feature name="adaptive-playback" /> <Feature name="adaptive-playback" />
@ -39,7 +39,7 @@
<Limit name="block-count" range="1-32400" /> <Limit name="block-count" range="1-32400" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-120000000" /> <Limit name="bitrate" range="1-120000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="2" /> <Limit name="concurrent-instances" max="2" />
<Feature name="adaptive-playback" /> <Feature name="adaptive-playback" />
@ -53,7 +53,7 @@
<Limit name="block-count" range="1-32400" /> <Limit name="block-count" range="1-32400" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-120000000" /> <Limit name="bitrate" range="1-120000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="16" /> <Limit name="concurrent-instances" max="16" />
<Feature name="adaptive-playback" /> <Feature name="adaptive-playback" />
@ -66,7 +66,7 @@
<Limit name="block-count" range="1-32400" /> <Limit name="block-count" range="1-32400" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-120000000" /> <Limit name="bitrate" range="1-120000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="2" /> <Limit name="concurrent-instances" max="2" />
<Feature name="adaptive-playback" /> <Feature name="adaptive-playback" />
@ -105,7 +105,7 @@
<Limit name="block-count" range="1-32400" /> <Limit name="block-count" range="1-32400" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-80000000" /> <Limit name="bitrate" range="1-80000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="16" /> <Limit name="concurrent-instances" max="16" />
<Feature name="adaptive-playback" /> <Feature name="adaptive-playback" />
@ -118,7 +118,7 @@
<Limit name="block-count" range="1-2040" /> <Limit name="block-count" range="1-2040" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-80000000" /> <Limit name="bitrate" range="1-80000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="16" /> <Limit name="concurrent-instances" max="16" />
<Feature name="adaptive-playback" /> <Feature name="adaptive-playback" />
@ -131,7 +131,7 @@
<Limit name="block-count" range="1-2040" /> <Limit name="block-count" range="1-2040" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-80000000" /> <Limit name="bitrate" range="1-80000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="2" /> <Limit name="concurrent-instances" max="2" />
<Feature name="adaptive-playback" /> <Feature name="adaptive-playback" />
@ -148,7 +148,7 @@
<Limit name="block-count" range="1-32400" /> <Limit name="block-count" range="1-32400" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-120000000" /> <Limit name="bitrate" range="1-120000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="16" /> <Limit name="concurrent-instances" max="16" />
<Feature name="can-swap-width-height" value="1" /> <Feature name="can-swap-width-height" value="1" />
@ -162,7 +162,7 @@
<Limit name="block-count" range="1-8160" /> <Limit name="block-count" range="1-8160" />
<Limit name="blocks-per-second" min="1" max="979200" /> <Limit name="blocks-per-second" min="1" max="979200" />
<Limit name="bitrate" range="1-120000000" /> <Limit name="bitrate" range="1-120000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="16" /> <Limit name="concurrent-instances" max="16" />
<Feature name="can-swap-width-height" value="1" /> <Feature name="can-swap-width-height" value="1" />
@ -203,7 +203,7 @@
<Limit name="block-count" range="1-32400" /> <Limit name="block-count" range="1-32400" />
<Limit name="blocks-per-second" min="1" max="3888000" /> <Limit name="blocks-per-second" min="1" max="3888000" />
<Limit name="bitrate" range="1-80000000" /> <Limit name="bitrate" range="1-80000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="16" /> <Limit name="concurrent-instances" max="16" />
<Feature name="can-swap-width-height" value="1" /> <Feature name="can-swap-width-height" value="1" />
@ -217,7 +217,7 @@
<Limit name="block-count" range="1-2040" /> <Limit name="block-count" range="1-2040" />
<Limit name="blocks-per-second" min="1" max="243000" /> <Limit name="blocks-per-second" min="1" max="243000" />
<Limit name="bitrate" range="1-80000000" /> <Limit name="bitrate" range="1-80000000" />
<Limit name="performance-point-1920x1080" range="240" /> <Limit name="performance-point-1280x720" range="240" />
<Limit name="performance-point-3840x2160" range="120" /> <Limit name="performance-point-3840x2160" range="120" />
<Limit name="concurrent-instances" max="16" /> <Limit name="concurrent-instances" max="16" />
<Feature name="can-swap-width-height" value="1" /> <Feature name="can-swap-width-height" value="1" />

View file

@ -25,7 +25,8 @@
<Limit name="bitrate" range="1-120000000" /> <Limit name="bitrate" range="1-120000000" />
<Limit name="frame-rate" range="1-180" /> <Limit name="frame-rate" range="1-180" />
<Limit name="concurrent-instances" max="16" /> <Limit name="concurrent-instances" max="16" />
<Limit name="performance-point-1920x1080" value="200" /> <Limit name="performance-point-1280x720" value="180" />
<Limit name="performance-point-1920x1080" value="120" />
<Limit name="performance-point-3840x2160" value="60" /> <Limit name="performance-point-3840x2160" value="60" />
<Feature name="adaptive-playback" /> <Feature name="adaptive-playback" />
<Feature name="can-swap-width-height" value="1" /> <Feature name="can-swap-width-height" value="1" />
@ -39,7 +40,8 @@
<Limit name="bitrate" range="1-120000000" /> <Limit name="bitrate" range="1-120000000" />
<Limit name="frame-rate" range="1-180" /> <Limit name="frame-rate" range="1-180" />
<Limit name="concurrent-instances" max="16" /> <Limit name="concurrent-instances" max="16" />
<Limit name="performance-point-1920x1080" value="200" /> <Limit name="performance-point-1280x720" value="180" />
<Limit name="performance-point-1920x1080" value="120" />
<Limit name="performance-point-3840x2160" value="60" /> <Limit name="performance-point-3840x2160" value="60" />
<Feature name="adaptive-playback" /> <Feature name="adaptive-playback" />
<Feature name="secure-playback" required="true" /> <Feature name="secure-playback" required="true" />