diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index 62b47070..c1c41bfe 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -25,12 +25,13 @@
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
-            <Limit name="bitrate" range="1-120000000" />
+            <Limit name="bitrate" range="1-240000000" />
             <Limit name="performance-point-1280x720" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
             <Feature name="can-swap-width-height" value="1" />
+            <Feature name="low-latency" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.h264.decoder.secure" type="video/avc">
             <Limit name="size" min="32x32" max="3840x2160" />
@@ -38,13 +39,14 @@
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
-            <Limit name="bitrate" range="1-120000000" />
+            <Limit name="bitrate" range="1-240000000" />
             <Limit name="performance-point-1280x720" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
             <Feature name="can-swap-width-height" value="1" />
+            <Feature name="low-latency" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.hevc.decoder" type="video/hevc" >
             <Limit name="size" min="64x64" max="3840x2160" />
@@ -52,12 +54,13 @@
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
-            <Limit name="bitrate" range="1-120000000" />
+            <Limit name="bitrate" range="1-240000000" />
             <Limit name="performance-point-1280x720" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
             <Feature name="can-swap-width-height" value="1" />
+            <Feature name="low-latency" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.hevc.decoder.secure" type="video/hevc" >
             <Limit name="size" min="64x64" max="3840x2160" />
@@ -65,13 +68,14 @@
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
-            <Limit name="bitrate" range="1-120000000" />
+            <Limit name="bitrate" range="1-240000000" />
             <Limit name="performance-point-1280x720" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="2" />
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
             <Feature name="can-swap-width-height" value="1" />
+            <Feature name="low-latency" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.mpeg4.decoder" type="video/mp4v-es">
             <Limit name="size" min="32x32" max="2048x2048" />
@@ -85,6 +89,7 @@
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
             <Feature name="can-swap-width-height" value="1" />
+            <Feature name="low-latency" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.h263.decoder" type="video/3gpp">
             <Limit name="size" min="32x32" max="2048x1152" />
@@ -97,6 +102,7 @@
             <Limit name="performance-point-1920x1080" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
+            <Feature name="low-latency" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.decoder" type="video/x-vnd.on2.vp8" >
             <Limit name="size" min="32x32" max="3840x2160" />
@@ -110,6 +116,7 @@
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
             <Feature name="can-swap-width-height" value="1" />
+            <Feature name="low-latency" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.decoder" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2176" />
@@ -123,6 +130,7 @@
             <Limit name="concurrent-instances" max="16" />
             <Feature name="adaptive-playback" />
             <Feature name="can-swap-width-height" value="1" />
+            <Feature name="low-latency" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.decoder.secure" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2176" />
@@ -137,6 +145,7 @@
             <Feature name="adaptive-playback" />
             <Feature name="secure-playback" required="true" />
             <Feature name="can-swap-width-height" value="1" />
+            <Feature name="low-latency" />
         </MediaCodec>
     </Decoders>
 
@@ -147,13 +156,15 @@
             <Limit name="block-size" value="16x16" />
             <Limit name="block-count" range="1-32400" />
             <Limit name="blocks-per-second" min="1" max="3888000" />
-            <Limit name="bitrate" range="1-120000000" />
+            <Limit name="bitrate" range="1-240000000" />
             <Limit name="performance-point-1280x720" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>
+            <Feature name="bitrate-modes" value="VBR,CBR,CBR-FD"/>
             <Feature name="qp-bounds"/>
+            <Feature name="encoding-statistics"/>
         </MediaCodec>
         <MediaCodec name="c2.exynos.hevc.encoder" type="video/hevc" >
             <Limit name="size" min="64x64" max="3840x2176" />
@@ -161,13 +172,17 @@
             <Limit name="block-size" value="32x32" />
             <Limit name="block-count" range="1-8160" />
             <Limit name="blocks-per-second" min="1" max="979200" />
-            <Limit name="bitrate" range="1-120000000" />
+            <Limit name="bitrate" range="1-240000000" />
             <Limit name="performance-point-1280x720" range="240" />
             <Limit name="performance-point-3840x2160" range="120" />
             <Limit name="concurrent-instances" max="16" />
+            <Limit name="quality" range="0-100" default="57" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>
+            <Feature name="bitrate-modes" value="VBR,CBR,CBR-FD"/>
             <Feature name="qp-bounds"/>
+            <Feature name="encoding-statistics"/>
+            <Feature name="hdr-editing" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.mpeg4.encoder" type="video/mp4v-es">
             <Limit name="size" min="32x32" max="2048x2048" />
@@ -181,7 +196,9 @@
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>
+            <Feature name="bitrate-modes" value="VBR,CBR"/>
             <Feature name="qp-bounds"/>
+            <Feature name="encoding-statistics"/>
         </MediaCodec>
         <MediaCodec name="c2.exynos.h263.encoder" type="video/3gpp">
             <Limit name="size" min="32x32" max="2048x1152" />
@@ -194,7 +211,9 @@
             <Limit name="performance-point-1920x1080" range="120" />
             <Limit name="concurrent-instances" max="16" />
             <Feature name="vq-minimum-quality"/>
+            <Feature name="bitrate-modes" value="VBR,CBR"/>
             <Feature name="qp-bounds"/>
+            <Feature name="encoding-statistics"/>
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.encoder" type="video/x-vnd.on2.vp8" >
             <Limit name="size" min="32x32" max="3840x2160" />
@@ -208,7 +227,9 @@
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>
+            <Feature name="bitrate-modes" value="VBR,CBR"/>
             <Feature name="qp-bounds"/>
+            <Feature name="encoding-statistics"/>
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.encoder" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2176" />
@@ -222,7 +243,9 @@
             <Limit name="concurrent-instances" max="16" />
             <Feature name="can-swap-width-height" value="1" />
             <Feature name="vq-minimum-quality"/>
+            <Feature name="bitrate-modes" value="VBR,CBR"/>
             <Feature name="qp-bounds"/>
+            <Feature name="encoding-statistics"/>
         </MediaCodec>
     </Encoders>
 </MediaCodecs>