Merge "media: Include QC OMX Codecs and fix rank of QC OMX components"
diff --git a/conf_files/atoll/atoll.mk b/conf_files/atoll/atoll.mk
index e37d0c4..aeecb4b 100644
--- a/conf_files/atoll/atoll.mk
+++ b/conf_files/atoll/atoll.mk
@@ -14,3 +14,14 @@
# Vendor property overrides
+ifeq ($(GENERIC_ODM_IMAGE),true)
+ $(warning "Forcing codec2.0 HW for generic odm build variant")
+ #Set default ranks and rank Codec 2.0 over OMX codecs
+ PRODUCT_ODM_PROPERTIES += debug.stagefright.ccodec=4
+ PRODUCT_ODM_PROPERTIES += debug.stagefright.omx_default_rank=1000
+else
+ $(warning "Enabling codec2.0 SW only for non-generic odm build variant")
+ #Rank OMX SW codecs lower than OMX HW codecs
+ PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank.sw-audio=1
+ PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank=0
+endif
diff --git a/conf_files/atoll/media_codecs.xml b/conf_files/atoll/media_codecs.xml
index d1ef1c4..5ba36ab 100644
--- a/conf_files/atoll/media_codecs.xml
+++ b/conf_files/atoll/media_codecs.xml
@@ -409,6 +409,7 @@
<Limit name="concurrent-instances" max="16" />
<Limit name="performance-point-1920x1080" value="30" />
</MediaCodec>
+ <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>
</Decoders>
<Include href="media_codecs_google_video.xml" />
</MediaCodecs>
diff --git a/conf_files/atoll/media_codecs_vendor.xml b/conf_files/atoll/media_codecs_vendor.xml
index 7885019..3e4be53 100644
--- a/conf_files/atoll/media_codecs_vendor.xml
+++ b/conf_files/atoll/media_codecs_vendor.xml
@@ -119,6 +119,7 @@
-->
<MediaCodecs>
+ <Include href="media_codecs_google_audio.xml" />
<Include href="media_codecs_vendor_audio.xml" />
<Include href="media_codecs_google_telephony.xml" />
<Settings>
diff --git a/conf_files/atoll/media_codecs_vendor_audio.xml b/conf_files/atoll/media_codecs_vendor_audio.xml
index 0544e1f..e6273e9 100644
--- a/conf_files/atoll/media_codecs_vendor_audio.xml
+++ b/conf_files/atoll/media_codecs_vendor_audio.xml
@@ -17,81 +17,13 @@
-->
<Included>
<Decoders>
- <MediaCodec name="OMX.google.mp3.decoder" type="audio/mpeg">
- <Limit name="channel-count" max="2" />
- <Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" />
- <Limit name="bitrate" range="8000-320000" />
- </MediaCodec>
- <MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp">
- <Limit name="channel-count" max="1" />
- <Limit name="sample-rate" ranges="8000" />
- <Limit name="bitrate" range="4750-12200" />
- </MediaCodec>
- <MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb">
- <Limit name="channel-count" max="1" />
- <Limit name="sample-rate" ranges="16000" />
- <Limit name="bitrate" range="6600-23850" />
- </MediaCodec>
- <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm">
- <Limit name="channel-count" max="8" />
- <Limit name="sample-rate" ranges="7350,8000,11025,12000,16000,22050,24000,32000,44100,48000" />
- <Limit name="bitrate" range="8000-960000" />
- </MediaCodec>
- <MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw">
- <Limit name="channel-count" max="1" />
- <Limit name="sample-rate" ranges="8000-48000" />
- <Limit name="bitrate" range="64000" />
- </MediaCodec>
- <MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw">
- <Limit name="channel-count" max="1" />
- <Limit name="sample-rate" ranges="8000-48000" />
- <Limit name="bitrate" range="64000" />
- </MediaCodec>
- <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis">
- <Limit name="channel-count" max="8" />
- <Limit name="sample-rate" ranges="8000-96000" />
- <Limit name="bitrate" range="32000-500000" />
- </MediaCodec>
- <MediaCodec name="OMX.google.opus.decoder" type="audio/opus">
- <Limit name="channel-count" max="8" />
- <Limit name="sample-rate" ranges="48000" />
- <Limit name="bitrate" range="6000-510000" />
- </MediaCodec>
- <MediaCodec name="OMX.google.raw.decoder" type="audio/raw">
- <Limit name="channel-count" max="8" />
- <Limit name="sample-rate" ranges="8000-96000" />
- <Limit name="bitrate" range="1-10000000" />
- </MediaCodec>
+ <MediaCodec name="OMX.google.opus.decoder" type="audio/opus" update="true" rank="100"/>
<!-- SimpleOMXComponet based software decoder-->
- <MediaCodec name="OMX.qti.audio.decoder.flac" type="audio/flac" >
+ <MediaCodec name="OMX.qti.audio.decoder.flac" type="audio/flac" rank="0">
<Limit name="concurrent-instances" max="10" />
</MediaCodec>
+ <MediaCodec name="OMX.qti.audio.decoder.mpegh" type="audio/mhas" rank="0">
+ <Limit name="concurrent-instances" max="1" />
+ </MediaCodec>
</Decoders>
- <Encoders>
- <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm">
- <Limit name="channel-count" max="6" />
- <Limit name="sample-rate" ranges="8000,11025,12000,16000,22050,24000,32000,44100,48000" />
- <!-- also may support 64000, 88200 and 96000 Hz -->
- <Limit name="bitrate" range="8000-960000" />
- </MediaCodec>
- <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp">
- <Limit name="channel-count" max="1" />
- <Limit name="sample-rate" ranges="8000" />
- <Limit name="bitrate" range="4750-12200" />
- <Feature name="bitrate-modes" value="CBR" />
- </MediaCodec>
- <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb">
- <Limit name="channel-count" max="1" />
- <Limit name="sample-rate" ranges="16000" />
- <Limit name="bitrate" range="6600-23850" />
- <Feature name="bitrate-modes" value="CBR" />
- </MediaCodec>
- <MediaCodec name="OMX.google.flac.encoder" type="audio/flac">
- <Limit name="channel-count" max="2" />
- <Limit name="sample-rate" ranges="1-655350" />
- <Limit name="bitrate" range="1-21000000" />
- <Limit name="complexity" range="0-8" default="5" />
- <Feature name="bitrate-modes" value="CQ" />
- </MediaCodec>
- </Encoders>
</Included>