From 5d947faf8359deef15265052dbb174834382ec81 Mon Sep 17 00:00:00 2001
From: Omkar Chandorkar <gotenksIN@aosip.dev>
Date: Sun, 16 May 2021 15:34:54 +0000
Subject: [PATCH] sm8150-common: sync media props with CAF

Signed-off-by: Omkar Chandorkar <gotenksIN@aosip.dev>
---
 common.mk   | 7 ++++++-
 system.prop | 5 ++---
 vendor.prop | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/common.mk b/common.mk
index c4f415b5..ca3e5626 100644
--- a/common.mk
+++ b/common.mk
@@ -322,6 +322,9 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml
 
+PRODUCT_COPY_FILES += \
+    hardware/qcom-caf/sm8150/media/conf_files/msmnile/system_properties.xml:$(TARGET_COPY_OUT_VENDOR)/etc/system_properties.xml
+
 # Net
 PRODUCT_PACKAGES += \
     netutils-wrapper-1.0
@@ -345,6 +348,7 @@ PRODUCT_PACKAGES += \
     libc2dcolorconvert \
     libcodec2_hidl@1.0.vendor \
     libcodec2_vndk.vendor \
+    libmm-omxcore \
     libOmxAacEnc \
     libOmxAmrEnc \
     libOmxCore \
@@ -354,7 +358,8 @@ PRODUCT_PACKAGES += \
     libOmxVdec \
     libOmxVenc \
     libOmxVidcCommon \
-    libstagefrighthw
+    libstagefrighthw \
+    libstagefright_softomx.vendor
 
 # OnePlus
 PRODUCT_PACKAGES += \
diff --git a/system.prop b/system.prop
index 16d4926f..4fc77ac0 100644
--- a/system.prop
+++ b/system.prop
@@ -42,10 +42,9 @@ ro.hwui.texture_cache_size=72
 vendor.iop.enable_uxe=1
 
 # Media
-av.offload.enable=true
 media.settings.xml=/vendor/etc/media_profiles_vendor.xml
-vendor.swvdec.log.level=1
-vendor.vidc.debug.level=1
+media.stagefright.thumbnail.prefer_hw_codecs=true
+ro.media.recorder-max-base-layer-fps=60
 
 # Memory optimizations
 ro.vendor.qti.sys.fw.bservice_age=5000
diff --git a/vendor.prop b/vendor.prop
index 948b69ed..018e02e4 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -153,6 +153,10 @@ persist.dbg.wfc_avail_ovr=1
 # Keystore
 ro.hardware.keystore_desede=true
 
+# Media
+debug.stagefright.ccodec=1
+debug.stagefright.omx_default_rank=0
+
 # NFC
 ro.camera.notify_nfc=1