projects / GitHub / LineageOS / G12 / android_device_google_beast.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 422ea1c)
beast: Remove software omx codec references
authorAaron Kling <webgeek1234@gmail.com>
Sat, 29 Jun 2024 03:09:34 +0000 (22:09 -0500)
committerBruno Martins <bgcngm@gmail.com>
Sat, 20 Jul 2024 11:30:29 +0000 (12:30 +0100)
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

device.mk patch | blob | blame | history
media/media_codecs.xml patch | blob | blame | history
media/media_codecs_performance.xml patch | blob | blame | history

diff --git a/device.mk b/device.mk
index 058f821a0e7db3adffb9e2cca8d3cb1477d2c79a..a6e230cbe22e4e64e106fe10acbbd2922deeaf60 100644 (file)
--- a/device.mk
+++ b/device.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022-2023 The LineageOS Project
+# Copyright (C) 2022-2024 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -30,14 +30,10 @@ PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/keylayout/Vendor_0001_Product_0001.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/Vendor_0001_Product_0001.kl
 
 ## Media
-PRODUCT_COPY_FILES += \
-    $(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
+    $(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
+    $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_V1_0.xml
 
 ## Platform
 TARGET_AMLOGIC_SOC := gxl
diff --git a/media/media_codecs.xml b/media/media_codecs.xml
index ff47ae46992f00bc40b62b47cb11c9c57d15fe27..d64e14063d5e6c6681dd05bfb01bac164bcccf1a 100644 (file)
--- a/media/media_codecs.xml
+++ b/media/media_codecs.xml
@@ -225,34 +225,6 @@ Only the three quirks included above are recognized at this point:
         <MediaCodec name="OMX.amlogic.rm40.decoder.sw" type="video/rm40" />
         <MediaCodec name="OMX.amlogic.wmv2.decoder.sw" type="video/wmv2" />
         <MediaCodec name="OMX.amlogic.wmv1.decoder.sw" type="video/wmv1" />
-        <MediaCodec name="OMX.google.ffmpeg.decoder.sw" type="audio/ffmpeg" />
-        <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.adif.decoder" type="audio/aac-adif" />
-        <MediaCodec name="OMX.google.latm.decoder" type="audio/aac-latm" />
-        <MediaCodec name="OMX.google.adts.decoder" type="audio/adts" />
-        <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.wma.decoder" type="audio/wma" />
-        <MediaCodec name="OMX.google.wmapro.decoder" type="audio/wmapro" />
-        <MediaCodec name="OMX.google.ape.decoder" type="audio/ape" />
-        <MediaCodec name="OMX.google.truehd.decoder" type="audio/truehd" />
-        <MediaCodec name="OMX.google.raw.decoder" type="audio/raw" />
-        <MediaCodec name="OMX.google.dtshd.decoder" 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.h264.decoder" type="video/avc">
            <!-- profiles and levels:  ProfileBaseline : Level51 -->
             <Limit name="size" min="2x2" max="2048x2048" />
             <Limit name="alignment" value="2x2" />
@@ -262,40 +234,6 @@ Only the three quirks included above are recognized at this point:
             <Limit name="bitrate" range="1-40000000" />
             <Feature name="adaptive-playback" />
         </MediaCodec>
-        <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>
@@ -305,11 +243,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.avc" type="video/avc" >
             <Limit name="size" min="64x64" max="1920x1088" />
             <Limit name="alignment" value="16x16" />
@@ -318,23 +251,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 dbf161f9aa2714dee288ebcfc114d8343233b138..31516ffa57b5685ce709d767d7f0874c0e74c5fe 100644 (file)
--- a/media/media_codecs_performance.xml
+++ b/media/media_codecs_performance.xml
@@ -20,16 +20,6 @@
             <Limit name="measured-frame-rate-320x240" range="415-415" />
             <Limit name="measured-frame-rate-720x480" range="133-133" />
         </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>
     </Encoders>
     <Decoders>
         <MediaCodec name="OMX.amlogic.h263.decoder.awesome" type="video/3gpp" update="true">
@@ -61,36 +51,5 @@
             <Limit name="measured-frame-rate-176x144" range="228-228" />
             <Limit name="measured-frame-rate-480x360" range="209-209" />
         </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.h264.decoder" type="video/avc" update="true">
-            <Limit name="measured-frame-rate-320x240" range="290-290" />
-            <Limit name="measured-frame-rate-720x480" range="115-115" />
-            <Limit name="measured-frame-rate-1280x720" range="43-43" />
-            <Limit name="measured-frame-rate-1920x1080" range="18-18" />
-        </MediaCodec>
-        <MediaCodec name="OMX.google.hevc.decoder" type="video/hevc" update="true">
-            <Limit name="measured-frame-rate-352x288" range="247-247" />
-            <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>
     </Decoders>
 </MediaCodecs>