zenfone7: Remove software omx codec references
These are no longer available as of Android 14 QPR3. The C2 codecs
available by default in the swcodec apex will be used instead.
Change-Id: I8cdf3e700823779a7382c66c3df8410d41209b7c
Signed-off-by: micky387 <mickaelsaibi@free.fr>
diff --git a/media/media_codecs.xml b/media/media_codecs.xml
index 86bc074..7d9f42e 100644
--- a/media/media_codecs.xml
+++ b/media/media_codecs.xml
@@ -178,9 +178,8 @@
-->
<MediaCodecs>
- <Include href="media_codecs_google_audio.xml" />
- <Include href="media_codecs_google_telephony.xml" />
<Settings>
+ <Domain name="telephony" enabled="true" />
<Setting name="max-video-encoder-input-buffers" value="11" />
</Settings>
<Encoders>
@@ -434,7 +433,5 @@
<Limit name="concurrent-instances" max="4" />
<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/media/media_codecs_kona.xml b/media/media_codecs_kona.xml
index 725d457..a32932c 100644
--- a/media/media_codecs_kona.xml
+++ b/media/media_codecs_kona.xml
@@ -178,10 +178,8 @@
-->
<MediaCodecs>
- <Include href="media_codecs_google_audio.xml" />
- <Include href="media_codecs_vendor_audio.xml" />
- <Include href="media_codecs_google_telephony.xml" />
<Settings>
+ <Domain name="telephony" enabled="true" />
<Setting name="max-video-encoder-input-buffers" value="11" />
</Settings>
<Encoders>
@@ -405,5 +403,4 @@
<Limit name="performance-point-4096x2304" value="60" />
</MediaCodec>
</Decoders>
- <Include href="media_codecs_google_video.xml" />
</MediaCodecs>
diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance.xml
index 6b72910..666e12f 100644
--- a/media/media_codecs_performance.xml
+++ b/media/media_codecs_performance.xml
@@ -43,24 +43,6 @@
<Limit name="measured-frame-rate-1280x720" range="123-125" />
<Limit name="measured-frame-rate-1920x1080" range="16-40" />
</MediaCodec>
- <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="215-215" />
- <Limit name="measured-frame-rate-720x480" range="100-100" />
- <Limit name="measured-frame-rate-1280x720" range="56-56" />
- <Limit name="measured-frame-rate-1920x1080" range="30-30" />
- </MediaCodec>
- <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="200-200" />
- </MediaCodec>
- <!-- <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
- <Limit name="measured-frame-rate-176x144" range="180-180" />
- </MediaCodec> -->
- <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="93-94" />
- <Limit name="measured-frame-rate-640x360" range="32-32" />
- <Limit name="measured-frame-rate-1280x720" range="17-24" />
- <Limit name="measured-frame-rate-1920x1080" range="8-12" />
- </MediaCodec>
<MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="151-208" />
<Limit name="measured-frame-rate-720x480" range="61-84" />
@@ -125,42 +107,6 @@
<Limit name="measured-frame-rate-1920x1080" range="435-495" />
<Limit name="measured-frame-rate-3840x2160" range="83-98" />
</MediaCodec>
- <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="122-370" />
- <Limit name="measured-frame-rate-720x480" range="68-68" />
- <Limit name="measured-frame-rate-1280x720" range="32-32" />
- <Limit name="measured-frame-rate-1920x1080" range="24-26" />
- </MediaCodec>
- <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="104-279" />
- <Limit name="measured-frame-rate-352x288" range="200-200" />
- </MediaCodec>
- <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
- <Limit name="measured-frame-rate-352x288" range="502-550" />
- <Limit name="measured-frame-rate-640x360" range="267-271" />
- <Limit name="measured-frame-rate-720x480" range="254-257" />
- <Limit name="measured-frame-rate-1280x720" range="94-95" />
- <Limit name="measured-frame-rate-1920x1080" range="47-49" />
- </MediaCodec>
- <MediaCodec name="OMX.google.mpeg4.decoder" update="true">
- <Type name="video/mp4v-es">
- <Limit name="measured-frame-rate-176x144" range="430-450" />
- </Type>
- </MediaCodec>
- <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="1103-1170" />
- <Limit name="measured-frame-rate-320x240" range="330-381" />
- <Limit name="measured-frame-rate-640x360" range="487-490" />
- <Limit name="measured-frame-rate-1280x720" range="22-38" />
- <Limit name="measured-frame-rate-1920x1080" range="39-40" />
- </MediaCodec>
- <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
- <Limit name="measured-frame-rate-320x180" range="861-909" />
- <Limit name="measured-frame-rate-320x240" range="200-230" />
- <Limit name="measured-frame-rate-640x360" range="265-268" />
- <Limit name="measured-frame-rate-1280x720" range="32-40" />
- <Limit name="measured-frame-rate-1920x1080" range="19-23" />
- </MediaCodec>
<MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="350-469" />
<Limit name="measured-frame-rate-720x480" range="326-436" />
diff --git a/media/media_codecs_performance_kona.xml b/media/media_codecs_performance_kona.xml
index 2538917..48cc0d8 100644
--- a/media/media_codecs_performance_kona.xml
+++ b/media/media_codecs_performance_kona.xml
@@ -43,24 +43,6 @@
<Limit name="measured-frame-rate-1280x720" range="123-125" />
<Limit name="measured-frame-rate-1920x1080" range="16-40" />
</MediaCodec>
- <MediaCodec name="OMX.google.h264.encoder" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="215-215" />
- <Limit name="measured-frame-rate-720x480" range="100-100" />
- <Limit name="measured-frame-rate-1280x720" range="56-56" />
- <Limit name="measured-frame-rate-1920x1080" range="30-30" />
- </MediaCodec>
- <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="200-200" />
- </MediaCodec>
- <!-- <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
- <Limit name="measured-frame-rate-176x144" range="180-180" />
- </MediaCodec> -->
- <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="93-94" />
- <Limit name="measured-frame-rate-640x360" range="32-32" />
- <Limit name="measured-frame-rate-1280x720" range="17-24" />
- <Limit name="measured-frame-rate-1920x1080" range="8-12" />
- </MediaCodec>
<MediaCodec name="c2.android.avc.encoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="151-208" />
<Limit name="measured-frame-rate-720x480" range="61-84" />
@@ -116,42 +98,6 @@
<Limit name="measured-frame-rate-1920x1080" range="435-495" />
<Limit name="measured-frame-rate-3840x2160" range="83-98" />
</MediaCodec>
- <MediaCodec name="OMX.google.h264.decoder" type="video/avc" update="true">
- <Limit name="measured-frame-rate-320x240" range="122-370" />
- <Limit name="measured-frame-rate-720x480" range="68-68" />
- <Limit name="measured-frame-rate-1280x720" range="32-32" />
- <Limit name="measured-frame-rate-1920x1080" range="24-26" />
- </MediaCodec>
- <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
- <Limit name="measured-frame-rate-176x144" range="104-279" />
- <Limit name="measured-frame-rate-352x288" range="200-200" />
- </MediaCodec>
- <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
- <Limit name="measured-frame-rate-352x288" range="502-550" />
- <Limit name="measured-frame-rate-640x360" range="267-271" />
- <Limit name="measured-frame-rate-720x480" range="254-257" />
- <Limit name="measured-frame-rate-1280x720" range="94-95" />
- <Limit name="measured-frame-rate-1920x1080" range="47-49" />
- </MediaCodec>
- <MediaCodec name="OMX.google.mpeg4.decoder" update="true">
- <Type name="video/mp4v-es">
- <Limit name="measured-frame-rate-176x144" range="430-450" />
- </Type>
- </MediaCodec>
- <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
- <Limit name="measured-frame-rate-320x180" range="1103-1170" />
- <Limit name="measured-frame-rate-320x240" range="330-381" />
- <Limit name="measured-frame-rate-640x360" range="487-490" />
- <Limit name="measured-frame-rate-1280x720" range="22-38" />
- <Limit name="measured-frame-rate-1920x1080" range="39-40" />
- </MediaCodec>
- <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
- <Limit name="measured-frame-rate-320x180" range="861-909" />
- <Limit name="measured-frame-rate-320x240" range="200-230" />
- <Limit name="measured-frame-rate-640x360" range="265-268" />
- <Limit name="measured-frame-rate-1280x720" range="32-40" />
- <Limit name="measured-frame-rate-1920x1080" range="19-23" />
- </MediaCodec>
<MediaCodec name="c2.android.avc.decoder" type="video/avc" update="true">
<Limit name="measured-frame-rate-320x240" range="350-469" />
<Limit name="measured-frame-rate-720x480" range="326-436" />
diff --git a/media/media_codecs_vendor.xml b/media/media_codecs_vendor.xml
index bdb9774..a387f66 100644
--- a/media/media_codecs_vendor.xml
+++ b/media/media_codecs_vendor.xml
@@ -178,10 +178,8 @@
-->
<MediaCodecs>
- <Include href="media_codecs_google_audio.xml" />
- <Include href="media_codecs_vendor_audio.xml" />
- <Include href="media_codecs_google_telephony.xml" />
<Settings>
+ <Domain name="telephony" enabled="true" />
<Setting name="max-video-encoder-input-buffers" value="11" />
</Settings>
<Encoders>
@@ -435,5 +433,4 @@
<Limit name="performance-point-1920x1080" value="30" />
</MediaCodec>
</Decoders>
- <Include href="media_codecs_google_video.xml" />
</MediaCodecs>
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 8010cdc..457f027 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -735,15 +735,10 @@
vendor/etc/lm/GameOptimizationFeature.xml
vendor/etc/lowi.conf
vendor/etc/media_codecs_c2.xml
-vendor/etc/media_codecs_google_audio.xml
vendor/etc/media_codecs_google_c2.xml
vendor/etc/media_codecs_google_c2_audio.xml
vendor/etc/media_codecs_google_c2_video.xml
-vendor/etc/media_codecs_google_telephony.xml
-vendor/etc/media_codecs_google_video.xml
-vendor/etc/media_codecs_google_video_le.xml
vendor/etc/media_codecs_performance_c2.xml
-vendor/etc/media_codecs_vendor_audio.xml
vendor/etc/media_profiles.xml
vendor/etc/media_profiles_kona.xml
vendor/etc/media_profiles_vendor.xml