diff --git a/configs/media_codecs_performance.xml b/configs/media_codecs_performance.xml
new file mode 100644
index 0000000..7e4a82c
--- /dev/null
+++ b/configs/media_codecs_performance.xml
@@ -0,0 +1,141 @@
+<?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="462-462" />
+            <Limit name="measured-frame-rate-352x288" range="291-291" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-176x144" range="502-502" />
+            <Limit name="measured-frame-rate-352x288" range="312-312" />
+            <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.SEC.avc.sw.dec" type="video/avc" update="true" >
+            <Limit name="measured-frame-rate-320x240" range="700-900" />
+            <Limit name="measured-frame-rate-720x480" range="200-250" />
+            <Limit name="measured-frame-rate-1280x720" range="75-100" />
+            <Limit name="measured-frame-rate-1920x1080" range="15-25" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" update="true">
+            <Limit name="measured-frame-rate-176x144" range="1089-1089" />
+            <Limit name="measured-frame-rate-352x288" range="842-842" />
+        </MediaCodec>
+        <MediaCodec name="OMX.SEC.h263.sw.dec" type="video/3gpp" update="true" >
+            <Limit name="measured-frame-rate-176x144" range="300-430" />
+            <Limit name="measured-frame-rate-352x288" range="240-336" />
+        </MediaCodec>
+        <MediaCodec name="OMX.SEC.hevc.sw.dec" type="video/hevc" update="true" >
+            <Limit name="measured-frame-rate-320x240" range="400-480" />
+            <Limit name="measured-frame-rate-720x480" range="200-240" />
+            <Limit name="measured-frame-rate-1280x720" range="100-120" />
+            <Limit name="measured-frame-rate-1920x1080" range="50-60" />
+        </MediaCodec>
+        <MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" update="true">
+            <Limit name="measured-frame-rate-480x360" range="798-798" />
+        </MediaCodec>
+        <MediaCodec name="OMX.SEC.mpeg4.sw.dec" type="video/mp4v-es" update="true" >
+            <Limit name="measured-frame-rate-320x240" range="1000-1200" />
+            <Limit name="measured-frame-rate-720x480" range="200-400" />
+            <Limit name="measured-frame-rate-1280x720" range="100-200" />
+            <Limit name="measured-frame-rate-1920x1080" range="50-100" />
+        </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.SEC.vp8.dec" type="video/x-vnd.on2.vp8" update="true" >
+            <Limit name="measured-frame-rate-320x240" range="400-480" />
+            <Limit name="measured-frame-rate-720x480" range="200-240" />
+            <Limit name="measured-frame-rate-1280x720" range="100-120" />
+            <Limit name="measured-frame-rate-1920x1080" range="50-60" />
+        </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>
+
diff --git a/klte.mk b/klte.mk
index dc34d4c..03397b4 100644
--- a/klte.mk
+++ b/klte.mk
@@ -99,7 +99,8 @@ PRODUCT_PACKAGES += \
 
 # Media
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml
+    $(LOCAL_PATH)/configs/media_profiles.xml:system/etc/media_profiles.xml \
+    $(LOCAL_PATH)/configs/media_codecs_performance.xml:system/etc/media_codecs_performance.xml
 
 # NFC
 PRODUCT_PACKAGES += \