summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnver sadhique <akurun@codeaurora.org>2020-07-10 14:06:16 +0530
committerAnver sadhique <akurun@codeaurora.org>2020-07-10 14:07:25 +0530
commit43a23718c7b3c0b7867abb8f120cbf551a2e0f98 (patch)
tree4e6e6b6982687b8c0dd71da105703a650b2fa672
parent234ceaa6def43892830eeba62fec8ccab97d3e1e (diff)
conf_files: set higher priority to c2 than OMX
Change-Id: I338797dfa878ac43b1c93f7b7ebbee9783ea7034
-rw-r--r--conf_files/atoll/atoll.mk4
-rw-r--r--conf_files/msmnile/msmnile.mk4
-rw-r--r--conf_files/sm6150/sm6150.mk4
-rw-r--r--conf_files/trinket/trinket.mk2
4 files changed, 3 insertions, 11 deletions
diff --git a/conf_files/atoll/atoll.mk b/conf_files/atoll/atoll.mk
index d660bdd4..d61842dc 100644
--- a/conf_files/atoll/atoll.mk
+++ b/conf_files/atoll/atoll.mk
@@ -20,9 +20,7 @@ ifeq ($(GENERIC_ODM_IMAGE),true)
PRODUCT_ODM_PROPERTIES += debug.stagefright.ccodec=4
PRODUCT_ODM_PROPERTIES += debug.stagefright.omx_default_rank=1000
else
- $(warning "Enabling codec2.0 SW only for non-generic odm build variant")
- #Rank OMX SW codecs lower than OMX HW codecs
- PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank.sw-audio=1
+ $(warning "Enabling codec2.0 non-audio SW only for non-generic odm build variant")
PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank=0
PRODUCT_COPY_FILES += \
device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml
diff --git a/conf_files/msmnile/msmnile.mk b/conf_files/msmnile/msmnile.mk
index 34944439..216be6e6 100644
--- a/conf_files/msmnile/msmnile.mk
+++ b/conf_files/msmnile/msmnile.mk
@@ -31,10 +31,8 @@ ifeq ($(GENERIC_ODM_IMAGE),true)
device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
else ifneq ($(TARGET_FWK_SUPPORTS_AV_VALUEADDS),false)
- $(warning "Enabling codec2.0 SW only for non-generic odm build variant")
+ $(warning "Enabling codec2.0 non-audio SW only for non-generic odm build variant")
DEVICE_MANIFEST_FILE += hardware/qcom/media/conf_files/msmnile/c2_manifest.xml
- #Rank OMX SW codecs lower than OMX HW codecs
- PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank.sw-audio=1
PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank=0
PRODUCT_COPY_FILES += \
device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml \
diff --git a/conf_files/sm6150/sm6150.mk b/conf_files/sm6150/sm6150.mk
index 565f61a3..9c1db434 100644
--- a/conf_files/sm6150/sm6150.mk
+++ b/conf_files/sm6150/sm6150.mk
@@ -41,10 +41,8 @@ ifeq ($(GENERIC_ODM_IMAGE),true)
device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml \
device/qcom/common/media/media_profiles.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
else ifneq ($(TARGET_FWK_SUPPORTS_AV_VALUEADDS),false)
- $(warning "Enabling codec2.0 SW only for non-generic odm build variant")
+ $(warning "Enabling codec2.0 non-audio SW only for non-generic odm build variant")
DEVICE_MANIFEST_FILE += hardware/qcom/media/conf_files/sm6150/c2_manifest.xml
- #Rank OMX SW codecs lower than OMX HW codecs
- PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank.sw-audio=1
PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank=0
PRODUCT_PROPERTY_OVERRIDES += media.settings.xml=/vendor/etc/media_profiles_vendor.xml
PRODUCT_COPY_FILES += \
diff --git a/conf_files/trinket/trinket.mk b/conf_files/trinket/trinket.mk
index 73fc46ca..d2006e6e 100644
--- a/conf_files/trinket/trinket.mk
+++ b/conf_files/trinket/trinket.mk
@@ -13,6 +13,4 @@ PRODUCT_COPY_FILES += \
$(CONFIG_PATH)/system_properties.xml:$(TARGET_COPY_OUT_VENDOR)/etc/system_properties.xml
# Vendor property overrides
- #Rank OMX SW codecs lower than OMX HW codecs
- PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank.sw-audio=1
PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank=0