donjohanliebert/device_motorola_sm7325-common
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sm7325-common: media: revert yupik configs to A12 versions

Browse Source 
Slow motion video recording is broken on all common devices with A13 media profiles.

Change-Id: Ifdefc3cdee911182315229a53ec0aba3ea0bc9a9
This commit is contained in:
Andrew Hexen 2023-06-07 22:14:39 -06:00 committed by Marc Bourgoin
parent 94b37d4420
commit 3dd594656e
3 changed files with 1542 additions and 285 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
media/yupik/media_codecs_performance_yupik_v1.xml
View File

@ -64,12 +64,12 @@
<MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true"> <MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="189-497" /> <Limit name="measured-frame-rate-320x240" range="189-497" />
<Limit name="measured-frame-rate-720x480" range="78-109" /> <Limit name="measured-frame-rate-720x480" range="78-109" />
<Limit name="measured-frame-rate-1280x720" range="50-60" /> <Limit name="measured-frame-rate-1280x720" range="17-24" />
<Limit name="measured-frame-rate-1920x1080" range="19-28" /> <Limit name="measured-frame-rate-1920x1080" range="19-28" />
</MediaCodec> </MediaCodec>
<MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true"> <MediaCodec name="c2.android.hevc.decoder" type="video/hevc" update="true">
<Limit name="measured-frame-rate-352x288" range="191-408" /> <Limit name="measured-frame-rate-352x288" range="191-408" />
<Limit name="measured-frame-rate-640x360" range="256-302" /> <Limit name="measured-frame-rate-640x360" range="84-96" />
<Limit name="measured-frame-rate-720x480" range="157-217" /> <Limit name="measured-frame-rate-720x480" range="157-217" />
<Limit name="measured-frame-rate-1280x720" range="47-74" /> <Limit name="measured-frame-rate-1280x720" range="47-74" />
<Limit name="measured-frame-rate-1920x1080" range="29-43" /> <Limit name="measured-frame-rate-1920x1080" range="29-43" />
@ -84,7 +84,7 @@
<Limit name="measured-frame-rate-320x180" range="406-1104" /> <Limit name="measured-frame-rate-320x180" range="406-1104" />
<Limit name="measured-frame-rate-640x360" range="203-330" /> <Limit name="measured-frame-rate-640x360" range="203-330" />
<Limit name="measured-frame-rate-1280x720" range="108-152" /> <Limit name="measured-frame-rate-1280x720" range="108-152" />
<Limit name="measured-frame-rate-1920x1080" range="80-130" /> <Limit name="measured-frame-rate-1920x1080" range="20-31" />
</MediaCodec> </MediaCodec>
<MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true"> <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
<Limit name="measured-frame-rate-176x144" range="893-2369" /> <Limit name="measured-frame-rate-176x144" range="893-2369" />
@ -92,8 +92,6 @@
</MediaCodec> </MediaCodec>
<MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true"> <MediaCodec name="c2.android.mpeg4.decoder" type="video/mp4v-es" update="true">
<Limit name="measured-frame-rate-176x144" range="730-1470" /> <Limit name="measured-frame-rate-176x144" range="730-1470" />
<Limit name="measured-frame-rate-480x360" range="1538-1580" />
<Limit name="measured-frame-rate-1280x720" range="332-444" />
</MediaCodec> </MediaCodec>
</Decoders> </Decoders>
@ -134,10 +132,10 @@
<Limit name="measured-frame-rate-176x144" range="315-379" /> <Limit name="measured-frame-rate-176x144" range="315-379" />
</MediaCodec> </MediaCodec>
<MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true"> <MediaCodec name="c2.android.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x180" range="300-350" /> <Limit name="measured-frame-rate-320x180" range="104-156" />
<Limit name="measured-frame-rate-640x360" range="170-200" /> <Limit name="measured-frame-rate-640x360" range="76-105" />
<Limit name="measured-frame-rate-1280x720" range="50-60" /> <Limit name="measured-frame-rate-1280x720" range="26-32" />
<Limit name="measured-frame-rate-1920x1080" range="30-40" /> <Limit name="measured-frame-rate-1920x1080" range="19-26" />
</MediaCodec> </MediaCodec>
<MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" update="true"> <MediaCodec name="c2.android.vp9.encoder" type="video/x-vnd.on2.vp9" update="true">
<!-- measured 93%:99-156 med:109/109 N=24 --> <!-- measured 93%:99-156 med:109/109 N=24 -->

263
media/yupik/media_codecs_yupik_v1.xml
View File

@ -43,55 +43,252 @@
--> -->
<!-- <!--
Lahaina Non-Secure decoder capabilities Yupik Non-Secure decoder capabilities
(MB is defined as 16x16) (MB is defined as 16x16)
_______________________________________________________ _____________________________________________________
| Codec | W H fps Mbps MB/s | | Codec | W H fps Mbps MB/s |
|_____________|_______________________________________| |_____________|_______________________________________|
| h264 | 3840 2176 60 100 1958400 | | h264 | 4096 2176 30 100 1044480 |
| | 4096 2176 48 100 | | hevc | 4096 2176 30 100 1044480 |
| hevc | 3840 2176 60 100 1958400 | | vp9 | 4096 2176 30 100 1044480 |
| | 4096 2176 48 100 |
| vp9 | 3840 2176 60 100 1958400 |
| | 4096 2176 48 100 |
| mpeg2 | 1920 1088 30 40 244800 | | mpeg2 | 1920 1088 30 40 244800 |
|_____________|_______________________________________| |_____________|_______________________________________|
Lahaina Secure decoder capabilities Yupik Secure decoder capabilities
(MB is defined as 16x16) (MB is defined as 16x16)
__________________________________________________ _________________________________________________
| Codec | W H fps Mbps MB/s | | Codec | W H fps Mbps MB/s |
|__________|_____________________________________| |__________|_____________________________________|
| h264 | 3840 2176 60 40 1958400 | | h264 | 4096 2176 30 40 1044480 |
| | 4096 2176 48 40 | | vp9 | 4096 2176 30 40 1044480 |
| vp9 | 3840 2176 60 40 1958400 | | hevc | 4096 2176 30 40 1044480 |
| | 4096 2176 48 40 |
| hevc | 3840 2176 60 40 1958400 |
| | 4096 2176 48 40 |
|__________|_____________________________________| |__________|_____________________________________|
Lahaina Non-Secure encoder capabilities (Secure not supported) Yupik Non-Secure encoder capabilities (Secure not supported)
(MB is defined as 16x16) (MB is defined as 16x16)
__________________________________________________ __________________________________________________
| Codec | W H fps Mbps MB/s | | Codec | W H fps Mbps MB/s |
|__________|_____________________________________| |__________|______________________________________|
| h264 | 3840 2176 60 100 1958400 | | h264 | 4096 2176 30 100 1044480 |
| | 4096 2176 48 100 | | hevc | 4096 2176 30 100 1044480 |
| hevc | 3840 2176 60 100 1958400 | |__________|______________________________________|
| | 4096 2176 48 100 |
|__________|_____________________________________|
--> -->
<!--
1) media_codecs.xml is used omx, C2 is copied to the media_codecs_c2.xml
2) media_codecs_google_audio|video|c2.xml are removed, and instead of c2 from
/apex/com.android.media.swcodec/etc/media_codecs.xml
3) media_codecs_google_telephony.xml is removed,it is copyed to media_codecs_c2.xml
The replacement file is media_codecs_google_c2_telephony.xml
ref frameworks/av/media/libstagefright/data/media_codecs_google_c2_telephony.xml
-->
<MediaCodecs> <MediaCodecs>
<Include href="media_codecs_google_audio.xml" /> <Include href="media_codecs_google_audio.xml" />
<Include href="media_codecs_vendor_audio.xml" /> <Include href="media_codecs_vendor_audio.xml" />
<Include href="media_codecs_dolby_audio.xml" /> <Include href="media_codecs_google_telephony.xml" />
<Settings>
<Setting name="max-video-encoder-input-buffers" value="11" />
</Settings>
<Decoders>
<!-- C2 decoders -->
<MediaCodec name="c2.qti.avc.decoder" type="video/avc">
<Alias name="OMX.qcom.video.decoder.avc"/>
<Limit name="size" min="96x96" max="4096x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="36-34816" />
<Limit name="blocks-per-second" range="36-1044480" />
<Limit name="bitrate" range="1-100000000" />
<Limit name="frame-rate" range="1-240" />
<Limit name="concurrent-instances" max="16" />
<Feature name="adaptive-playback" />
<Feature name="can-swap-width-height" required="true" />
<Limit name="performance-point-3840x2160" value="30" />
<Limit name="performance-point-1920x1080" value="120" />
<Limit name="performance-point-1280x720" value="240" />
</MediaCodec>
<MediaCodec name="c2.qti.avc.decoder.low_latency" type="video/avc">
<Alias name="OMX.qcom.video.decoder.avc.low_latency"/>
<Limit name="size" min="96x96" max="4096x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="36-34816" />
<Limit name="blocks-per-second" range="36-1044480" />
<Limit name="bitrate" range="1-70000000" />
<Limit name="frame-rate" range="1-240" />
<Limit name="concurrent-instances" max="16" />
<Feature name="adaptive-playback" />
<Feature name="can-swap-width-height" required="true" />
<Feature name="low-latency" />
<Limit name="concurrent-instances" max="16" />
<Limit name="performance-point-3840x2160" value="30" />
<Limit name="performance-point-1920x1080" value="120" />
<Limit name="performance-point-1280x720" value="240" />
</MediaCodec>
<MediaCodec name="c2.qti.avc.decoder.secure" type="video/avc" >
<Alias name="OMX.qcom.video.decoder.avc.secure"/>
<Limit name="size" min="96x96" max="4096x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="36-34816" />
<Limit name="blocks-per-second" min="36" max="1044480" />
<Limit name="bitrate" range="1-40000000" />
<Limit name="frame-rate" range="1-60" />
<Feature name="adaptive-playback" />
<Feature name="can-swap-width-height" required="true" />
<Feature name="secure-playback" required="true" />
<Feature name="low-latency" />
<Limit name="concurrent-instances" max="3" />
<Limit name="performance-point-3840x2160" value="30" />
</MediaCodec>
<MediaCodec name="c2.qti.hevc.decoder" type="video/hevc" >
<Alias name="OMX.qcom.video.decoder.hevc"/>
<Limit name="size" min="96x96" max="4096x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="36-34816" />
<Limit name="blocks-per-second" min="36" max="1044480" />
<Limit name="bitrate" range="1-100000000" />
<Limit name="frame-rate" range="1-240" />
<Feature name="adaptive-playback" />
<Feature name="can-swap-width-height" required="true" />
<Limit name="concurrent-instances" max="16" />
<Limit name="performance-point-3840x2160" value="30" />
<Limit name="performance-point-1920x1080" value="120" />
<Limit name="performance-point-1280x720" value="240" />
</MediaCodec>
<MediaCodec name="c2.qti.hevc.decoder.low_latency" type="video/hevc" >
<Alias name="OMX.qcom.video.decoder.hevc.low_latency"/>
<Limit name="size" min="96x96" max="4096x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="36-34816" />
<Limit name="blocks-per-second" min="36" max="1044480" />
<Limit name="bitrate" range="1-70000000" />
<Limit name="frame-rate" range="1-240" />
<Feature name="adaptive-playback" />
<Feature name="can-swap-width-height" required="true" />
<Feature name="low-latency" />
<Limit name="concurrent-instances" max="16" />
<Limit name="performance-point-3840x2160" value="30" />
<Limit name="performance-point-1920x1080" value="120" />
<Limit name="performance-point-1280x720" value="240" />
</MediaCodec>
<MediaCodec name="c2.qti.hevc.decoder.secure" type="video/hevc" >
<Alias name="OMX.qcom.video.decoder.hevc.secure"/>
<Limit name="size" min="96x96" max="4096x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="36-34816" />
<Limit name="blocks-per-second" min="36" max="1044480" />
<Limit name="bitrate" range="1-40000000" />
<Limit name="frame-rate" range="1-60" />
<Feature name="adaptive-playback" />
<Feature name="can-swap-width-height" required="true" />
<Feature name="secure-playback" required="true" />
<Feature name="low-latency" />
<Limit name="concurrent-instances" max="3" />
<Limit name="performance-point-3840x2160" value="30" />
</MediaCodec>
<MediaCodec name="c2.qti.vp9.decoder" type="video/x-vnd.on2.vp9" >
<Alias name="OMX.qcom.video.decoder.vp9"/>
<Limit name="size" min="96x96" max="4096x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="36-34816" />
<Limit name="blocks-per-second" min="36" max="1044480" />
<Limit name="bitrate" range="1-100000000" />
<Limit name="frame-rate" range="1-60" />
<Feature name="adaptive-playback" />
<Feature name="can-swap-width-height" required="true" />
<Limit name="concurrent-instances" max="3" />
<Limit name="performance-point-3840x2160" value="30" />
</MediaCodec>
<MediaCodec name="c2.qti.vp9.decoder.secure" type="video/x-vnd.on2.vp9" >
<Alias name="OMX.qcom.video.decoder.vp9.secure"/>
<Limit name="size" min="96x96" max="4096x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="36-34816" />
<Limit name="blocks-per-second" min="36" max="1044480" />
<Limit name="bitrate" range="1-40000000" />
<Limit name="frame-rate" range="1-60" />
<Feature name="adaptive-playback" />
<Feature name="can-swap-width-height" required="true" />
<Feature name="secure-playback" required="true" />
<Limit name="concurrent-instances" max="3" />
<Limit name="performance-point-3840x2160" value="30" />
</MediaCodec>
<MediaCodec name="c2.qti.mpeg2.decoder" type="video/mpeg2" >
<Alias name="OMX.qcom.video.decoder.mpeg2"/>
<Limit name="size" min="96x96" max="1920x1088" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="36-8160" />
<Limit name="blocks-per-second" min="36" max="244800" />
<Limit name="bitrate" range="1-40000000" />
<Limit name="frame-rate" range="1-30" />
<Feature name="adaptive-playback" />
<Feature name="can-swap-width-height" required="true" />
<Limit name="concurrent-instances" max="16" />
<Limit name="performance-point-1920x1080" value="30" />
</MediaCodec>
</Decoders>
<Encoders>
<!-- C2 encoders -->
<MediaCodec name="c2.qti.avc.encoder" type="video/avc">
<Alias name="OMX.qcom.video.encoder.avc"/>
<Limit name="size" min="128x128" max="4096x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="64" max="1044480" />
<Limit name="block-count" range="64-34816" />
<Limit name="bitrate" range="1-100000000" />
<Limit name="frame-rate" range="1-240" />
<Limit name="concurrent-instances" max="16" />
<Feature name="intra-refresh" />
<Feature name="can-swap-width-height" required="true" />
<Feature name="bitrate-modes" value="VBR,CBR" />
<Limit name="performance-point-3840x2160" value="30" />
<Limit name="performance-point-1920x1080" value="120" />
<Limit name="performance-point-1280x720" value="240" />
</MediaCodec>
<MediaCodec name="c2.qti.hevc.encoder" type="video/hevc">
<Alias name="OMX.qcom.video.encoder.hevc"/>
<Limit name="size" min="128x128" max="4096x2176" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="64" max="1044480" />
<Limit name="block-count" range="64-34816" />
<Limit name="bitrate" range="1-100000000" />
<Limit name="frame-rate" range="1-240" />
<Limit name="concurrent-instances" max="16" />
<Feature name="bitrate-modes" value="VBR,CBR" />
<Feature name="intra-refresh" />
<Feature name="can-swap-width-height" required="true" />
<Limit name="performance-point-3840x2160" value="30" />
<Limit name="performance-point-1920x1080" value="120" />
<Limit name="performance-point-1280x720" value="240" />
</MediaCodec>
<MediaCodec name="c2.qti.hevc.encoder.cq" type="video/hevc">
<Alias name="OMX.qcom.video.encoder.hevc.cq"/>
<Limit name="size" min="128x128" max="512x512" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="64" max="20480" />
<Limit name="bitrate" range="1-100000000" />
<Limit name="frame-rate" range="1-20" />
<Limit name="concurrent-instances" max="16" />
<Limit name="quality" range="0-100" default="80" />
<Feature name="bitrate-modes" value="CQ" />
<Limit name="performance-point-512x512" value="2025" />
</MediaCodec>
<MediaCodec name="c2.qti.heic.encoder" type="image/vnd.android.heic">
<Alias name="OMX.qcom.video.encoder.heic"/>
<Limit name="size" min="512x512" max="16384x16384" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="64" max="3916800" />
<Limit name="bitrate" range="1-100000000" />
<Limit name="frame-rate" range="1-20" />
<Limit name="concurrent-instances" max="16" />
<Limit name="quality" range="0-100" default="80" />
<Feature name="bitrate-modes" value="CQ" />
<Limit name="performance-point-16384x8192" value="3" />
<Limit name="performance-point-1920x1080" value="6" />
</MediaCodec>
</Encoders>
<Include href="media_codecs_google_c2.xml" />
</MediaCodecs> </MediaCodecs>

1548
media/yupik/media_profiles_yupik_v1.xml
View File

File diff suppressed because it is too large Load Diff