diff --git a/common.mk b/common.mk
index e3fabb2..23cc78f 100644
--- a/common.mk
+++ b/common.mk
@@ -263,7 +263,6 @@ PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
$(LOCAL_PATH)/media/media_codecs_c2.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_c2.xml \
$(LOCAL_PATH)/media/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml \
- $(LOCAL_PATH)/media/media_codecs_vendor_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_vendor_audio.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 \
$(LOCAL_PATH)/media/media_profiles_vendor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_profiles_vendor.xml
diff --git a/media/blair/media_codecs_blair.xml b/media/blair/media_codecs_blair.xml
index 5981e02..5532af4 100644
--- a/media/blair/media_codecs_blair.xml
+++ b/media/blair/media_codecs_blair.xml
@@ -1,6 +1,6 @@
+
+
+
+
+
+
+
+
@@ -199,6 +207,15 @@
+
+
+
+
+
+
+
+
+
@@ -259,5 +276,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/media/blair/media_codecs_performance_blair.xml b/media/blair/media_codecs_performance_blair.xml
index 56886e0..3229362 100644
--- a/media/blair/media_codecs_performance_blair.xml
+++ b/media/blair/media_codecs_performance_blair.xml
@@ -1,138 +1,133 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/media/init.qti.media.rc b/media/init.qti.media.rc
index b55189d..0937b56 100644
--- a/media/init.qti.media.rc
+++ b/media/init.qti.media.rc
@@ -40,7 +40,7 @@ service qti-media /vendor/bin/init.qti.media.sh
oneshot
seclabel u:r:vendor_qti_media:s0
-on post-fs
+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
diff --git a/media/init.qti.media.sh b/media/init.qti.media.sh
index 231a82e..fa98e6c 100755
--- a/media/init.qti.media.sh
+++ b/media/init.qti.media.sh
@@ -2,7 +2,7 @@
#==============================================================================
# init.qti.media.sh
#
-# Copyright (c) 2020-2023, Qualcomm Technologies, Inc.
+# Copyright (c) 2020-2022, Qualcomm Technologies, Inc.
# All Rights Reserved.
# Confidential and Proprietary - Qualcomm Technologies, Inc.
#
@@ -87,21 +87,18 @@ case "$target" in
;;
"holi")
case "$soc_hwid" in
- 507|565|628)
+ 507|565)
setprop vendor.media.target_variant "_blair"
- if [ $build_codename -le "14" ]; then
+ if [ $build_codename -le "13" ]; then
setprop vendor.netflix.bsp_rev "Q4350-32962-1"
fi
;;
578)
setprop vendor.media.target_variant "_blair_lite"
- if [ $build_codename -le "14" ]; then
- setprop vendor.netflix.bsp_rev "Q4350-32962-1"
- fi
;;
454|472)
setprop vendor.media.target_variant "_holi"
- if [ $build_codename -le "14" ]; then
+ if [ $build_codename -le "13" ]; then
setprop vendor.netflix.bsp_rev "Q4350-32962-1"
fi
;;
diff --git a/media/media_codecs.xml b/media/media_codecs.xml
index 6646dc7..8c2e7bb 100644
--- a/media/media_codecs.xml
+++ b/media/media_codecs.xml
@@ -1,6 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/media/media_codecs_c2.xml b/media/media_codecs_c2.xml
index 5abcda5..6743060 100644
--- a/media/media_codecs_c2.xml
+++ b/media/media_codecs_c2.xml
@@ -85,6 +85,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -98,6 +142,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -110,11 +164,107 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/media/media_codecs_performance.xml b/media/media_codecs_performance.xml
index d48d864..f77e0d5 100644
--- a/media/media_codecs_performance.xml
+++ b/media/media_codecs_performance.xml
@@ -1,6 +1,6 @@
-
-
-
-
-
-
@@ -162,7 +156,7 @@
-
+
@@ -170,11 +164,5 @@
-
-
-
-
-
-
diff --git a/media/media_codecs_vendor_audio.xml b/media/media_codecs_vendor_audio.xml
deleted file mode 100644
index d9a1f6f..0000000
--- a/media/media_codecs_vendor_audio.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/proprietary-files.txt b/proprietary-files.txt
index ad69d64..fb3524e 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -507,7 +507,7 @@ vendor/lib64/libgcs.so
vendor/lib64/liblistensoundmodel2.so
vendor/lib64/libmulawdec.so
-# Media
+# Media - from corfur_g-user 12 S2RUBS32.51-15-9-5 76c7d7 release-keys.
system_ext/lib/libmmosal.so
system_ext/lib/libmmparser_lite.so
system_ext/lib64/libmmosal.so
@@ -528,18 +528,14 @@ vendor/lib/libqcodec2_utils.so
vendor/lib/libqcodec2_v4l2codec.so
vendor/lib64/libmmosal.so
-# Media configs
-vendor/etc/media_blair_lite/video_system_specs.json
+# Media configs - from corfur_g-user 12 S2RUBS32.51-15-9-5 76c7d7 release-keys.
vendor/etc/media_blair/video_system_specs.json
-vendor/etc/media_codecs_blair_lite.xml
-vendor/etc/media_codecs_performance_blair_lite.xml
vendor/etc/media_holi/video_system_specs.json
-vendor/etc/media_profiles_blair_lite.xml
# OEM
vendor/bin/motobox
-# OMX
+# OMX - from corfur_g-user 12 S2RUBS32.51-15-9-5 76c7d7 release-keys.
vendor/lib/libAlacSwDec.so
vendor/lib/libApeSwDec.so
vendor/lib/libFlacSwDec.so
@@ -557,7 +553,6 @@ vendor/lib/libOmxG711Dec.so
vendor/lib/libOmxMpeghDecSw.so
vendor/lib/libOmxMpeghEncSw.so
vendor/lib/libOmxQcelp13Dec.so
-vendor/lib/libOmxVideoDSMode.so
vendor/lib/libOmxWmaDec.so
vendor/lib/libdsd2pcm.so
vendor/lib64/libAlacSwDec.so