merge in nyc-mr1-release history after reset to nyc-mr1-dev
diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
index aae63f4..e1f9330 100644
--- a/media_codecs_performance.xml
+++ b/media_codecs_performance.xml
@@ -17,117 +17,108 @@
<MediaCodecs>
<Encoders>
<MediaCodec name="OMX.Nvidia.h264.encoder" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="305-330" /> <!-- N=240 v98%=1.3 -->
- <Limit name="measured-frame-rate-720x480" range="195-202" /> <!-- N=240 v98%=1.3 -->
- <Limit name="measured-frame-rate-1280x720" range="114-114" /> <!-- N=235 v98%=1.2 -->
- <Limit name="measured-frame-rate-1920x1080" range="68-68" /> <!-- N=234 v98%=1.6 -->
+ <Limit name="measured-frame-rate-320x240" range="280-289" /> <!-- N=38 v93%=1.1 -->
+ <!-- measured 93%:152-276 med:168 SLOW -->
+ <Limit name="measured-frame-rate-720x480" range="168-205" /> <!-- N=38 v93%=1.3 -->
+ <!-- measured 93%:83-139 med:90 SLOW -->
+ <Limit name="measured-frame-rate-1280x720" range="89-108" /> <!-- N=38 v93%=1.3 -->
+ <Limit name="measured-frame-rate-1920x1080" range="88-88" /> <!-- N=38 v93%=1.4 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="288-288" /> <!-- N=239 v98%=1.2 -->
- <Limit name="measured-frame-rate-640x360" range="218-228" /> <!-- N=239 v98%=1.2 -->
- <Limit name="measured-frame-rate-1280x720" range="111-111" /> <!-- N=240 v98%=1.2 -->
- <Limit name="measured-frame-rate-1920x1080" range="57-57" /> <!-- N=240 v98%=1.2 -->
+ <Limit name="measured-frame-rate-320x180" range="265-273" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-640x360" range="196-215" /> <!-- N=38 v93%=1.2 -->
+ <Limit name="measured-frame-rate-1280x720" range="104-114" /> <!-- N=38 v93%=1.2 -->
+ <Limit name="measured-frame-rate-1920x1080" range="67-67" /> <!-- N=38 v93%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="455-455" /> <!-- N=244 v98%=1.4 -->
+ <Limit name="measured-frame-rate-176x144" range="646-653" /> <!-- N=38 v93%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="310-310" /> <!-- N=240 v98%=1.8 -->
- <Limit name="measured-frame-rate-720x480" range="103-103" /> <!-- N=240 v98%=1.7 -->
- <Limit name="measured-frame-rate-1280x720" range="51-51" /> <!-- N=239 v98%=1.7 -->
- <Limit name="measured-frame-rate-1920x1080" range="25-25" /> <!-- N=236 v98%=1.5 -->
+ <Limit name="measured-frame-rate-320x240" range="481-481" /> <!-- N=38 v93%=1.2 -->
+ <Limit name="measured-frame-rate-720x480" range="138-138" /> <!-- N=38 v93%=1.2 -->
+ <Limit name="measured-frame-rate-1280x720" range="72-75" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-1920x1080" range="36-36" /> <!-- N=38 v93%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
- <Limit name="measured-frame-rate-176x144" range="488-488" /> <!-- N=240 v98%=1.4 -->
+ <Limit name="measured-frame-rate-176x144" range="744-744" /> <!-- N=38 v93%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="132-132" /> <!-- N=240 v98%=1.3 -->
- <Limit name="measured-frame-rate-640x360" range="67-67" /> <!-- N=240 v98%=1.3 -->
- <Limit name="measured-frame-rate-1280x720" range="28-28" /> <!-- N=240 v98%=1.4 -->
- <Limit name="measured-frame-rate-1920x1080" range="15-15" /> <!-- N=240 v98%=1.4 -->
+ <Limit name="measured-frame-rate-320x180" range="139-145" /> <!-- N=38 v93%=1.2 -->
+ <Limit name="measured-frame-rate-640x360" range="85-85" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-1280x720" range="35-35" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-1920x1080" range="18-19" /> <!-- N=38 v93%=1.1 -->
</MediaCodec>
</Encoders>
<Decoders>
<MediaCodec name="OMX.Nvidia.h263.decode" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="1497-1604" /> <!-- N=241 v98%=1.7 -->
- <Limit name="measured-frame-rate-352x288" range="1531-1550" /> <!-- N=242 v98%=1.6 -->
+ <Limit name="measured-frame-rate-176x144" range="1967-1967" /> <!-- N=38 v93%=1.5 -->
+ <Limit name="measured-frame-rate-352x288" range="1897-1897" /> <!-- N=38 v93%=1.4 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.h264.decode" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="1469-1469" /> <!-- N=242 v98%=1.5 -->
- <!-- measured 98%:213-1018 med:973 FLAKY(mn=187.3 < 214 - 1018 < mx=1021.5) variance:2.2 -->
- <Limit name="measured-frame-rate-720x480" range="427-509" /> <!-- N=244 -->
- <!-- measured 98%:83-480 med:465 FLAKY(83 - 480) variance:2.4 -->
- <Limit name="measured-frame-rate-1280x720" range="166-240" /> <!-- N=244 -->
- <!-- measured 98%:38-226 med:208 variance:2.4 -->
- <Limit name="measured-frame-rate-1920x1088" range="76-113" /> <!-- N=244 -->
+ <Limit name="measured-frame-rate-320x240" range="1816-1816" /> <!-- N=38 v93%=1.2 -->
+ <Limit name="measured-frame-rate-720x480" range="994-995" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-1280x720" range="471-471" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-1920x1088" range="210-210" /> <!-- N=38 v93%=1.0 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.h265.decode" type="video/hevc" update="true">
- <Limit name="measured-frame-rate-352x288" range="1536-1612" /> <!-- N=244 v98%=1.6 -->
- <Limit name="measured-frame-rate-640x368" range="1436-1436" /> <!-- N=243 v98%=1.6 -->
- <!-- measured 98%:457-1842 med:1321 FLAKY(mn=456.2 < 457 - 1842 < mx=1901.1) variance:2.0 -->
- <Limit name="measured-frame-rate-720x480" range="914-921" /> <!-- N=243 -->
- <!-- measured 98%:115-720 med:691 FLAKY(mn=105.5 < 116 - 720 < mx=723.1) variance:2.5 -->
- <Limit name="measured-frame-rate-1280x720" range="231-360" /> <!-- N=243 -->
- <!-- measured 90%:37-362 med:352 FLAKY(mn=35.7 < 42 - 362) RG.VARIANCE:2.1 -->
- <Limit name="measured-frame-rate-1920x1088" range="83-181" /> <!-- N=244 v90%=3.1 -->
- <!-- measured 90%:10-91 med:89 FLAKY(mn=10.4 < 11 - 92) RG.VARIANCE:2.0 -->
- <Limit name="measured-frame-rate-3840x2160" range="21-46" /> <!-- N=242 v90%=2.9 -->
+ <!-- measured 93%:1355-2968 med:1667 SLOW -->
+ <Limit name="measured-frame-rate-352x288" range="1666-2005" /> <!-- N=38 v93%=1.5 -->
+ <Limit name="measured-frame-rate-640x368" range="1770-1770" /> <!-- N=38 v93%=1.3 -->
+ <Limit name="measured-frame-rate-720x480" range="1526-1526" /> <!-- N=38 v93%=1.2 -->
+ <Limit name="measured-frame-rate-1280x720" range="701-701" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-1920x1088" range="355-355" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-3840x2160" range="89-89" /> <!-- N=38 v93%=1.0 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.mp4.decode" type="video/mp4v-es" update="true">
- <Limit name="measured-frame-rate-176x144" range="1501-1576" /> <!-- N=243 v98%=1.6 -->
- <Limit name="measured-frame-rate-480x368" range="1515-1553" /> <!-- N=244 v98%=1.7 -->
+ <!-- measured 93%:1394-3077 med:1761 SLOW -->
+ <Limit name="measured-frame-rate-176x144" range="1760-2072" /> <!-- N=38 v93%=1.5 -->
+ <Limit name="measured-frame-rate-480x368" range="2034-2034" /> <!-- N=38 v93%=1.6 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.vp8.decode" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x192" range="1548-1548" /> <!-- N=243 v98%=1.7 -->
- <!-- measured 98%:299-2037 med:1372 FLAKY(mn=294.6 < 299 - 2038 < mx=2074.7) variance:2.6 -->
- <Limit name="measured-frame-rate-640x368" range="598-1019" /> <!-- N=244 -->
- <Limit name="measured-frame-rate-1280x720" range="425-425" /> <!-- N=222 v98%=1.5 -->
- <Limit name="measured-frame-rate-1920x1088" range="208-208" /> <!-- N=222 v98%=1.4 -->
+ <Limit name="measured-frame-rate-320x192" range="1718-1874" /> <!-- N=38 v93%=1.4 -->
+ <Limit name="measured-frame-rate-640x368" range="1364-1364" /> <!-- N=38 v93%=1.4 -->
+ <Limit name="measured-frame-rate-1280x720" range="460-460" /> <!-- N=38 v93%=1.2 -->
+ <Limit name="measured-frame-rate-1920x1088" range="233-233" /> <!-- N=38 v93%=1.1 -->
</MediaCodec>
<MediaCodec name="OMX.Nvidia.vp9.decode" type="video/x-vnd.on2.vp9" update="true">
- <Limit name="measured-frame-rate-320x180" range="1265-1415" /> <!-- N=244 v98%=1.5 -->
- <!-- measured 98%:343-1722 med:1181 FLAKY(mn=330.9 < 343 - 1722 < mx=1821.5) variance:2.2 -->
- <Limit name="measured-frame-rate-640x360" range="686-861" /> <!-- N=244 -->
- <!-- measured 98%:66-518 med:442 FLAKY(mn=60.7 < 66 - 518 < mx=519.5) variance:2.8 -->
- <Limit name="measured-frame-rate-1280x720" range="132-259" /> <!-- N=244 -->
- <!-- measured 90%:33-301 med:245 FLAKY(mn=30.9 < 35 - 300 < mx=302.5) RG.VARIANCE:2.1 -->
- <Limit name="measured-frame-rate-1920x1080" range="69-150" /> <!-- N=242 v90%=3.0 -->
- <!-- measured 90%:8-71 med:63 FLAKY(mn=7.9 < 8 - 70 < mx=70.6) RG.VARIANCE:2.1 -->
- <Limit name="measured-frame-rate-3840x2160" range="16-35" /> <!-- N=240 v90%=3.0 -->
+ <!-- measured 93%:1107-2778 med:1305 SLOW -->
+ <Limit name="measured-frame-rate-320x180" range="1305-1754" /> <!-- N=38 v93%=1.6 -->
+ <Limit name="measured-frame-rate-640x360" range="1253-1284" /> <!-- N=38 v93%=1.4 -->
+ <Limit name="measured-frame-rate-1280x720" range="428-428" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-1920x1080" range="246-246" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-3840x2160" range="63-64" /> <!-- N=38 v93%=1.0 -->
</MediaCodec>
<MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="825-870" /> <!-- N=244 v98%=1.4 -->
+ <!-- measured 93%:704-1170 med:792 SLOW -->
+ <Limit name="measured-frame-rate-176x144" range="792-908" /> <!-- N=38 v93%=1.3 -->
</MediaCodec>
<MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
- <!-- measured 98%:140-618 med:352 FLAKY(mn=106.1 < 140 - 618 < mx=629.3) variance:2.1 -->
- <Limit name="measured-frame-rate-320x240" range="280-309" /> <!-- N=243 -->
- <Limit name="measured-frame-rate-720x480" range="111-118" /> <!-- N=243 v98%=1.6 -->
- <Limit name="measured-frame-rate-1280x720" range="41-44" /> <!-- N=244 v98%=1.6 -->
- <Limit name="measured-frame-rate-1920x1080" range="18-19" /> <!-- N=244 v98%=1.6 -->
+ <Limit name="measured-frame-rate-320x240" range="478-478" /> <!-- N=38 v93%=1.3 -->
+ <Limit name="measured-frame-rate-720x480" range="181-181" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-1280x720" range="70-70" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-1920x1080" range="31-32" /> <!-- N=38 v93%=1.0 -->
</MediaCodec>
<MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
- <!-- measured 98%:144-676 med:285 FLAKY(mn=113.1 < 142 - 676 < mx=709.7) variance:2.2 -->
- <Limit name="measured-frame-rate-352x288" range="284-338" /> <!-- N=244 -->
- <Limit name="measured-frame-rate-640x360" range="159-171" /> <!-- N=240 v98%=1.9 -->
- <Limit name="measured-frame-rate-720x480" range="122-140" /> <!-- N=244 v98%=1.9 -->
- <Limit name="measured-frame-rate-1280x720" range="50-55" /> <!-- N=243 v98%=1.9 -->
- <Limit name="measured-frame-rate-1920x1080" range="26-29" /> <!-- N=244 v98%=1.7 -->
+ <Limit name="measured-frame-rate-352x288" range="677-685" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-640x360" range="320-320" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-720x480" range="275-275" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-1280x720" range="106-106" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-1920x1080" range="49-50" /> <!-- N=38 v93%=1.0 -->
</MediaCodec>
<MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
- <Limit name="measured-frame-rate-176x144" range="936-950" /> <!-- N=244 v98%=1.3 -->
+ <Limit name="measured-frame-rate-176x144" range="881-930" /> <!-- N=38 v93%=1.4 -->
</MediaCodec>
<MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="626-628" /> <!-- N=244 v98%=1.5 -->
- <Limit name="measured-frame-rate-640x360" range="189-219" /> <!-- N=242 v98%=1.5 -->
- <Limit name="measured-frame-rate-1280x720" range="38-47" /> <!-- N=244 v98%=1.4 -->
- <Limit name="measured-frame-rate-1920x1080" range="15-19" /> <!-- N=244 v98%=1.4 -->
+ <Limit name="measured-frame-rate-320x180" range="900-904" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-640x360" range="314-314" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-1280x720" range="67-67" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-1920x1080" range="26-27" /> <!-- N=38 v93%=1.0 -->
</MediaCodec>
<MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
- <Limit name="measured-frame-rate-320x180" range="426-454" /> <!-- N=244 v98%=1.5 -->
- <!-- measured 98%:83-321 med:187 FLAKY(82 - 326 < mx=331.8) -->
- <Limit name="measured-frame-rate-640x360" range="163-163" /> <!-- N=244 v98%=2.0 -->
- <Limit name="measured-frame-rate-1280x720" range="49-49" /> <!-- N=244 v98%=1.9 -->
- <Limit name="measured-frame-rate-1920x1080" range="29-30" /> <!-- N=243 v98%=1.7 -->
+ <Limit name="measured-frame-rate-320x180" range="635-637" /> <!-- N=38 v93%=1.1 -->
+ <Limit name="measured-frame-rate-640x360" range="315-315" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-1280x720" range="91-92" /> <!-- N=38 v93%=1.0 -->
+ <Limit name="measured-frame-rate-1920x1080" range="50-51" /> <!-- N=38 v93%=1.0 -->
</MediaCodec>
</Decoders>
</MediaCodecs>
