diff --git a/media_codecs_aosp_c2.xml b/media_codecs_aosp_c2.xml
index c2eed11f..bae71e61 100644
--- a/media_codecs_aosp_c2.xml
+++ b/media_codecs_aosp_c2.xml
@@ -164,6 +164,7 @@
             <Feature name="vq-minimum-quality"/>
             <Feature name="qp-bounds"/>
             <Feature name="encoding-statistics"/>
+            <Feature name="bitrate-modes" value="VBR,CBR,CBR-FD" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.hevc.encoder" type="video/hevc" >
             <Limit name="size" min="64x64" max="3840x2176" />
@@ -175,11 +176,13 @@
             <Limit name="performance-point-1920x1080" 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="qp-bounds"/>
             <Feature name="encoding-statistics"/>
             <Feature name="hdr-editing" />
+            <Feature name="bitrate-modes" value="VBR,CBR,CQ,CBR-FD" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.mpeg4.encoder" type="video/mp4v-es">
             <Limit name="size" min="32x32" max="2048x2048" />
@@ -195,6 +198,7 @@
             <Feature name="vq-minimum-quality"/>
             <Feature name="qp-bounds"/>
             <Feature name="encoding-statistics"/>
+            <Feature name="bitrate-modes" value="VBR,CBR" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.h263.encoder" type="video/3gpp">
             <Limit name="size" min="32x32" max="2048x1152" />
@@ -209,6 +213,7 @@
             <Feature name="vq-minimum-quality"/>
             <Feature name="qp-bounds"/>
             <Feature name="encoding-statistics"/>
+            <Feature name="bitrate-modes" value="VBR,CBR" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp8.encoder" type="video/x-vnd.on2.vp8" >
             <Limit name="size" min="32x32" max="3840x2160" />
@@ -224,6 +229,7 @@
             <Feature name="vq-minimum-quality"/>
             <Feature name="qp-bounds"/>
             <Feature name="encoding-statistics"/>
+            <Feature name="bitrate-modes" value="VBR,CBR" />
         </MediaCodec>
         <MediaCodec name="c2.exynos.vp9.encoder" type="video/x-vnd.on2.vp9" >
             <Limit name="size" min="64x64" max="3840x2176" />
@@ -239,6 +245,7 @@
             <Feature name="vq-minimum-quality"/>
             <Feature name="qp-bounds"/>
             <Feature name="encoding-statistics"/>
+            <Feature name="bitrate-modes" value="VBR,CBR" />
         </MediaCodec>
     </Encoders>
 </MediaCodecs>