From ee488ea0b840a975ecea486f3f6be28414444204 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Wed, 23 Oct 2024 10:36:58 -0400
Subject: [PATCH] Rename some video constants for readability.

---
 .../org/thoughtcrime/securesms/mms/PushMediaConstraints.java | 5 +++--
 .../org/thoughtcrime/securesms/video/TranscodingQuality.kt   | 4 +++-
 .../securesms/video/videoconverter/utils/VideoConstants.kt   | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
index 081a3ae6c0..33458951fb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/PushMediaConstraints.java
@@ -95,7 +95,7 @@ public class PushMediaConstraints extends MediaConstraints {
 
     if (sentMediaQuality == SentMediaQuality.HIGH) {
       if (DeviceCapabilities.canEncodeHevc() && (RemoteConfig.useHevcEncoder() || SignalStore.internal().getHevcEncoding())) {
-        return MediaConfig.LEVEL_4;
+        return MediaConfig.LEVEL_3_H265;
       } else {
         return MediaConfig.LEVEL_3;
       }
@@ -109,7 +109,8 @@ public class PushMediaConstraints extends MediaConstraints {
     LEVEL_1(false, 1, MB, new int[] { 1600, 1024, 768, 512 }, 70, TranscodingPreset.LEVEL_1),
     LEVEL_2(false, 2, (int) (1.5 * MB), new int[] { 2048, 1600, 1024, 768, 512 }, 75, TranscodingPreset.LEVEL_2),
     LEVEL_3(false, 3, (int) (3 * MB), new int[] { 4096, 3072, 2048, 1600, 1024, 768, 512 }, 75, TranscodingPreset.LEVEL_3),
-    LEVEL_4(false, 4, 3 * MB, new int[] { 4096, 3072, 2048, 1600, 1024, 768, 512 }, 75, TranscodingPreset.LEVEL_4);
+    /** Experimental H265 level */
+    LEVEL_3_H265(false, 4, 3 * MB, new int[] { 4096, 3072, 2048, 1600, 1024, 768, 512 }, 75, TranscodingPreset.LEVEL_3_H265);
 
     private final boolean           isLowMemory;
     private final int               level;
diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/TranscodingQuality.kt b/video/lib/src/main/java/org/thoughtcrime/securesms/video/TranscodingQuality.kt
index abc98012f7..cca94e7cc8 100644
--- a/video/lib/src/main/java/org/thoughtcrime/securesms/video/TranscodingQuality.kt
+++ b/video/lib/src/main/java/org/thoughtcrime/securesms/video/TranscodingQuality.kt
@@ -42,7 +42,9 @@ enum class TranscodingPreset(@VideoCodec val videoCodec: String, val videoShortE
   LEVEL_1(MediaConverter.VIDEO_CODEC_H264, VideoConstants.VIDEO_SHORT_EDGE_SD, VideoConstants.VIDEO_BITRATE_L1, VideoConstants.AUDIO_BITRATE),
   LEVEL_2(MediaConverter.VIDEO_CODEC_H264, VideoConstants.VIDEO_SHORT_EDGE_HD, VideoConstants.VIDEO_BITRATE_L2, VideoConstants.AUDIO_BITRATE),
   LEVEL_3(MediaConverter.VIDEO_CODEC_H264, VideoConstants.VIDEO_SHORT_EDGE_HD, VideoConstants.VIDEO_BITRATE_L3, VideoConstants.AUDIO_BITRATE),
-  LEVEL_4(MediaConverter.VIDEO_CODEC_H265, VideoConstants.VIDEO_SHORT_EDGE_HD, VideoConstants.VIDEO_BITRATE_L3, VideoConstants.AUDIO_BITRATE);
+
+  /** Experimetnal H265 level */
+  LEVEL_3_H265(MediaConverter.VIDEO_CODEC_H265, VideoConstants.VIDEO_SHORT_EDGE_HD, VideoConstants.VIDEO_BITRATE_L3, VideoConstants.AUDIO_BITRATE);
 
   fun calculateMaxVideoUploadDurationInSeconds(upperFileSizeLimit: Long): Int {
     val upperFileSizeLimitWithMargin = (upperFileSizeLimit / 1.1).toLong()
diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/VideoConstants.kt b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/VideoConstants.kt
index 418f97846e..5e311d1b22 100644
--- a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/VideoConstants.kt
+++ b/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/VideoConstants.kt
@@ -9,7 +9,7 @@ import android.media.MediaFormat
 object VideoConstants {
   const val AUDIO_BITRATE = 128_000
   const val VIDEO_BITRATE_L1 = 1_250_000
-  const val VIDEO_BITRATE_L2 = VIDEO_BITRATE_L1
+  const val VIDEO_BITRATE_L2 = 1_250_000
   const val VIDEO_BITRATE_L3 = 2_500_000
   const val VIDEO_SHORT_EDGE_SD = 480
   const val VIDEO_SHORT_EDGE_HD = 720