Merge cherrypicks of [20193175] into tm-qpr1-release.

Change-Id: I6634b369e7ef9161391acb5fb99109cbcfda11a1
This commit is contained in:
Android Build Coastguard Worker
2022-10-15 01:18:07 +00:00

View File

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