diff --git a/device.mk b/device.mk
index d75c309c..12190d58 100755
--- a/device.mk
+++ b/device.mk
@@ -436,6 +436,7 @@ PRODUCT_COPY_FILES += \
 
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/media_codecs.xml:system/etc/media_codecs.xml \
+    $(LOCAL_PATH)/media_codecs_performance.xml:system/etc/media_codecs_performance.xml \
     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 \
diff --git a/media_codecs_performance.xml b/media_codecs_performance.xml
new file mode 100644
index 00000000..ab9a42e9
--- /dev/null
+++ b/media_codecs_performance.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- 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.
+     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.h263" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="107-108" /> <!-- N=54 v96%=1.3 -->
+            <Limit name="measured-frame-rate-352x288" range="86-86" /> <!-- N=54 v96%=1.4 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="91-91" /> <!-- N=54 v96%=1.4 -->
+            <Limit name="measured-frame-rate-720x480" range="55-57" /> <!-- N=54 v96%=1.3 -->
+            <Limit name="measured-frame-rate-1280x720" range="33-33" /> <!-- N=54 v96%=1.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="21-24" /> <!-- N=54 v96%=1.3 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.hevc" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="92-92" /> <!-- N=54 v96%=1.4 -->
+            <Limit name="measured-frame-rate-720x480" range="54-57" /> <!-- N=54 v96%=1.3 -->
+            <Limit name="measured-frame-rate-1280x720" range="33-33" /> <!-- N=54 v96%=1.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="23-26" /> <!-- N=54 v96%=1.3 -->
+            <Limit name="measured-frame-rate-3840x2160" range="21-21" /> <!-- N=54 v96%=1.5 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="104-104" /> <!-- N=54 v96%=1.4 -->
+            <Limit name="measured-frame-rate-352x288" range="75-82" /> <!-- N=54 v96%=1.5 -->
+            <Limit name="measured-frame-rate-640x480" range="59-63" /> <!-- N=54 v96%=1.4 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x180" range="89-89" /> <!-- N=54 v96%=1.4 -->
+            <Limit name="measured-frame-rate-640x360" range="59-64" /> <!-- N=54 v96%=1.4 -->
+            <Limit name="measured-frame-rate-1280x720" range="30-30" /> <!-- N=54 v96%=1.4 -->
+            <Limit name="measured-frame-rate-1920x1080" range="21-21" /> <!-- N=54 v96%=1.5 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="130-130" /> <!-- N=54 v96%=1.4 -->
+        </MediaCodec>
+	<MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="243-243" /> <!-- N=54 v96%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="117-120" /> <!-- N=54 v96%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="69-69" /> <!-- N=54 v96%=1.3 -->
+            <Limit name="measured-frame-rate-1920x1080" range="29-29" /> <!-- N=54 v96%=1.6 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="126-127" /> <!-- N=54 v96%=1.4 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x180" range="82-83" /> <!-- N=54 v96%=1.5 -->
+            <!-- measured 96%:36-56 med:40 SLOW -->
+            <Limit name="measured-frame-rate-640x360" range="39-45" /> <!-- N=54 v96%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="35-35" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="18-18" /> <!-- N=54 v96%=1.2 -->
+        </MediaCodec>
+    </Encoders>
+    <Decoders>
+        <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="151-151" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-352x288" range="148-149" /> <!-- N=54 v96%=1.0 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.avc" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="216-237" /> <!-- N=54 v96%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="152-154" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="276-276" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1088" range="172-172" /> <!-- N=54 v96%=1.1 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.hevc" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-352x288" range="297-297" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="211-212" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-720x480" range="169-170" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="82-82" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="240-242" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-3840x2160" range="68-69" /> <!-- N=54 v96%=1.0 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="146-146" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-480x360" range="144-144" /> <!-- N=54 v96%=1.0 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x180" range="351-351" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="263-263" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="297-297" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="245-245" /> <!-- N=54 v96%=1.0 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.vp9" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="279-279" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-640x360" range="240-240" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-1280x720" range="289-289" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="260-260" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-3840x2160" range="45-45" /> <!-- N=54 v96%=1.0 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="169-181" /> <!-- N=54 v96%=1.1 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
+            <Limit name="measured-frame-rate-320x240" range="280-286" /> <!-- N=54 v96%=1.2 -->
+            <Limit name="measured-frame-rate-720x480" range="119-119" /> <!-- N=54 v96%=1.2 -->
+            <Limit name="measured-frame-rate-1280x720" range="59-60" /> <!-- N=54 v96%=1.2 -->
+            <Limit name="measured-frame-rate-1920x1080" range="29-29" /> <!-- N=54 v96%=1.1 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
+            <Limit name="measured-frame-rate-352x288" range="479-479" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="283-283" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-720x480" range="249-249" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="116-116" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="62-62" /> <!-- N=54 v96%=1.1 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="198-209" /> <!-- N=54 v96%=1.1 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
+            <Limit name="measured-frame-rate-320x180" range="812-812" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="328-328" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="75-76" /> <!-- N=54 v96%=1.0 -->
+            <Limit name="measured-frame-rate-1920x1080" range="32-33" /> <!-- N=54 v96%=1.0 -->
+        </MediaCodec>
+        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
+            <Limit name="measured-frame-rate-320x180" range="516-516" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-640x360" range="164-167" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-1280x720" range="77-77" /> <!-- N=54 v96%=1.1 -->
+            <Limit name="measured-frame-rate-1920x1080" range="46-46" /> <!-- N=54 v96%=1.1 -->
+        </MediaCodec>
+    </Decoders>
+</MediaCodecs>