From e0e721cb27490d8c91f62f69ca2ce92ee92fa6ee Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 26 Aug 2025 10:55:55 +0200 Subject: [PATCH 1/4] Add unit test on VideoCompressorHelper --- libraries/androidutils/build.gradle.kts | 1 + .../media/VideoCompressorHelperTest.kt | 67 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt diff --git a/libraries/androidutils/build.gradle.kts b/libraries/androidutils/build.gradle.kts index 0c58f6ce8c..62cef138d2 100644 --- a/libraries/androidutils/build.gradle.kts +++ b/libraries/androidutils/build.gradle.kts @@ -38,6 +38,7 @@ dependencies { testImplementation(libs.test.junit) testImplementation(libs.test.truth) testImplementation(libs.test.robolectric) + testImplementation(libs.androidx.test.ext.junit) testImplementation(libs.coroutines.core) testImplementation(libs.coroutines.test) testImplementation(projects.services.toolbox.test) diff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt new file mode 100644 index 0000000000..dbc80530fd --- /dev/null +++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt @@ -0,0 +1,67 @@ +/* + * Copyright 2025 New Vector Ltd. + * + * SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial + * Please see LICENSE files in the repository root for full details. + */ + +package io.element.android.libraries.androidutils.media + +import android.util.Size +import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith + +@RunWith(AndroidJUnit4::class) +class VideoCompressorHelperTest { + @Test + fun `test getOutputSize`() { + val helper = VideoCompressorHelper(maxSize = 720) + + // Landscape input + var inputSize = Size(1920, 1080) + var outputSize = helper.getOutputSize(inputSize) + assertThat(outputSize).isEqualTo(Size(720, 405)) + + // Landscape input small height + inputSize = Size(1920, 200) + outputSize = helper.getOutputSize(inputSize) + assertThat(outputSize).isEqualTo(Size(720, 75)) + + // Portrait input + inputSize = Size(1080, 1920) + outputSize = helper.getOutputSize(inputSize) + assertThat(outputSize).isEqualTo(Size(405, 720)) + + // Portrait input small width + inputSize = Size(200, 1920) + outputSize = helper.getOutputSize(inputSize) + assertThat(outputSize).isEqualTo(Size(75, 720)) + + // Square input + inputSize = Size(1000, 1000) + outputSize = helper.getOutputSize(inputSize) + assertThat(outputSize).isEqualTo(Size(720, 720)) + + // Square input same size + inputSize = Size(720, 720) + outputSize = helper.getOutputSize(inputSize) + assertThat(outputSize).isEqualTo(Size(720, 720)) + + // Square input no downscaling + inputSize = Size(240, 240) + outputSize = helper.getOutputSize(inputSize) + assertThat(outputSize).isEqualTo(Size(240, 240)) + + // Small input landscape (no downscaling) + inputSize = Size(640, 480) + outputSize = helper.getOutputSize(inputSize) + assertThat(outputSize).isEqualTo(Size(640, 480)) + + // Small input portrait (no downscaling) + inputSize = Size(480, 640) + outputSize = helper.getOutputSize(inputSize) + assertThat(outputSize).isEqualTo(Size(480, 640)) + } +} From ed7a36e768daa4a859de74b9160d9e22498893b5 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 26 Aug 2025 11:07:24 +0200 Subject: [PATCH 2/4] Improve code readability a bit. --- .../libraries/androidutils/media/VideoCompressorHelper.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelper.kt b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelper.kt index fd1440b117..3ac32fd3a9 100644 --- a/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelper.kt +++ b/libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelper.kt @@ -27,7 +27,7 @@ class VideoCompressorHelper( fun getOutputSize(inputSize: Size): Size { val resultMajor = min(inputSize.major(), maxSize) val aspectRatio = inputSize.major().toFloat() / inputSize.minor().toFloat() - return if (inputSize.width >= inputSize.height) { + return if (inputSize.isLandscape()) { Size(resultMajor, (resultMajor / aspectRatio).roundToInt()) } else { Size((resultMajor / aspectRatio).roundToInt(), resultMajor) @@ -46,5 +46,6 @@ class VideoCompressorHelper( } } -internal fun Size.major(): Int = if (width > height) width else height -internal fun Size.minor(): Int = if (width < height) width else height +private fun Size.isLandscape(): Boolean = width > height +private fun Size.major(): Int = if (isLandscape()) width else height +private fun Size.minor(): Int = if (isLandscape()) height else width From 4fea4bb72814f7a49931a457d476ecbc9afe83aa Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 26 Aug 2025 11:13:49 +0200 Subject: [PATCH 3/4] Add test on calculateOptimalBitrate --- .../androidutils/media/VideoCompressorHelperTest.kt | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt index dbc80530fd..7321533035 100644 --- a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt +++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt @@ -64,4 +64,16 @@ class VideoCompressorHelperTest { outputSize = helper.getOutputSize(inputSize) assertThat(outputSize).isEqualTo(Size(480, 640)) } + + @Test + fun `test calculateOptimalBitrate`() { + val helper = VideoCompressorHelper(maxSize = 720) + val inputSize = Size(1920, 1080) + var bitrate = helper.calculateOptimalBitrate(inputSize, frameRate = 30) + // Output size will be 720x405, so bitrate = 720*405*0.1*30 = 874800 + assertThat(bitrate).isEqualTo(874800L) + // Half frame rate, half bitrate + bitrate = helper.calculateOptimalBitrate(inputSize, frameRate = 15) + assertThat(bitrate).isEqualTo(437400L) + } } From c66de6aa28c2888d726488ef7cc768bf7959c0f3 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 26 Aug 2025 12:16:20 +0200 Subject: [PATCH 4/4] Increase readability of big numbers. --- .../libraries/androidutils/media/VideoCompressorHelperTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt index 7321533035..96d15d6bfa 100644 --- a/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt +++ b/libraries/androidutils/src/test/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelperTest.kt @@ -71,9 +71,9 @@ class VideoCompressorHelperTest { val inputSize = Size(1920, 1080) var bitrate = helper.calculateOptimalBitrate(inputSize, frameRate = 30) // Output size will be 720x405, so bitrate = 720*405*0.1*30 = 874800 - assertThat(bitrate).isEqualTo(874800L) + assertThat(bitrate).isEqualTo(874_800L) // Half frame rate, half bitrate bitrate = helper.calculateOptimalBitrate(inputSize, frameRate = 15) - assertThat(bitrate).isEqualTo(437400L) + assertThat(bitrate).isEqualTo(437_400L) } }