g12: 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

diff --git a/g12.mk b/g12.mk
index 3117ab044a4240e6069f2db771c82993255a59d0..7c60638ab2314ae908f7945baa429db577b4f919 100644 (file)
--- a/g12.mk
+++ b/g12.mk
@@ -54,15 +54,11 @@ PRODUCT_COPY_FILES += \
 
 ## Codecs
 PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
+    $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
     $(LOCAL_PATH)/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles.xml \
     $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
 
-ifneq ($(PRODUCT_USE_SW_OMX),true)
-PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
-    $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml
-endif
-
 ## dumpstate
 PRODUCT_PACKAGES += \
     android.hardware.dumpstate@1.1.vendor

diff --git a/media/media_codecs.xml b/media/media_codecs.xml
index fd8903a7e1dc83dc2d0ad54143e256e453c1f47e..78dc5d619d53a1d428990c1dc9240c809b38e1e6 100644 (file)
--- a/media/media_codecs.xml
+++ b/media/media_codecs.xml
@@ -158,64 +158,11 @@ Only the three quirks included above are recognized at this point:
             <Feature name="tunneled-playback" />
            <Limit name="concurrent-instances" max="2" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.amrnb.decoder" type="audio/3gpp" />
-        <MediaCodec name="OMX.google.amrwb.decoder" type="audio/amr-wb" />
-        <MediaCodec name="OMX.google.aac.decoder" type="audio/mp4a-latm" />
-        <MediaCodec name="OMX.google.g711.alaw.decoder" type="audio/g711-alaw" />
-        <MediaCodec name="OMX.google.g711.mlaw.decoder" type="audio/g711-mlaw" />
-        <MediaCodec name="OMX.google.adpcm.ima.decoder" type="audio/adpcm-ima" />
-        <MediaCodec name="OMX.google.adpcm.ms.decoder" type="audio/adpcm-ms" />
-        <MediaCodec name="OMX.google.vorbis.decoder" type="audio/vorbis" />
-        <MediaCodec name="OMX.google.alac.decoder" type="audio/alac" />
-        <MediaCodec name="OMX.google.ape.decoder" type="audio/ape" />
-        <MediaCodec name="OMX.google.raw.decoder" type="audio/raw" />
         <!--
         <MediaCodec name="OMX.amlogic.audio.decoder.ac3" type="audio/ac3" />
         <MediaCodec name="OMX.amlogic.audio.decoder.eac3" type="audio/eac3" />
         <MediaCodec name="OMX.amlogic.audio.decoder.dtshd" type="audio/dtshd" />
         -->
-        <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.flac.decoder" type="audio/flac" />
-
-        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" />
-        <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" />
-        <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc">
-            <!-- profiles and levels:  ProfileMain : MainTierLevel51 -->
-            <Limit name="size" min="2x2" max="4096x4096" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="8x8" />
-            <Limit name="block-count" range="1-196608" /> <!-- max 4096x3072 -->
-            <Limit name="blocks-per-second" range="1-2000000" />
-            <Limit name="bitrate" range="1-10000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-       <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8">
-            <Limit name="size" min="2x2" max="2048x2048" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="block-count" range="1-8160" />
-            <Limit name="blocks-per-second" range="1-500000" />
-            <Limit name="bitrate" range="1-40000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9">
-            <Limit name="size" min="2x2" max="1280x1280" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="block-count" range="1-3600" />
-            <Limit name="blocks-per-second" range="1-108000" />
-            <Limit name="bitrate" range="1-5000000" />
-            <Feature name="adaptive-playback" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.mp3.decoder" >
-            <Type  name="audio/mpeg" />
-            <Quirk name="needs-flush-before-disable" />
-            <Quirk name="requires-flush-complete-emulation" />
-        </MediaCodec>
     </Decoders>
 
     <Settings>
@@ -226,11 +173,6 @@ Only the three quirks included above are recognized at this point:
     </Settings>
 
     <Encoders>
-        <MediaCodec name="OMX.google.amrnb.encoder" type="audio/3gpp" />
-        <MediaCodec name="OMX.google.amrwb.encoder" type="audio/amr-wb" />
-        <MediaCodec name="OMX.google.aac.encoder" type="audio/mp4a-latm" />
-        <MediaCodec name="OMX.google.flac.encoder" type="audio/flac" />
-
         <MediaCodec name="OMX.amlogic.video.encoder.hevc" type="video/hevc" >
             <Limit name="size" min="256x144" max="1920x1088" />
             <Limit name="alignment" value="16x16" />
@@ -247,23 +189,5 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-20000000" />
             <Limit name="concurrent-instances" max="3" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" >
-            <Limit name="size" min="176x144" max="640x480" />
-            <Limit name="alignment" value="16x16" />
-            <Limit name="block-size" value="16x16" />
-            <Limit name="blocks-per-second" min="1" max="1485" />
-            <Limit name="bitrate" range="192000-1440000" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" >
-            <Limit name="size" min="176x144" max="352x288" />
-            <Limit name="alignment" value="16x16" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8">
-            <!-- profiles and levels:  ProfileMain : Level_Version0-3 -->
-            <Limit name="size" min="2x2" max="896x896" />
-            <Limit name="alignment" value="2x2" />
-            <Limit name="bitrate" range="1-40000000" />
-            <Feature name="bitrate-modes" value="VBR,CBR" />
-        </MediaCodec>
     </Encoders>
 </MediaCodecs>

diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance.xml
index cab581e46a21af505f77b4df7d9fb2dfc56f60ff..47b23521f0bb25fb635441eaa31a3c0e156a89f2 100644 (file)
--- a/media/media_codecs_performance.xml
+++ b/media/media_codecs_performance.xml
@@ -28,16 +28,6 @@
             <Limit name="measured-frame-rate-1280x720" range="66-66" />
             <Limit name="performance-point-1280x720" range="60-60" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.h263.encoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="267-267" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.mpeg4.encoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="223-223" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.encoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="120-120" />
-            <Limit name="measured-frame-rate-640x360" range="37-37" />
-        </MediaCodec>
         <MediaCodec name="c2.android.h263.encoder" type="video/3gpp" update="true">
             <Limit name="measured-frame-rate-176x144" range="450-450" />
         </MediaCodec>
@@ -72,39 +62,15 @@
         <MediaCodec name="OMX.amlogic.avc.decoder.awesome2.secure" type="video/avc" update="true">
             <Limit name="performance-point-1920x1080" range="120-120" />
         </MediaCodec>
-        <MediaCodec name="OMX.amlogic.vp6a.decoder.sw" type="video/x-vnd.on2.vp6a" update="true">
-            <Limit name="performance-point-1920x1080" range="120-120" />
-        </MediaCodec>
-        <MediaCodec name="OMX.amlogic.vp6f.decoder.sw" type="video/x-vnd.on2.vp6f" update="true">
-            <Limit name="performance-point-1920x1080" range="120-120" />
-        </MediaCodec>
         <MediaCodec name="OMX.amlogic.avs.decoder.awesome" type="video/avs" update="true">
             <Limit name="performance-point-1920x1080" range="120-120" />
         </MediaCodec>
         <MediaCodec name="OMX.amlogic.avs2.decoder.awesome" type="video/avs2" update="true">
             <Limit name="performance-point-1920x1080" range="120-120" />
         </MediaCodec>
-        <MediaCodec name="OMX.amlogic.rm10.decoder.sw" type="video/rm10" update="true">
-            <Limit name="performance-point-1920x1080" range="120-120" />
-        </MediaCodec>
-        <MediaCodec name="OMX.amlogic.rm20.decoder.sw" type="video/rm20" update="true">
-            <Limit name="performance-point-1920x1080" range="120-120" />
-        </MediaCodec>
-        <MediaCodec name="OMX.amlogic.rm30.decoder.sw" type="video/rm30" update="true">
-            <Limit name="performance-point-1920x1080" range="120-120" />
-        </MediaCodec>
-        <MediaCodec name="OMX.amlogic.rm40.decoder.sw" type="video/rm40" update="true">
-            <Limit name="performance-point-1920x1080" range="120-120" />
-        </MediaCodec>
         <MediaCodec name="OMX.amlogic.vc1.decoder.awesome" type="video/vc1" update="true">
             <Limit name="performance-point-1920x1080" range="120-120" />
         </MediaCodec>
-        <MediaCodec name="OMX.amlogic.wmv1.decoder.sw" type="video/wmv1" update="true">
-            <Limit name="performance-point-1920x1080" range="120-120" />
-        </MediaCodec>
-        <MediaCodec name="OMX.amlogic.wmv2.decoder.sw" type="video/wmv2" update="true">
-            <Limit name="performance-point-1920x1080" range="120-120" />
-        </MediaCodec>
         <MediaCodec name="OMX.amlogic.wmv3.decoder.awesome" type="video/wmv3" update="true">
             <Limit name="performance-point-1920x1080" range="120-120" />
         </MediaCodec>
@@ -159,31 +125,6 @@
         <MediaCodec name="OMX.amlogic.mpeg2.decoder.awesome2" type="video/mpeg2" update="true">
             <Limit name="performance-point-1920x1080" range="120-120" />
         </MediaCodec>
-        <MediaCodec name="OMX.google.h263.decoder" type="video/3gpp" update="true">
-            <Limit name="measured-frame-rate-176x144" range="451-451" />
-            <Limit name="measured-frame-rate-352x288" range="795-795" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="604-604" />
-            <Limit name="measured-frame-rate-640x360" range="151-151" />
-            <Limit name="measured-frame-rate-720x480" range="137-137" />
-            <Limit name="measured-frame-rate-1280x720" range="62-62" />
-            <Limit name="measured-frame-rate-1920x1080" range="35-35" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.mpeg4.decoder" type="video/mp4v-es" update="true">
-            <Limit name="measured-frame-rate-176x144" range="594-594" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp8.decoder" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="676-676" />
-            <Limit name="measured-frame-rate-640x360" range="130-130" />
-            <Limit name="measured-frame-rate-1280x720" range="26-26" />
-            <Limit name="measured-frame-rate-1920x1080" range="11-11" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.vp9.decoder" type="video/x-vnd.on2.vp9" update="true">
-            <Limit name="measured-frame-rate-320x180" range="265-265" />
-            <Limit name="measured-frame-rate-640x360" range="115-115" />
-            <Limit name="measured-frame-rate-1280x720" range="49-49" />
-        </MediaCodec>
         <MediaCodec name="c2.android.h263.decoder" type="video/3gpp" update="true">
             <!-- measured 90%:423-456 med:437 N=14 -->
             <Limit name="measured-frame-rate-176x144" range="437-439" /> <!-- v90%=1.0 -->
@@ -238,12 +179,5 @@
             <Limit name="measured-frame-rate-1280x720" range="35-36" /> <!-- v90%=1.0 -->
             <Limit name="measured-frame-rate-1920x1080" range="30-30" />
         </MediaCodec>
-       <MediaCodec name="OMX.amlogic.vp8.decoder.sw" type="video/x-vnd.on2.vp8" update="true">
-            <Limit name="measured-frame-rate-320x180" range="676-676" />
-            <Limit name="measured-frame-rate-640x360" range="130-130" />
-            <Limit name="measured-frame-rate-1280x720" range="93-93" />
-            <Limit name="measured-frame-rate-1920x1080" range="42-42" />
-            <Limit name="performance-point-1920x1080" range="120-120" />
-        </MediaCodec>
     </Decoders>
 </MediaCodecs>