Merge "conf_files: kona: Update VP9 decoder max bitrate to 100Mbps"
diff --git a/conf_files/bengal/media_codecs.xml b/conf_files/bengal/media_codecs.xml
index 972e215..987c796 100644
--- a/conf_files/bengal/media_codecs.xml
+++ b/conf_files/bengal/media_codecs.xml
@@ -89,7 +89,6 @@
| h264 | 1920 1088 60 60 489600 |
| hevc | 1920 1080 60 60 489600 |
| mpeg4-sw | 1920 1088 30 40 244800 |
- | vc1 | 1920 1088 30 20 244800 |
| div4/5/6-sw | 1920 1088 30 10 244800 |
| h263-sw | 864 480 30 16 48600 |
|_____________|_________________________________________|
@@ -113,7 +112,7 @@
|__________|_________________________________________|
| h264 | 1920 1088 60 40 489600 |
| hevc | 1920 1088 60 40 489600 |
- | mpeg4-sw | 1280 720 30 4 108000 |
+ | mpeg4-sw | 864 480 30 8 48600 |
| h263-sw | 864 480 30 2 48600 |
|__________|_________________________________________|
-->
@@ -180,11 +179,11 @@
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
<Quirk name="requires-loaded-to-idle-after-allocation" />
- <Limit name="size" min="128x128" max="1280x720" />
+ <Limit name="size" min="128x128" max="864x480" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="64" max="108000" />
- <Limit name="bitrate" range="1-4000000" />
+ <Limit name="blocks-per-second" min="64" max="48600" />
+ <Limit name="bitrate" range="1-8000000" />
<Limit name="frame-rate" range="1-30" />
<Limit name="concurrent-instances" max="16" />
</MediaCodec>
diff --git a/conf_files/bengal/media_codecs_vendor.xml b/conf_files/bengal/media_codecs_vendor.xml
index 746923b..1193e39 100644
--- a/conf_files/bengal/media_codecs_vendor.xml
+++ b/conf_files/bengal/media_codecs_vendor.xml
@@ -89,7 +89,6 @@
| h264 | 1920 1088 60 60 489600 |
| hevc | 1920 1080 60 60 489600 |
| mpeg4-sw | 1920 1088 30 40 244800 |
- | vc1 | 1920 1088 30 20 244800 |
| div4/5/6-sw | 1920 1088 30 10 244800 |
| h263-sw | 864 480 30 16 48600 |
|_____________|_________________________________________|
@@ -113,7 +112,7 @@
|__________|_________________________________________|
| h264 | 1920 1088 60 60 489600 |
| hevc | 1920 1088 60 60 489600 |
- | mpeg4-sw | 1280 720 30 4 108000 |
+ | mpeg4-sw | 864 480 30 8 48600 |
| h263-sw | 864 480 30 2 48600 |
|__________|_________________________________________|
-->
@@ -181,11 +180,11 @@
<Quirk name="requires-allocate-on-input-ports" />
<Quirk name="requires-allocate-on-output-ports" />
<Quirk name="requires-loaded-to-idle-after-allocation" />
- <Limit name="size" min="128x128" max="1280x720" />
+ <Limit name="size" min="128x128" max="864x480" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
- <Limit name="blocks-per-second" min="64" max="108000" />
- <Limit name="bitrate" range="1-4000000" />
+ <Limit name="blocks-per-second" min="64" max="48600" />
+ <Limit name="bitrate" range="1-8000000" />
<Limit name="frame-rate" range="1-30" />
<Limit name="concurrent-instances" max="16" />
</MediaCodec>
diff --git a/conf_files/bengal/media_profiles.xml b/conf_files/bengal/media_profiles.xml
index 62e591f..95ab071 100644
--- a/conf_files/bengal/media_profiles.xml
+++ b/conf_files/bengal/media_profiles.xml
@@ -1485,9 +1485,9 @@
maxHFRMode="0" />
<VideoEncoderCap name="m4v" enabled="true"
- minBitRate="64000" maxBitRate="20000000"
- minFrameWidth="176" maxFrameWidth="1280"
- minFrameHeight="144" maxFrameHeight="720"
+ minBitRate="64000" maxBitRate="8000000"
+ minFrameWidth="176" maxFrameWidth="800"
+ minFrameHeight="144" maxFrameHeight="480"
minFrameRate="15" maxFrameRate="30"
maxHFRFrameWidth="0" maxHFRFrameHeight="0"
maxHFRMode="0" />