diff options
| author | qctecmdr <qctecmdr@localhost> | 2019-12-01 23:37:20 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-12-01 23:37:20 -0800 |
| commit | 3dd9250b99f3105d4dca1a399e7a3895facddb28 (patch) | |
| tree | 02e1f686967b720ecad9ef3d759e96818adbf384 | |
| parent | 58c3dae8d38102c981ff5b12390a2ee47bfe6c17 (diff) | |
| parent | 5fee1e3466e719f08a8424fdc5a089624bb08bf3 (diff) | |
| download | android_hardware_qcom_media-3dd9250b99f3105d4dca1a399e7a3895facddb28.tar.gz android_hardware_qcom_media-3dd9250b99f3105d4dca1a399e7a3895facddb28.tar.bz2 android_hardware_qcom_media-3dd9250b99f3105d4dca1a399e7a3895facddb28.zip | |
Merge "sm6150: Limit the max performance load"
| -rw-r--r-- | conf_files/sm6150/media_codecs.xml | 54 | ||||
| -rw-r--r-- | conf_files/sm6150/media_codecs_sdmmagpie_v1.xml | 33 | ||||
| -rw-r--r-- | conf_files/sm6150/media_codecs_vendor_sdmmagpie_v1.xml | 33 |
3 files changed, 59 insertions, 61 deletions
diff --git a/conf_files/sm6150/media_codecs.xml b/conf_files/sm6150/media_codecs.xml index 38aec856..bdb2869f 100644 --- a/conf_files/sm6150/media_codecs.xml +++ b/conf_files/sm6150/media_codecs.xml @@ -82,14 +82,14 @@ Only the three quirks included above are recognized at this point: <!-- SM6150 Non-Secure decoder capabilities - _________________________________________________________ - | Codec | W H fps Mbps MB/s | + ________________________________________________________ + | Codec | W H fps Mbps MB/s | |_____________|_________________________________________| - | h264 | 4096 2160 24 100 829440 | - | hevc | 4096 2160 24 100 829440 | + | h264 | 3840 2160 30 100 972000 | + | hevc | 3840 2160 30 100 972000 | | mpeg4-sw | 1920 1088 30 40 244800 | | vp8 | 1920 1088 60 100 489600 | - | vp9 | 4096 2160 24 100 829440 | + | vp9 | 3840 2160 30 100 972000 | | vc1 | 1920 1088 30 20 244800 | | div4/5/6-sw | 1920 1088 30 10 244800 | | h263-sw | 864 480 30 16 48600 | @@ -100,18 +100,18 @@ Only the three quirks included above are recognized at this point: ______________________________________________________ | Codec | W H fps Mbps MB/s | |__________|_________________________________________| - | h264 | 3840 2160 30 35 972000 | - | vp9 | 3840 2160 30 35 972000 | - | hevc | 3840 2160 30 35 972000 | - | mpeg2 | 1920 1088 30 35 244800 | + | h264 | 3840 2160 30 40 972000 | + | vp9 | 3840 2160 30 40 972000 | + | hevc | 3840 2160 30 40 972000 | + | mpeg2 | 1920 1088 30 40 244800 | |__________|_________________________________________| SM6150 Non-Secure encoder capabilities (Secure not supported) ______________________________________________________ | Codec | W H fps Mbps MB/s | |__________|_________________________________________| - | h264 | 4096 2160 24 100 829440 | - | hevc | 4096 2160 24 100 829440 | + | h264 | 3840 2160 30 100 972000 | + | hevc | 3840 2160 30 100 972000 | | mpeg4-sw | 1280 720 30 4 108000 | | vp8 | 1920 1088 60 40 489600 | | h263-sw | 864 480 30 2 48600 | @@ -133,7 +133,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="979200" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Limit name="concurrent-instances" max="16" /> @@ -162,7 +162,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="979200" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Limit name="concurrent-instances" max="16" /> @@ -207,7 +207,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="979200" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Feature name="adaptive-playback" /> @@ -220,12 +220,12 @@ Only the three quirks included above are recognized at this point: <MediaCodec name="OMX.qcom.video.decoder.avc.secure" type="video/avc" > <Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-output-ports" /> - <Limit name="size" min="96x96" max="3840x2160" /> + <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> <Limit name="blocks-per-second" min="24" max="972000" /> - <Limit name="bitrate" range="1-35000000" /> - <Limit name="frame-rate" range="1-30" /> + <Limit name="bitrate" range="1-40000000" /> + <Limit name="frame-rate" range="1-60" /> <Feature name="adaptive-playback" /> <Feature name="secure-playback" required="true" /> <Limit name="concurrent-instances" max="3" /> @@ -251,7 +251,7 @@ Only the three quirks included above are recognized at this point: <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> <Limit name="blocks-per-second" min="24" max="244800" /> - <Limit name="bitrate" range="1-35000000" /> + <Limit name="bitrate" range="1-40000000" /> <Limit name="frame-rate" range="1-30" /> <Feature name="adaptive-playback" /> <Feature name="secure-playback" required="true" /> @@ -279,8 +279,8 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="979200" /> - <Limit name="bitrate" range="1-120000000" /> + <Limit name="blocks-per-second" min="24" max="972000" /> + <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Feature name="adaptive-playback" /> <Limit name="concurrent-instances" max="6" /> @@ -292,12 +292,12 @@ Only the three quirks included above are recognized at this point: <MediaCodec name="OMX.qcom.video.decoder.vp9.secure" type="video/x-vnd.on2.vp9" > <Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-output-ports" /> - <Limit name="size" min="96x96" max="3840x2160" /> + <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> <Limit name="blocks-per-second" min="24" max="972000" /> - <Limit name="bitrate" range="1-35000000" /> - <Limit name="frame-rate" range="1-30" /> + <Limit name="bitrate" range="1-40000000" /> + <Limit name="frame-rate" range="1-60" /> <Feature name="adaptive-playback" /> <Feature name="secure-playback" required="true" /> <Limit name="concurrent-instances" max="3" /> @@ -309,7 +309,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="979200" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Feature name="adaptive-playback" /> @@ -322,12 +322,12 @@ Only the three quirks included above are recognized at this point: <MediaCodec name="OMX.qcom.video.decoder.hevc.secure" type="video/hevc" > <Quirk name="requires-allocate-on-input-ports" /> <Quirk name="requires-allocate-on-output-ports" /> - <Limit name="size" min="96x96" max="3840x2160" /> + <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> <Limit name="blocks-per-second" min="24" max="972000" /> - <Limit name="bitrate" range="1-35000000" /> - <Limit name="frame-rate" range="1-30" /> + <Limit name="bitrate" range="1-40000000" /> + <Limit name="frame-rate" range="1-60" /> <Feature name="adaptive-playback" /> <Feature name="secure-playback" required="true" /> <Limit name="concurrent-instances" max="3" /> diff --git a/conf_files/sm6150/media_codecs_sdmmagpie_v1.xml b/conf_files/sm6150/media_codecs_sdmmagpie_v1.xml index 72853dda..2ba64c2b 100644 --- a/conf_files/sm6150/media_codecs_sdmmagpie_v1.xml +++ b/conf_files/sm6150/media_codecs_sdmmagpie_v1.xml @@ -87,12 +87,11 @@ Only the three quirks included above are recognized at this point: _________________________________________________________ | Codec | W H fps Mbps MB/s | |_____________|_________________________________________| - | h264 | 4096 2160 30 100 1036800 | - | hevc | 4096 2160 30 100 1036800 | + | h264 | 3840 2160 30 100 972000 | + | hevc | 3840 2160 30 100 972000 | | mpeg4-sw | 1920 1088 30 40 244800 | | vp8 | 1920 1088 60 100 489600 | - | vp9 | 4096 2160 30 100 1036800 | - | | (4096) (2304) (30) (120) | + | vp9 | 3840 2160 30 100 972000 | | vc1 | 1920 1088 30 20 244800 | | div4/5/6-sw | 1920 1088 30 10 244800 | | h263-sw | 864 480 30 16 48600 | @@ -103,9 +102,9 @@ Only the three quirks included above are recognized at this point: ______________________________________________________ | Codec | W H fps Mbps MB/s | |__________|_________________________________________| - | h264 | 4096 2160 30 40 1036800 | - | vp9 | 4096 2160 30 40 1036800 | - | hevc | 4096 2160 30 40 1036800 | + | h264 | 3840 2160 30 40 972000 | + | vp9 | 3840 2160 30 40 972000 | + | hevc | 3840 2160 30 40 972000 | | mpeg2 | 1920 1088 30 40 244800 | |__________|_________________________________________| @@ -113,8 +112,8 @@ Only the three quirks included above are recognized at this point: ______________________________________________________ | Codec | W H fps Mbps MB/s | |__________|_________________________________________| - | h264 | 4096 2160 30 100 1036800 | - | hevc | 4096 2160 30 100 1036800 | + | h264 | 3840 2160 30 100 972000 | + | hevc | 3840 2160 30 100 972000 | | mpeg4-sw | 1280 720 30 4 108000 | | vp8 | 1920 1088 60 40 489600 | | h263-sw | 864 480 30 2 48600 | @@ -136,7 +135,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Limit name="concurrent-instances" max="16" /> @@ -160,7 +159,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Limit name="concurrent-instances" max="16" /> @@ -201,7 +200,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Feature name="adaptive-playback" /> @@ -213,7 +212,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-40000000" /> <Limit name="frame-rate" range="1-60" /> <Feature name="adaptive-playback" /> @@ -263,7 +262,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Feature name="adaptive-playback" /> @@ -275,7 +274,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-40000000" /> <Limit name="frame-rate" range="1-60" /> <Feature name="adaptive-playback" /> @@ -288,7 +287,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Feature name="adaptive-playback" /> @@ -300,7 +299,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-40000000" /> <Limit name="frame-rate" range="1-60" /> <Feature name="adaptive-playback" /> diff --git a/conf_files/sm6150/media_codecs_vendor_sdmmagpie_v1.xml b/conf_files/sm6150/media_codecs_vendor_sdmmagpie_v1.xml index 0b2270f5..0dfb94d3 100644 --- a/conf_files/sm6150/media_codecs_vendor_sdmmagpie_v1.xml +++ b/conf_files/sm6150/media_codecs_vendor_sdmmagpie_v1.xml @@ -87,12 +87,11 @@ Only the three quirks included above are recognized at this point: _________________________________________________________ | Codec | W H fps Mbps MB/s | |_____________|_________________________________________| - | h264 | 4096 2160 30 100 1036800 | - | hevc | 4096 2160 30 100 1036800 | + | h264 | 3840 2160 30 100 972000 | + | hevc | 3840 2160 30 100 972000 | | mpeg4-sw | 1920 1088 30 40 244800 | | vp8 | 1920 1088 60 100 489600 | - | vp9 | 4096 2160 30 100 1036800 | - | | (4096) (2304) (30) (120) | + | vp9 | 3840 2160 30 100 972000 | | vc1 | 1920 1088 30 20 244800 | | div4/5/6-sw | 1920 1088 30 10 244800 | | h263-sw | 864 480 30 16 48600 | @@ -103,9 +102,9 @@ Only the three quirks included above are recognized at this point: ______________________________________________________ | Codec | W H fps Mbps MB/s | |__________|_________________________________________| - | h264 | 4096 2160 30 40 1036800 | - | vp9 | 4096 2160 30 40 1036800 | - | hevc | 4096 2160 30 40 1036800 | + | h264 | 3840 2160 30 40 972000 | + | vp9 | 3840 2160 30 40 972000 | + | hevc | 3840 2160 30 40 972000 | | mpeg2 | 1920 1088 30 40 244800 | |__________|_________________________________________| @@ -113,8 +112,8 @@ Only the three quirks included above are recognized at this point: ______________________________________________________ | Codec | W H fps Mbps MB/s | |__________|_________________________________________| - | h264 | 4096 2160 30 100 1036800 | - | hevc | 4096 2160 30 100 1036800 | + | h264 | 3840 2160 30 100 972000 | + | hevc | 3840 2160 30 100 972000 | | mpeg4-sw | 1280 720 30 4 108000 | | vp8 | 1920 1088 60 40 489600 | | h263-sw | 864 480 30 2 48600 | @@ -137,7 +136,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Limit name="concurrent-instances" max="16" /> @@ -167,7 +166,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Limit name="concurrent-instances" max="16" /> @@ -242,7 +241,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Feature name="adaptive-playback" /> @@ -258,7 +257,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-40000000" /> <Limit name="frame-rate" range="1-60" /> <Feature name="adaptive-playback" /> @@ -315,7 +314,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Feature name="adaptive-playback" /> @@ -331,7 +330,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-40000000" /> <Limit name="frame-rate" range="1-60" /> <Feature name="adaptive-playback" /> @@ -347,7 +346,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-100000000" /> <Limit name="frame-rate" range="1-240" /> <Feature name="adaptive-playback" /> @@ -363,7 +362,7 @@ Only the three quirks included above are recognized at this point: <Limit name="size" min="96x96" max="4096x2160" /> <Limit name="alignment" value="2x2" /> <Limit name="block-size" value="16x16" /> - <Limit name="blocks-per-second" min="24" max="1036800" /> + <Limit name="blocks-per-second" min="24" max="972000" /> <Limit name="bitrate" range="1-40000000" /> <Limit name="frame-rate" range="1-60" /> <Feature name="adaptive-playback" /> |