summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonghua Wu <ronghuawu@google.com>2015-06-25 22:14:57 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-25 22:15:09 +0000
commitedbb56d0939163192b9a178c15950cb45729956c (patch)
treeebed0ce432bf03475f55e1f28857c60b6809f134
parentd38227c23a1a18b54109903057d242eec9f7b453 (diff)
parent04cdb897ebe29fd1485e500bdf1f34535dcbd0eb (diff)
downloadhammerhead-edbb56d0939163192b9a178c15950cb45729956c.tar.gz
Merge "hammerhead: publish profiling result." into mnc-dev
-rw-r--r--media_codecs.xml12
1 files changed, 12 insertions, 0 deletions
diff --git a/media_codecs.xml b/media_codecs.xml
index a7f78d0..3b8cc5d 100644
--- a/media_codecs.xml
+++ b/media_codecs.xml
@@ -17,6 +17,9 @@
<MediaCodecs>
<Include href="media_codecs_google_audio.xml" />
<Include href="media_codecs_google_telephony.xml" />
+ <Settings>
+ <Setting name="max-video-encoder-input-buffers" value="9" />
+ </Settings>
<Encoders>
<MediaCodec name="OMX.qcom.video.encoder.mpeg4" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -27,6 +30,7 @@
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="489600" />
<Limit name="bitrate" range="1-60000000" />
+ <Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.h263" type="video/3gpp" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -34,6 +38,7 @@
<Quirk name="requires-loaded-to-idle-after-allocation"/>
<Limit name="size" min="96x64" max="720x576" />
<Limit name="alignment" value="2x2" />
+ <Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.avc" type="video/avc" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -44,6 +49,7 @@
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="972000" />
<Limit name="bitrate" range="1-100000000" />
+ <Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.encoder.vp8" type="video/x-vnd.on2.vp8" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -54,6 +60,7 @@
<Limit name="block-size" value="16x16" />
<Limit name="blocks-per-second" min="1" max="777600" />
<Limit name="bitrate" range="1-20000000" />
+ <Limit name="concurrent-instances" max="13" />
</MediaCodec>
</Encoders>
<Decoders>
@@ -67,6 +74,7 @@
<Limit name="blocks-per-second" min="1" max="972000" />
<Limit name="bitrate" range="1-100000000" />
<Feature name="adaptive-playback" />
+ <Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.avc.secure" type="video/avc" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -79,6 +87,7 @@
<Limit name="bitrate" range="1-100000000" />
<Feature name="adaptive-playback" />
<Feature name="secure-playback" required="true" />
+ <Limit name="concurrent-instances" max="4" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.mpeg4" type="video/mp4v-es" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -90,6 +99,7 @@
<Limit name="blocks-per-second" min="1" max="489600" />
<Limit name="bitrate" range="1-60000000" />
<Feature name="adaptive-playback" />
+ <Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.h263" type="video/3gpp" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -98,6 +108,7 @@
<Limit name="size" min="64x64" max="720x576" />
<Limit name="alignment" value="2x2" />
<Feature name="adaptive-playback" />
+ <Limit name="concurrent-instances" max="13" />
</MediaCodec>
<MediaCodec name="OMX.qcom.video.decoder.vp8" type="video/x-vnd.on2.vp8" >
<Quirk name="requires-allocate-on-input-ports" />
@@ -109,6 +120,7 @@
<Limit name="blocks-per-second" min="1" max="777600" />
<Limit name="bitrate" range="1-20000000" />
<Feature name="adaptive-playback" />
+ <Limit name="concurrent-instances" max="13" />
</MediaCodec>
</Decoders>
<Include href="media_codecs_google_video.xml" />