msm8974-common: update media codecs for M

* Kanged from bacon

Change-Id: I31047a4aff2dd08d52dd0ebacab855dd99403f0d
This commit is contained in:
Matt Filetto 2015-11-10 00:06:54 -08:00 committed by Ethan Chen
parent 52e401a735
commit 5e340af2e6
3 changed files with 163 additions and 34 deletions

View File

@ -34,7 +34,8 @@
|__________|_________________________________________|
| h264 | 3840 2160 30 100 972000 |
| | 4096 2160 24 100 829440 |
| hevc | 1920 1088 30 6 244800 |
| hevc | 1280 720 30 2 108000 |
| hevchybd | 1920 1088 30 6 244800 |
| mpeg4 | 1920 1088 60 60 489600 |
| vc1 | 1920 1088 60 60 489600 |
| vp8 | 3820 2160 30 20 972000 |
@ -49,16 +50,10 @@
<MediaCodecs>
<Include href="media_codecs_google_audio.xml" />
<Include href="media_codecs_google_telephony.xml" />
<Settings>
<Setting name="max-video-encoder-input-buffers" value="9" />
</Settings>
<Encoders>
<!-- Audio Hardware -->
<MediaCodec name="OMX.qcom.audio.encoder.evrc" type="audio/evrc" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
</MediaCodec>
<MediaCodec name="OMX.qcom.audio.encoder.qcelp13" type="audio/qcelp" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
</MediaCodec>
<!-- Video Hardware -->
<MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
<Quirk name="requires-allocate-on-input-ports" />
@ -69,6 +64,7 @@
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="972000" />
<Limit name="bitrate" range="1-100000000" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" />
@ -79,6 +75,7 @@
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="244800" />
<Limit name="bitrate" range="1-40000000" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
<Quirk name="requires-allocate-on-input-ports" />
@ -89,6 +86,7 @@
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="48600" />
<Limit name="bitrate" range="1-2000000" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
<Quirk name="requires-allocate-on-input-ports" />
@ -99,29 +97,11 @@
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="244800" />
<Limit name="bitrate" range="1-20000000" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
</Encoders>
<Decoders>
<!-- Audio Hardware -->
<MediaCodec name="OMX.qcom.audio.decoder.wma" type="audio/x-ms-wma" >
<Quirk name="requires-global-flush" />
<Quirk name="requires-wma-pro-component" />
</MediaCodec>
<MediaCodec name="OMX.qcom.audio.decoder.wmaLossLess" type="audio/x-ms-wma" >
<Quirk name="requires-global-flush" />
</MediaCodec>
<MediaCodec name="OMX.qcom.audio.decoder.wma10Pro" type="audio/x-ms-wma" >
<Quirk name="requires-global-flush" />
</MediaCodec>
<MediaCodec name="OMX.qcom.audio.decoder.amrwbplus" type="audio/amr-wb-plus" >
</MediaCodec>
<MediaCodec name="OMX.qcom.audio.decoder.Qcelp13" type="audio/qcelp" >
<Quirk name="requires-global-flush" />
</MediaCodec>
<MediaCodec name="OMX.qcom.audio.decoder.evrc" type="audio/evrc" >
<Quirk name="requires-global-flush" />
</MediaCodec>
<!-- Video Hardware -->
<MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" >
<Quirk name="requires-allocate-on-input-ports" />
@ -132,6 +112,19 @@
<Limit name="blocks-per-second" min="1" max="972000" />
<Limit name="bitrate" range="1-100000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<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="64x64" max="4096x2160" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="972000" />
<Limit name="bitrate" range="1-100000000" />
<Feature name="adaptive-playback" />
<Feature name="secure-playback" required="true" />
<Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.mpeg2" type="video/mpeg2" >
<Quirk name="requires-allocate-on-input-ports" />
@ -142,6 +135,19 @@
<Limit name="blocks-per-second" min="1" max="244800" />
<Limit name="bitrate" range="1-40000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.mpeg2.secure" type="video/mpeg2" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
<Limit name="size" min="96x64" max="1920x1088" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="244800" />
<Limit name="bitrate" range="1-40000000" />
<Feature name="adaptive-playback" />
<Feature name="secure-playback" required="true" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" />
@ -152,6 +158,7 @@
<Limit name="blocks-per-second" min="1" max="489600" />
<Limit name="bitrate" range="1-60000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" >
<Quirk name="requires-allocate-on-input-ports" />
@ -162,6 +169,7 @@
<Limit name="blocks-per-second" min="1" max="48600" />
<Limit name="bitrate" range="1-2000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.vc1" type="video/x-ms-wmv" >
<Quirk name="requires-allocate-on-input-ports" />
@ -172,6 +180,7 @@
<Limit name="blocks-per-second" min="1" max="489600" />
<Limit name="bitrate" range="1-60000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.divx" type="video/divx" >
<Quirk name="requires-allocate-on-input-ports" />
@ -182,6 +191,7 @@
<Limit name="blocks-per-second" min="1" max="244800" />
<Limit name="bitrate" range="1-10000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.divx311" type="video/divx311" >
<Quirk name="requires-allocate-on-input-ports" />
@ -192,6 +202,7 @@
<Limit name="blocks-per-second" min="1" max="40500" />
<Limit name="bitrate" range="1-2000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.divx4" type="video/divx4" >
<Quirk name="requires-allocate-on-input-ports" />
@ -202,6 +213,7 @@
<Limit name="blocks-per-second" min="1" max="244800" />
<Limit name="bitrate" range="1-10000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
<Quirk name="requires-allocate-on-input-ports" />
@ -212,16 +224,18 @@
<Limit name="blocks-per-second" min="1" max="972000" />
<Limit name="bitrate" range="1-20000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="13" />
</MediaCodec>
<!--
<MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" >
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
<Limit name="size" min="64x64" max="1920x1088" />
<Limit name="size" min="64x64" max="1280x720" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="244800" />
<Limit name="bitrate" range="1-6000000" />
<Limit name="blocks-per-second" min="1" max="108000" />
<Limit name="bitrate" range="1-2000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="3" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.hevchybrid" type="video/hevc" >
<Quirk name="requires-allocate-on-input-ports" />
@ -231,8 +245,9 @@
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="244800" />
<Limit name="bitrate" range="1-6000000" />
<Feature name="adaptive-playback" />
<Limit name="concurrent-instances" max="2" />
</MediaCodec>
-->
</Decoders>
<Include href="media_codecs_google_video.xml" />
<Include href="media_codecs_ffmpeg.xml" />

View File

@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Copyright (c) 2015, The Linux Foundation. All rights reserved.
Not a Contribution.
Copyright 2015 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<MediaCodecs>
<Encoders>
<MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="561-561" />
<Limit name="measured-frame-rate-720x480" range="281-281" />
<Limit name="measured-frame-rate-1280x720" range="123-123" />
<Limit name="measured-frame-rate-1920x1080" range="78-78" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
<Limit name="measured-frame-rate-176x144" range="179-179" />
<Limit name="measured-frame-rate-352x288" range="173-173" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
<Limit name="measured-frame-rate-176x144" range="173-173" />
<Limit name="measured-frame-rate-352x288" range="192-192" />
<Limit name="measured-frame-rate-640x480" range="174-174" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x180" range="93-93" />
<Limit name="measured-frame-rate-640x360" range="90-90" />
<Limit name="measured-frame-rate-1280x720" range="79-79" />
<Limit name="measured-frame-rate-1920x1080" range="42-42" />
</MediaCodec>
<MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="387-387" />
<Limit name="measured-frame-rate-720x480" range="237-237" />
<Limit name="measured-frame-rate-1280x720" range="108-108" />
<Limit name="measured-frame-rate-1920x1080" range="45-45" />
</MediaCodec>
<MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
<Limit name="measured-frame-rate-176x144" range="900-900" />
</MediaCodec>
<MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
<Limit name="measured-frame-rate-176x144" range="1145-1145" />
</MediaCodec>
<MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x180" range="461-461" />
<Limit name="measured-frame-rate-640x360" range="214-214" />
<Limit name="measured-frame-rate-1280x720" range="99-99" />
<Limit name="measured-frame-rate-1920x1080" range="39-39" />
</MediaCodec>
</Encoders>
<Decoders>
<MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="453-453" />
<Limit name="measured-frame-rate-720x480" range="249-249" />
<Limit name="measured-frame-rate-1280x720" range="103-103" />
<Limit name="measured-frame-rate-1920x1088" range="46-46" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
<Limit name="measured-frame-rate-176x144" range="513-513" />
<Limit name="measured-frame-rate-352x288" range="282-282" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
<Limit name="measured-frame-rate-480x360" range="263-263" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x240" range="210-210" />
<Limit name="measured-frame-rate-640x360" range="191-191" />
<Limit name="measured-frame-rate-1280x720" range="537-537" />
<Limit name="measured-frame-rate-1920x1080" range="325-325" />
</MediaCodec>
<MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="396-396" />
<Limit name="measured-frame-rate-720x480" range="279-279" />
<Limit name="measured-frame-rate-1280x720" range="138-138" />
<Limit name="measured-frame-rate-1920x1080" range="41-41" />
</MediaCodec>
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
<Limit name="measured-frame-rate-176x144" range="1200-1200" />
<Limit name="measured-frame-rate-352x288" range="923-923" />
</MediaCodec>
<MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
<Limit name="measured-frame-rate-352x288" range="1883-1883" />
<Limit name="measured-frame-rate-720x480" range="516-516" />
<Limit name="measured-frame-rate-1280x720" range="234-234" />
<Limit name="measured-frame-rate-1920x1080" range="106-106" />
</MediaCodec>
<MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x240" range="1644-1644" />
<Limit name="measured-frame-rate-640x360" range="513-513" />
<Limit name="measured-frame-rate-1280x720" range="106-106" />
<Limit name="measured-frame-rate-1920x1080" range="93-93" />
</MediaCodec>
<MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
<Limit name="measured-frame-rate-320x240" range="535-535" />
<Limit name="measured-frame-rate-640x360" range="480-480" />
<Limit name="measured-frame-rate-1280x720" range="144-144" />
<Limit name="measured-frame-rate-1920x1080" range="95-95" />
</MediaCodec>
</Decoders>
</MediaCodecs>

View File

@ -105,6 +105,7 @@ PRODUCT_COPY_FILES += \
frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \
frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \
device/samsung/msm8974-common/configs/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \
device/samsung/msm8974-common/configs/media_codecs.xml:system/etc/media_codecs.xml
# OMX