Remove OMX configs and fix vts issue

1) Remove all OMX releated configurations; 2) Resolve the VTS CheckConfig failed. Tracked-On: OAM-118472 Signed-off-by: Wan, Hao <haox.wan@intel.com>
projectceladon · Jul 18, 2024 · 15999a8 · 15999a8
1 parent 12e5b9d
commit 15999a8
Show file tree

Hide file tree

Showing 30 changed files with 22 additions and 2,307 deletions.
diff --git a/groups/aaf/cfc/init.rc b/groups/aaf/cfc/init.rc
@@ -6,5 +6,3 @@ on fs
     setprop vendor.sys.display.size 540x960
     setprop ro.hardware.gralloc ${vendor.gralloc.set}
     setprop ro.power.fixed_performance_scale_factor ${vendor.power.fixed_performance_scale_factor}
-    setprop ro.media.xml_variant.codecs ${ro.vendor.media.target_variant}
-    setprop ro.media.xml_variant.codecs_performance ${ro.vendor.media.target_variant_platform}
diff --git a/groups/aaf/true/init.rc b/groups/aaf/true/init.rc
@@ -7,5 +7,3 @@ on fs
     setprop ro.hardware.egl ${vendor.egl.set}
     setprop ro.hardware.vulkan ${vendor.vulkan.set}
     setprop ro.power.fixed_performance_scale_factor ${vendor.power.fixed_performance_scale_factor}
-    setprop ro.media.xml_variant.codecs ${ro.vendor.media.target_variant}
-    setprop ro.media.xml_variant.codecs_performance ${ro.vendor.media.target_variant_platform}
diff --git a/groups/codec2/doc.spec b/groups/codec2/doc.spec
@@ -8,6 +8,18 @@ codec2 is used to support Codec 2.0 for Video/Audio since Android Q-Desser.
 this option is used to enable support for external camera in build
 
     --- parameters
+        - platform:     select the media_codecs_performance_c2.xml based on platform
+        - hw_vd_mp2:    select hw accelerated mpeg2 decoder
+        - hw_vd_vc1:    select hw accelerated vc1 decoder
+        - hw_vd_vp9:    select hw accelerated vp9 decoder
+        - hw_vd_vp8:    select hw accelerated vp8 decoder
+        - hw_vd_h265:   select hw accelerated h.265 decoder
+        - hw_ve_vp8:    select hw accelerated vp8 encoder
+        - hw_ve_vp9:    select hw accelerated vp9 encoder
+        - hw_ve_h265:   select hw accelerated h.265 encoder
+        - hw_ve_h264:   select hw accelerated h.264 encoder
+        - hw_vd_h264:   select hw accelerated h.264 decoder
+        - hw_vd_av1：   select hw accelerated av1 decoder
 
     --- code dir
 	- frameworks/av/media/codec2

diff --git a/groups/codec2/true/files.spec b/groups/codec2/true/files.spec
@@ -4,3 +4,4 @@ media_codecs_performance_c2_adl.xml: "Media codec2.0 performance file for alderl
 mfx_c2_store.conf: "MSDK configuration for video codec2.0"
 media_codecs_c2.xml: "Specific configuration for audio and video codec2.0"
 media_codecs_intel_c2_video.xml: "Specific configuration for intel video codec2.0"
+media_profiles_1080p.xml: "Media profile file with 1080p support"
diff --git a/groups/codec2/true/media_codecs_intel_c2_video.xml b/groups/codec2/true/media_codecs_intel_c2_video.xml
@@ -60,7 +60,7 @@ and updated to vendor media codecs.
 
 {{#hw_vd_vp9}}
         <MediaCodec name="c2.intel.vp9.decoder" type="video/x-vnd.on2.vp9">
-            <Alias name="OMX.intel.vp9.decoder" /> <!--[WA]ijkplayer only knows the name starts with "OMX" -->:
+            <Alias name="OMX.intel.vp9.decoder" /> <!--[WA]ijkplayer only knows the name starts with "OMX" -->
             <Limit name="size" min="64x64" max="8192x8192" />
             <Limit name="alignment" value="2x2" />
             <Limit name="block-size" value="16x16" />
@@ -128,7 +128,7 @@ and updated to vendor media codecs.
             <Limit name="performance-point-1920x1080" value="180" />
             <Feature name="bitrate-modes" value="VBR,CBR" />
             <!--Feature name="intra-refresh" /-->
-            <Diagnostics dumpOutput="false" />
+            <!--<Diagnostics dumpOutput="false" />-->
         </MediaCodec>
 {{/hw_ve_h264}}
 

diff --git a/...ecs/configurable/media_profiles_1080p.xml → groups/codec2/true/media_profiles_1080p.xml b/...ecs/configurable/media_profiles_1080p.xml → groups/codec2/true/media_profiles_1080p.xml
diff --git a/groups/codec2/true/option.spec b/groups/codec2/true/option.spec
@@ -10,7 +10,7 @@ hw_ve_vp8 = false
 hw_ve_vp9 = false
 hw_ve_h265 = true
 hw_ve_h264 = true
-gpu = gen12
 platform = adl
 enable_msdk_c2 = true
 use_onevpl = true
+profile_file = media_profiles_1080p.xml
diff --git a/groups/codec2/true/product.mk b/groups/codec2/true/product.mk
@@ -1,8 +1,12 @@
-# MSDK codec2.0 support.
+# Audio/video codec support.
+PRODUCT_COPY_FILES += \
+    frameworks/av/media/libstagefright/data/media_codecs_google_c2_audio.xml:vendor/etc/media_codecs_google_c2_audio.xml \
+    $(LOCAL_PATH)/{{_extra_dir}}/{{profile_file}}:vendor/etc/media_profiles_V1_0.xml
 
+# MSDK codec2.0 support.
 {{#enable_msdk_c2}}
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_performance_c2_adl.xml:vendor/etc/media_codecs_performance_c2.xml \
+    $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_performance_c2_{{platform}}.xml:vendor/etc/media_codecs_performance_c2.xml \
     $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_performance_c2_tgl.xml:vendor/etc/media_codecs_performance_tgl.xml \
     $(LOCAL_PATH)/{{_extra_dir}}/media_codecs_performance_c2_adl.xml:vendor/etc/media_codecs_performance_adl.xml \
     $(LOCAL_PATH)/{{_extra_dir}}/mfx_c2_store.conf:vendor/etc/mfx_c2_store.conf \

diff --git a/groups/codecs/configurable/AndroidBoard.mk b/groups/codecs/configurable/AndroidBoard.mk
diff --git a/groups/codecs/configurable/BoardConfig.mk b/groups/codecs/configurable/BoardConfig.mk
diff --git a/groups/codecs/configurable/auto_hal.in b/groups/codecs/configurable/auto_hal.in
diff --git a/groups/codecs/configurable/files.spec b/groups/codecs/configurable/files.spec
diff --git a/groups/codecs/configurable/media_codecs_gen12.xml b/groups/codecs/configurable/media_codecs_gen12.xml