Partially revert "msm8974-common: update media codecs for M"
* The codec performance figures were measured on bacon, and do not match
the performance of the various Samsung devices.
This reverts commit 5e340af2e6.
Change-Id: I7ce0eab3bdd0c89919b3bb29d56a346de587e075
This commit is contained in:
Ethan Chen
Gerrit Code Review
parent
7ebae8d2e1
commit
9273dfb47a
@ -1,113 +0,0 @@
|
||||
<?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>
|
||||
|
||||
@ -102,7 +102,6 @@ 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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user