From c159f4a88782c6db2a5ef0343c95d94fd228b497 Mon Sep 17 00:00:00 2001
From: SGCMarkus <markusornik@gmail.com>
Date: Thu, 11 Aug 2022 14:01:31 +0200
Subject: [PATCH] sm7325-common: use media_codecs_yupik_v0.xml also for v1

both ro.media.xml_variant.codecs and ro.media.xml_variant.codecs_performance are
set to _yupik_v1, but media_codecs_yupik_v1.xml, but it does not contain any
video codecs.
This causes video playback (e.g. Youtube) to only support up to 1080p60 (stuttering)
without HDR. Trying to record videos in >1080p will also result in the camera HAL
crashing.

Using the v0 config for v1 too fixes both issues. Youtube now supports up
to 4K60 with HDR, and camera recording in >1080p works.

Change-Id: I498c2fca380618dea4768e9d3fcda77585b1de97
---
 media/media_codecs_yupik_v1.xml | 97 ---------------------------------
 sm7325.mk                       |  2 +-
 2 files changed, 1 insertion(+), 98 deletions(-)
 delete mode 100644 media/media_codecs_yupik_v1.xml

diff --git a/media/media_codecs_yupik_v1.xml b/media/media_codecs_yupik_v1.xml
deleted file mode 100644
index f758ecd..0000000
--- a/media/media_codecs_yupik_v1.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!--
-    Copyright (c) 2018-2021 Qualcomm Technologies, Inc.
-    All Rights Reserved.
-    Confidential and Proprietary - Qualcomm Technologies, Inc.
-
-    Not a Contribution.
-
-    Copyright (C) 2012-2018 The Linux Foundation. All rights reserved.
-    Copyright (C) 2012-2013 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-
-<!--
-"performance-point"
-    Vendor-guaranteed performance advertised to the applications
-        <Limit name="performance-point-widthxheight" value="fps" />
-
-    -For each of the resolutions, the advertised fps is the max supported,
-    with HW-friendly color format and considering video-only.
-    -Performance for any intermediate resolution will be that of the
-    next-higher-advertised-resolution.
-
-    standard sizes: 480p/576p (SD), 720p (HD), 1080p (FHD), 2160p (UHD)
-    standard frame rates: 24, 25, 30, 48+, 50, 60, 100*, 120*, 200*, 240* fps
-        * HD+ only
-        + SD only
-    - All supported standard performance points are listed (unless they are
-    covered by another listed standard performance point)
-    - Non-standard performance points are listed along with all the standard
-    performance points covered by them.
--->
-
-<!--
- Lahaina Non-Secure decoder capabilities
- (MB is defined as 16x16)
- _______________________________________________________
- | Codec       |  W      H      fps     Mbps    MB/s   |
- |_____________|_______________________________________|
- | h264        | 3840   2176    60      100    1958400 |
- |             | 4096   2176    48      100            |
- | hevc        | 3840   2176    60      100    1958400 |
- |             | 4096   2176    48      100            |
- | vp9         | 3840   2176    60      100    1958400 |
- |             | 4096   2176    48      100            |
- | mpeg2       | 1920   1088    30       40     244800 |
- |_____________|_______________________________________|
-
- Lahaina Secure decoder capabilities
- (MB is defined as 16x16)
- __________________________________________________
- | Codec    |  W      H      fps    Mbps   MB/s   |
- |__________|_____________________________________|
- | h264     | 3840   2176    60     40    1958400 |
- |          | 4096   2176    48     40            |
- | vp9      | 3840   2176    60     40    1958400 |
- |          | 4096   2176    48     40            |
- | hevc     | 3840   2176    60     40    1958400 |
- |          | 4096   2176    48     40            |
- |__________|_____________________________________|
-
- Lahaina Non-Secure encoder capabilities (Secure not supported)
- (MB is defined as 16x16)
- __________________________________________________
- | Codec    |  W      H      fps   Mbps    MB/s   |
- |__________|_____________________________________|
- | h264     | 3840   2176    60    100    1958400 |
- |          | 4096   2176    48    100            |
- | hevc     | 3840   2176    60    100    1958400 |
- |          | 4096   2176    48    100            |
- |__________|_____________________________________|
--->
-
-<!--
-1) media_codecs.xml is used omx, C2 is copied to the media_codecs_c2.xml
-2) media_codecs_google_audio|video|c2.xml are removed, and instead of c2 from
-   /apex/com.android.media.swcodec/etc/media_codecs.xml
-3) media_codecs_google_telephony.xml is removed,it is copyed to media_codecs_c2.xml
-   The replacement file is media_codecs_google_c2_telephony.xml
-   ref frameworks/av/media/libstagefright/data/media_codecs_google_c2_telephony.xml
--->
-<MediaCodecs>
-    <Include href="media_codecs_google_audio.xml" />
-    <Include href="media_codecs_vendor_audio.xml" />
-
-</MediaCodecs>
diff --git a/sm7325.mk b/sm7325.mk
index 3133141..35bd973 100644
--- a/sm7325.mk
+++ b/sm7325.mk
@@ -262,7 +262,7 @@ PRODUCT_PACKAGES += \
 # Media
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/media/media_codecs_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v0.xml \
-    $(LOCAL_PATH)/media/media_codecs_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v1.xml \
+    $(LOCAL_PATH)/media/media_codecs_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_yupik_v1.xml \
     $(LOCAL_PATH)/media/media_codecs_performance_yupik_v0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v0.xml \
     $(LOCAL_PATH)/media/media_codecs_performance_yupik_v1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance_yupik_v1.xml \
     $(LOCAL_PATH)/media/media_profiles_V1_0.xml:$(TARGET_COPY_OUT_ODM)/etc/media_profiles_V1_0.xml