From db82e7c8be34e1fae0343d3c520e06c3c4524771 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Fri, 5 Jul 2024 00:27:27 +0300 Subject: [PATCH] sm6375-common: Move qti media init scripts to vendor Change-Id: I55f5f48f41ea362aa5a19483ec40c411039c4459 --- common.mk | 4 --- media/init.qti.media.rc | 54 ------------------------------ media/init.qti.media.sh | 73 ----------------------------------------- proprietary-files.txt | 1 + 4 files changed, 1 insertion(+), 131 deletions(-) delete mode 100644 media/init.qti.media.rc delete mode 100644 media/init.qti.media.sh diff --git a/common.mk b/common.mk index d83479c..79984cf 100644 --- a/common.mk +++ b/common.mk @@ -208,10 +208,6 @@ PRODUCT_PACKAGES += \ vendor.lineage.livedisplay@2.1-service.motorola_holi # Media -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/media/init.qti.media.sh:$(TARGET_COPY_OUT_VENDOR)/bin/init.qti.media.sh \ - $(LOCAL_PATH)/media/init.qti.media.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.qti.media.rc - PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/media/lahaina/media_codecs_lahaina_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_lahaina.xml \ $(LOCAL_PATH)/media/lahaina/media_codecs_performance_lahaina_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_lahaina.xml \ diff --git a/media/init.qti.media.rc b/media/init.qti.media.rc deleted file mode 100644 index 6272b3c..0000000 --- a/media/init.qti.media.rc +++ /dev/null @@ -1,54 +0,0 @@ -#============================================================================== -# init.qti.media.rc -# -# Copyright (c) 2020 Qualcomm Technologies, Inc. -# All Rights Reserved. -# Confidential and Proprietary - Qualcomm Technologies, Inc. -# -# Copyright (c) 2020, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#=============================================================================== -service qti-media /vendor/bin/init.qti.media.sh - class main - user media - group media - disabled - oneshot - seclabel u:r:vendor_qti_media:s0 - -on early-init - setprop vendor.media.target.qssi ${vendor.sys.media.target.qssi} - setprop vendor.media.system.build_codename ${ro.build.version.release_or_codename} - start qti-media - -on post-fs-data - setprop ro.media.xml_variant.codecs ${vendor.media.target_variant} - setprop ro.media.xml_variant.codecs_performance ${vendor.media.target_variant} - setprop ro.media.xml_variant.profiles ${vendor.media.target_variant} - -on property:vendor.netflix.bsp_rev=* - setprop ro.netflix.bsp_rev ${vendor.netflix.bsp_rev} diff --git a/media/init.qti.media.sh b/media/init.qti.media.sh deleted file mode 100644 index 0fdffd0..0000000 --- a/media/init.qti.media.sh +++ /dev/null @@ -1,73 +0,0 @@ -#! /vendor/bin/sh -#============================================================================== -# init.qti.media.sh -# -# Copyright (c) 2020-2022, Qualcomm Technologies, Inc. -# All Rights Reserved. -# Confidential and Proprietary - Qualcomm Technologies, Inc. -# -# Copyright (c) 2020, The Linux Foundation. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided -# with the distribution. -# * Neither the name of The Linux Foundation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -#=============================================================================== - -if [ -f /sys/devices/soc0/soc_id ]; then - soc_hwid=`cat /sys/devices/soc0/soc_id` 2> /dev/null -else - soc_hwid=`cat /sys/devices/system/soc/soc0/id` 2> /dev/null -fi - -target=`getprop ro.board.platform` -case "$target" in - "lahaina") - case "$soc_hwid" in - 475|515) - sku_ver=`cat /sys/devices/platform/soc/aa00000.qcom,vidc/sku_version` 2> /dev/null - if [ $sku_ver -eq 1 ]; then - setprop vendor.media.target_variant "_yupik_v1" - else - setprop vendor.media.target_variant "_yupik_v0" - fi - setprop vendor.netflix.bsp_rev "Q7325-SPY-33758-1" - ;; - 450) - sku_ver=`cat /sys/devices/platform/soc/aa00000.qcom,vidc/sku_version` 2> /dev/null - if [ $sku_ver -eq 1 ]; then - setprop vendor.media.target_variant "_shima_v1" - elif [ $sku_ver -eq 2 ]; then - setprop vendor.media.target_variant "_shima_v2" - else - setprop vendor.media.target_variant "_shima_v3" - fi - setprop vendor.netflix.bsp_rev "Q875-32774-1" - ;; - *) - setprop vendor.media.target_variant "_lahaina" - setprop vendor.netflix.bsp_rev "Q875-32408-1" - ;; - esac - ;; -esac diff --git a/proprietary-files.txt b/proprietary-files.txt index d79a4ae..ee49db3 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -518,6 +518,7 @@ system_ext/lib/libmmparser_lite.so system_ext/lib64/libmmosal.so system_ext/lib64/libmmparser_lite.so vendor/bin/hw/vendor.qti.media.c2@1.0-service +vendor/bin/init.qti.media.sh vendor/etc/init/init.qti.media.rc vendor/etc/init/vendor.qti.media.c2@1.0-service.rc vendor/etc/media/video_system_specs.json