Merge "conf_files: lito: Limit concurrent instances for SW codecs"
diff --git a/conf_files/lito/media_codecs.xml b/conf_files/lito/media_codecs.xml
index de68a6d..87f7f78 100644
--- a/conf_files/lito/media_codecs.xml
+++ b/conf_files/lito/media_codecs.xml
@@ -191,7 +191,7 @@
<Limit name="blocks-per-second" min="64" max="48600" />
<Limit name="bitrate" range="1-2000000" />
<Limit name="frame-rate" range="1-30" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="3" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -203,7 +203,7 @@
<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" />
+ <Limit name="concurrent-instances" max="3" />
</MediaCodec>
</Encoders>
<Decoders>
@@ -331,7 +331,7 @@
<Limit name="bitrate" range="1-16000000" />
<Limit name="frame-rate" range="1-30" />
<Feature name="adaptive-playback" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es">
<Quirk name="requires-allocate-on-input-ports" />
@@ -342,7 +342,7 @@
<Limit name="blocks-per-second" min="64" max="244800" />
<Limit name="bitrate" range="1-40000000" />
<Limit name="frame-rate" range="1-30" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -353,7 +353,7 @@
<Limit name="blocks-per-second" min="64" max="244800" />
<Limit name="frame-rate" range="1-30" />
<Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -364,7 +364,7 @@
<Limit name="blocks-per-second" min="64" max="244800" />
<Limit name="frame-rate" range="1-30" />
<Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />
diff --git a/conf_files/lito/media_codecs_vendor.xml b/conf_files/lito/media_codecs_vendor.xml
index 67baccf..48b7848 100644
--- a/conf_files/lito/media_codecs_vendor.xml
+++ b/conf_files/lito/media_codecs_vendor.xml
@@ -203,7 +203,7 @@
<Limit name="blocks-per-second" min="64" max="48600" />
<Limit name="bitrate" range="1-2000000" />
<Limit name="frame-rate" range="1-30" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="3" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -215,7 +215,7 @@
<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" />
+ <Limit name="concurrent-instances" max="3" />
</MediaCodec>
</Encoders>
<Decoders>
@@ -343,7 +343,7 @@
<Limit name="bitrate" range="1-16000000" />
<Limit name="frame-rate" range="1-30" />
<Feature name="adaptive-playback" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es">
<Quirk name="requires-allocate-on-input-ports" />
@@ -354,7 +354,7 @@
<Limit name="blocks-per-second" min="64" max="244800" />
<Limit name="bitrate" range="1-40000000" />
<Limit name="frame-rate" range="1-30" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -365,7 +365,7 @@
<Limit name="blocks-per-second" min="64" max="244800" />
<Limit name="frame-rate" range="1-30" />
<Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -376,7 +376,7 @@
<Limit name="blocks-per-second" min="64" max="244800" />
<Limit name="frame-rate" range="1-30" />
<Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />
diff --git a/conf_files/lito/media_codecs_vendor_v1.xml b/conf_files/lito/media_codecs_vendor_v1.xml
index 285616f..d2ba141 100644
--- a/conf_files/lito/media_codecs_vendor_v1.xml
+++ b/conf_files/lito/media_codecs_vendor_v1.xml
@@ -200,7 +200,7 @@
<Limit name="blocks-per-second" min="64" max="48600" />
<Limit name="bitrate" range="1-2000000" />
<Limit name="frame-rate" range="1-30" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="3" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.mpeg4sw" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -212,7 +212,7 @@
<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" />
+ <Limit name="concurrent-instances" max="3" />
</MediaCodec>
</Encoders>
<Decoders>
@@ -340,7 +340,7 @@
<Limit name="bitrate" range="1-16000000" />
<Limit name="frame-rate" range="1-30" />
<Feature name="adaptive-playback" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qti.video.decoder.mpeg4sw" type="video/mp4v-es">
<Quirk name="requires-allocate-on-input-ports" />
@@ -351,7 +351,7 @@
<Limit name="blocks-per-second" min="64" max="244800" />
<Limit name="bitrate" range="1-40000000" />
<Limit name="frame-rate" range="1-30" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qti.video.decoder.divxsw" type="video/divx" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -362,7 +362,7 @@
<Limit name="blocks-per-second" min="64" max="244800" />
<Limit name="frame-rate" range="1-30" />
<Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qti.video.decoder.divx4sw" type="video/divx4" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -373,7 +373,7 @@
<Limit name="blocks-per-second" min="64" max="244800" />
<Limit name="frame-rate" range="1-30" />
<Limit name="bitrate" range="1-10000000" />
- <Limit name="concurrent-instances" max="16" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />