Merge "media: update media_codecs_performance.xml for N" into nyc-dev

1 files changed, 74 insertions, 71 deletions

diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
index 6f8fc9f..e4081ff 100644
--- a/media_codecs_performance.xml
+++ b/media_codecs_performance.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<!-- Copyright 2015 The Android Open Source Project
+<!-- Copyright 2016 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.
@@ -16,106 +16,109 @@
 
 <MediaCodecs>
     <Encoders>
+        <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="460-460" />
+            <Limit name="measured-frame-rate-352x288" range="262-262" />
+        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="456-456" />
-            <Limit name="measured-frame-rate-720x480" range="198-198" />
-            <Limit name="measured-frame-rate-1280x720" range="94-94" />
-            <Limit name="measured-frame-rate-1920x1080" range="43-43" />
+            <Limit name="measured-frame-rate-320x240" range="297-297" />
+            <Limit name="measured-frame-rate-720x480" range="113-113" />
+            <Limit name="measured-frame-rate-1280x720" range="63-63" />
+            <Limit name="measured-frame-rate-1920x1080" range="30-30" />
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="547-547" />
-            <Limit name="measured-frame-rate-352x288" range="360-360" />
+        <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="297-297" />
+            <Limit name="measured-frame-rate-720x480" range="111-111" />
+            <Limit name="measured-frame-rate-1280x720" range="54-54" />
+            <Limit name="measured-frame-rate-1920x1080" range="30-30" />
+            <Limit name="measured-frame-rate-3840x2160" range="7-7" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="509-509" />
-            <Limit name="measured-frame-rate-352x288" range="363-363" />
-            <Limit name="measured-frame-rate-640x480" range="172-172" />
+            <Limit name="measured-frame-rate-176x144" range="395-395" />
+            <Limit name="measured-frame-rate-352x288" range="203-203" />
+            <Limit name="measured-frame-rate-640x480" range="85-85" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="163-163" />
-            <Limit name="measured-frame-rate-640x360" range="144-144" />
-            <Limit name="measured-frame-rate-1280x720" range="70-70" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="452-452" />
-            <Limit name="measured-frame-rate-720x480" range="93-93" />
-            <Limit name="measured-frame-rate-1280x720" range="46-46" />
-            <Limit name="measured-frame-rate-1920x1080" range="19-19" />
+            <Limit name="measured-frame-rate-320x180" range="123-123" />
+            <Limit name="measured-frame-rate-640x360" range="118-118" />
+            <Limit name="measured-frame-rate-1280x720" range="39-39" />
+            <Limit name="measured-frame-rate-1920x1080" range="15-15" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="607-607" />
+            <Limit name="measured-frame-rate-176x144" range="222-222" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="194-194" />
+            <Limit name="measured-frame-rate-720x480" range="70-70" />
+            <Limit name="measured-frame-rate-1280x720" range="37-37" />
+            <Limit name="measured-frame-rate-1920x1080" range="15-15" />
         </MediaCodec>
         <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="567-567" />
+            <Limit name="measured-frame-rate-176x144" range="239-239" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="180-180" />
-            <Limit name="measured-frame-rate-640x360" range="120-120" />
-            <Limit name="measured-frame-rate-1280x720" range="31-31" />
-            <Limit name="measured-frame-rate-1920x1080" range="21-21" />
-        </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="403-403" />
-            <Limit name="measured-frame-rate-720x480" range="155-155" />
-            <Limit name="measured-frame-rate-1280x720" range="95-95" />
-            <Limit name="measured-frame-rate-1920x1080" range="40-40" />
-            <Limit name="measured-frame-rate-3840x2160" range="30-30" />
+            <Limit name="measured-frame-rate-320x180" range="93-93" />
+            <Limit name="measured-frame-rate-640x360" range="40-40" />
+            <Limit name="measured-frame-rate-1280x720" range="19-19" />
+            <Limit name="measured-frame-rate-1920x1080" range="9-9" />
         </MediaCodec>
     </Encoders>
     <Decoders>
-        <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="587-587" />
-            <Limit name="measured-frame-rate-720x480" range="357-357" />
-            <Limit name="measured-frame-rate-1280x720" range="155-155" />
-            <Limit name="measured-frame-rate-1920x1088" range="80-80" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="960-960" />
-            <Limit name="measured-frame-rate-352x288" range="770-770" />
+            <Limit name="measured-frame-rate-176x144" range="729-729" />
+            <Limit name="measured-frame-rate-352x288" range="766-766" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="361-361" />
+            <Limit name="measured-frame-rate-720x480" range="285-285" />
+            <Limit name="measured-frame-rate-1280x720" range="156-156" />
+            <Limit name="measured-frame-rate-1920x1088" range="75-75" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="679-679" />
-            <Limit name="measured-frame-rate-640x360" range="565-565" />
-            <Limit name="measured-frame-rate-1280x720" range="375-375" />
-            <Limit name="measured-frame-rate-1920x1080" range="205-205" />
-            <Limit name="measured-frame-rate-3840x2160" range="60-60" />
+            <Limit name="measured-frame-rate-352x288" range="425-425" />
+            <Limit name="measured-frame-rate-640x360" range="330-330" />
+            <Limit name="measured-frame-rate-720x480" range="317-317" />
+            <Limit name="measured-frame-rate-1280x720" range="216-216" />
+            <Limit name="measured-frame-rate-1920x1080" range="128-128" />
+            <Limit name="measured-frame-rate-3840x2160" range="34-34" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-480x360" range="720-720" />
+            <Limit name="measured-frame-rate-176x144" range="734-734" />
+            <Limit name="measured-frame-rate-480x360" range="657-657" />
         </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="545-545" />
-            <Limit name="measured-frame-rate-640x360" range="520-520" />
-            <Limit name="measured-frame-rate-1280x720" range="566-566" />
-            <Limit name="measured-frame-rate-1920x1080" range="368-368" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="849-849" />
-            <Limit name="measured-frame-rate-720x480" range="230-230" />
-            <Limit name="measured-frame-rate-1280x720" range="103-103" />
-            <Limit name="measured-frame-rate-1920x1080" range="46-46" />
+            <Limit name="measured-frame-rate-320x180" range="421-421" />
+            <Limit name="measured-frame-rate-640x360" range="402-402" />
+            <Limit name="measured-frame-rate-1280x720" range="443-443" />
+            <Limit name="measured-frame-rate-1920x1080" range="248-248" />
         </MediaCodec>
         <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="882-882" />
-            <Limit name="measured-frame-rate-352x288" range="875-875" />
+            <Limit name="measured-frame-rate-176x144" range="149-149" />
+        </MediaCodec>
+        <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="261-261" />
+            <Limit name="measured-frame-rate-720x480" range="87-87" />
+            <Limit name="measured-frame-rate-1280x720" range="40-40" />
+            <Limit name="measured-frame-rate-1920x1080" range="20-20" />
         </MediaCodec>
         <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="644-644" />
-            <Limit name="measured-frame-rate-640x360" range="332-332" />
-            <Limit name="measured-frame-rate-1280x720" range="140-140" />
-            <Limit name="measured-frame-rate-1920x1080" range="76-76" />
+            <Limit name="measured-frame-rate-352x288" range="246-246" />
+            <Limit name="measured-frame-rate-640x360" range="103-103" />
+            <Limit name="measured-frame-rate-720x480" range="92-92" />
+            <Limit name="measured-frame-rate-1280x720" range="37-37" />
+            <Limit name="measured-frame-rate-1920x1080" range="18-18" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="1005-1005" />
-            <Limit name="measured-frame-rate-640x360" range="342-342" />
-            <Limit name="measured-frame-rate-1280x720" range="62-62" />
-            <Limit name="measured-frame-rate-1920x1080" range="51-51" />
+            <Limit name="measured-frame-rate-320x180" range="375-375" />
+            <Limit name="measured-frame-rate-640x360" range="120-120" />
+            <Limit name="measured-frame-rate-1280x720" range="29-29" />
+            <Limit name="measured-frame-rate-1920x1080" range="13-13" />
         </MediaCodec>
         <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="407-407" />
-            <Limit name="measured-frame-rate-640x360" range="336-336" />
-            <Limit name="measured-frame-rate-1280x720" range="131-131" />
-            <Limit name="measured-frame-rate-1920x1080" range="77-77" />
+            <Limit name="measured-frame-rate-320x180" range="226-226" />
+            <Limit name="measured-frame-rate-640x360" range="92-92" />
+            <Limit name="measured-frame-rate-1280x720" range="36-36" />
+            <Limit name="measured-frame-rate-1920x1080" range="21-21" />
         </MediaCodec>
     </Decoders>
 </MediaCodecs>