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

Change-Id: I2d990016600ea79c0804fe2183a81d1a1e8311e5
This commit is contained in:
Android Build Coastguard Worker 2022-10-22 01:11:30 +00:00
commit ca1acdc25f

View file

@ -26,8 +26,7 @@
<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="180" />
<Limit name="performance-point-1920x1080" value="120" />
<Limit name="performance-point-1920x1080" value="200" />
<Limit name="performance-point-3840x2160" value="60" />
<!--Feature name="adaptive-playback" /-->
</MediaCodec>
@ -40,8 +39,7 @@
<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="180" />
<Limit name="performance-point-1920x1080" value="120" />
<Limit name="performance-point-1920x1080" value="200" />
<Limit name="performance-point-3840x2160" value="60" />
<!--Feature name="adaptive-playback" /-->
<Feature name="secure-playback" required="true" />