diff --git a/media_codecs.xml b/media_codecs.xml
index d0ccd2b4..f17b3312 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -82,22 +82,32 @@ Only the three quirks included above are recognized at this point:
 -->
 
 <!--
-  Decoder capabilities for sdm660
-   __________ _________________________________________ ___________________
-  | Codec    | W       H       fps     Mbps    MB/s    | Encode Secure-dec |
-  |__________|_________________________________________|___________________|
-  | hevc     | 3840    2160    30      100     972000  |  Y       Y        |
-  | h264     | 3840    2160    30      100     972000  |  Y       Y        |
-  | h263     |  864     480    30        2      48600  |  Y       N        |
-  | mpeg4    | 1920    1088    60       60     489600  |  Y       N        |
-  | mpeg2    | 1920    1088    30       40     244800  |  N       Y        |
-  | vc1      | 1920    1088    60       60     489600  |  N       N        |
-  | vp8      | 3840    2160    30      100     972000  |  Y       N        |
-  | vp9      | 3840    2160    30      100     972000  |  N       Y        |
-  | divx3    |  720     480    30        2      40500  |  N       N        |
-  | div4/5/6 | 1920    1088    30       10     244800  |  N       N        |
-  |__________|_________________________________________|___________________|
+  Non secure decoder capabilities for sdm660
+   __________ _________________________________________
+  | Codec    | W       H       fps     Mbps    MB/s    |
+  |__________|_________________________________________|
+  | hevc     | 3840    2160    30      100     972000  |
+  | h264     | 3840    2160    30      100     972000  |
+  | h263     |  864     480    30        2      48600  |
+  | mpeg4    | 1920    1088    60       60     489600  |
+  | mpeg2    | 1920    1088    30       40     244800  |
+  | vc1      | 1920    1088    60       60     489600  |
+  | vp8      | 3840    2160    30      100     972000  |
+  | vp9      | 3840    2160    30      100     972000  |
+  | divx3    |  720     480    30        2      40500  |
+  | div4/5/6 | 1920    1088    30       10     244800  |
+  |__________|_________________________________________|
 
+  sdm660 secure decoder capabilities
+   ______________________________________________________
+ | Codec    | W       H       fps     Mbps    MB/s    |
+ |__________|_________________________________________|
+ | h264     | 3840    2160    30      35      972000 |
+ | hevc     | 3840    2160    30      35      972000 |
+ | VP9      | 3840    2160    30      35      979200  |
+ | vc1      | 1920    1088    30      20      489600  |
+ | mpeg2    | 1920    1088    30      20      244800  |
+ |__________|_________________________________________|
 -->
 
 <!--
@@ -207,7 +217,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="972000" />
-            <Limit name="bitrate" range="1-100000000" />
+            <Limit name="bitrate" range="1-35000000" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="6" />
@@ -230,7 +240,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="244800" />
-            <Limit name="bitrate" range="1-40000000" />
+            <Limit name="bitrate" range="1-20000000" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="6" />
@@ -268,18 +278,6 @@ Only the three quirks included above are recognized at this point:
             <Feature name="adaptive-playback" />
             <Limit name="concurrent-instances" max="16" />
         </MediaCodec>
-        <MediaCodec name="OMX.qcom.video.decoder.wmv.secure" type="video/x-ms-wmv" >
-            <Quirk name="requires-allocate-on-input-ports" />
-            <Quirk name="requires-allocate-on-output-ports" />
-            <Limit name="size" min="64x64" max="1920x1088" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="489600" />
-            <Limit name="bitrate" range="1-60000000" />
-            <Feature name="adaptive-playback" />
-            <Feature name="secure-playback" required="true" />
-            <Limit name="concurrent-instances" max="7" />
-        </MediaCodec>
         <MediaCodec name="OMX.qcom.video.decoder.vc1" type="video/x-ms-wmv" >
             <Quirk name="requires-allocate-on-input-ports" />
             <Quirk name="requires-allocate-on-output-ports" />
@@ -298,7 +296,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="489600" />
-            <Limit name="bitrate" range="1-60000000" />
+            <Limit name="bitrate" range="1-20000000" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="7" />
@@ -365,8 +363,8 @@ Only the three quirks included above are recognized at this point:
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="979200" />
-            <Limit name="bitrate" range="1-100000000" />
-            <Limit name="frame-rate" range="1-240" />
+            <Limit name="bitrate" range="1-35000000" />
+            <Limit name="frame-rate" range="1-30" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="6" />
@@ -389,7 +387,7 @@ Only the three quirks included above are recognized at this point:
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
             <Limit name="blocks-per-second" min="1" max="972000" />
-            <Limit name="bitrate" range="1-100000000" />
+            <Limit name="bitrate" range="1-35000000" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
             <Limit name="concurrent-instances" max="6" />