Merge "conf_files: Limit the mpeg4 encoder spec on kona and lito"
diff --git a/conf_files/kona/media_codecs.xml b/conf_files/kona/media_codecs.xml
index 971d4e1..90ca0cc 100644
--- a/conf_files/kona/media_codecs.xml
+++ b/conf_files/kona/media_codecs.xml
@@ -283,12 +283,12 @@
<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="1280x1280" />
+ <Limit name="size" min="128x128" max="864x864" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="64-3600" />
- <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="3" />
<Limit name="performance-point-720x576" value="25" />
diff --git a/conf_files/kona/media_codecs_vendor.xml b/conf_files/kona/media_codecs_vendor.xml
index a1eb3c9..f6541b3 100644
--- a/conf_files/kona/media_codecs_vendor.xml
+++ b/conf_files/kona/media_codecs_vendor.xml
@@ -283,12 +283,12 @@
<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="1280x1280" />
+ <Limit name="size" min="128x128" max="864x864" />
<Limit name="alignment" value="2x2" />
<Limit name="block-size" value="16x16" />
<Limit name="block-count" range="64-3600" />
- <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="3" />
<Limit name="performance-point-720x576" value="25" />
diff --git a/conf_files/kona/media_profiles.xml b/conf_files/kona/media_profiles.xml
index a49eedd..bb9cd1f 100644
--- a/conf_files/kona/media_profiles.xml
+++ b/conf_files/kona/media_profiles.xml
@@ -1768,9 +1768,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" />
diff --git a/conf_files/lito/media_codecs.xml b/conf_files/lito/media_codecs.xml
index 62cc8c3..de68a6d 100644
--- a/conf_files/lito/media_codecs.xml
+++ b/conf_files/lito/media_codecs.xml
@@ -197,11 +197,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/lito/media_codecs_performance.xml b/conf_files/lito/media_codecs_performance.xml
index fd2f279..26a48ef 100644
--- a/conf_files/lito/media_codecs_performance.xml
+++ b/conf_files/lito/media_codecs_performance.xml
@@ -42,7 +42,6 @@
<Limit name="measured-frame-rate-176x144" range="125-135" />
<Limit name="measured-frame-rate-352x288" range="55-85" />
<Limit name="measured-frame-rate-640x480" range="47-52" />
- <Limit name="measured-frame-rate-1280x720" range="30-50" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x180" range="266-266" />
diff --git a/conf_files/lito/media_codecs_performance_v1.xml b/conf_files/lito/media_codecs_performance_v1.xml
index fb6d95a..66f2a0f 100644
--- a/conf_files/lito/media_codecs_performance_v1.xml
+++ b/conf_files/lito/media_codecs_performance_v1.xml
@@ -42,7 +42,6 @@
<Limit name="measured-frame-rate-176x144" range="125-135" />
<Limit name="measured-frame-rate-352x288" range="68-85" />
<Limit name="measured-frame-rate-640x480" range="47-52" />
- <Limit name="measured-frame-rate-1280x720" range="30-50" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" update="true">
<Limit name="measured-frame-rate-320x180" range="266-266" />
diff --git a/conf_files/lito/media_codecs_vendor.xml b/conf_files/lito/media_codecs_vendor.xml
index 3568034..67baccf 100644
--- a/conf_files/lito/media_codecs_vendor.xml
+++ b/conf_files/lito/media_codecs_vendor.xml
@@ -209,11 +209,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/lito/media_codecs_vendor_v1.xml b/conf_files/lito/media_codecs_vendor_v1.xml
index 01c5286..285616f 100644
--- a/conf_files/lito/media_codecs_vendor_v1.xml
+++ b/conf_files/lito/media_codecs_vendor_v1.xml
@@ -206,11 +206,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/lito/media_profiles.xml b/conf_files/lito/media_profiles.xml
index 62e591f..95ab071 100644
--- a/conf_files/lito/media_profiles.xml
+++ b/conf_files/lito/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" />