Use variable bitrate mode when transcoding to ensure compatibility with old devices (#5223)

* Use variable bitrate mode when transcoding

This should be compatible with more devices that may lack the needed codecs to properly encode using constant bitrate mode (CBR).

* Fix video output size (again)

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/media/VideoCompressorHelper.kt

@@ -27,7 +27,11 @@ class VideoCompressorHelper(
     fun getOutputSize(inputSize: Size): Size {
         val resultMajor = min(inputSize.major(), maxSize)
         val aspectRatio = inputSize.major().toFloat() / inputSize.minor().toFloat()
-        return Size(resultMajor, (resultMajor / aspectRatio).roundToInt())
+        return if (inputSize.width >= inputSize.height) {
+            Size(resultMajor, (resultMajor / aspectRatio).roundToInt())
+        } else {
+            Size((resultMajor / aspectRatio).roundToInt(), resultMajor)
+        }
     }
 
     /**

libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/ThumbnailFactory.kt

@@ -123,8 +123,8 @@ class ThumbnailFactory @Inject constructor(
         val thumbnailResult = ThumbnailResult(
             file = thumbnailFile,
             info = ThumbnailInfo(
-                height = bitmapThumbnail.height.toLong(),
                 width = bitmapThumbnail.width.toLong(),
+                height = bitmapThumbnail.height.toLong(),
                 mimetype = mimeTypeToThumbnailMimeType(mimeType),
                 size = thumbnailFile.length()
             ),

libraries/mediaupload/impl/src/main/kotlin/io/element/android/libraries/mediaupload/impl/VideoCompressor.kt

@@ -61,8 +61,8 @@ class VideoCompressor @Inject constructor(
         val width = metadata?.width ?: Int.MAX_VALUE
         val height = metadata?.height ?: Int.MAX_VALUE
 
-        val videoResizeEffect = videoCompressorConfig.videoCompressorHelper?.let {
+        val videoResizeEffect = run {
-            val outputSize = it.getOutputSize(Size(width, height))
+            val outputSize = videoCompressorConfig.videoCompressorHelper.getOutputSize(Size(width, height))
             if (metadata?.rotation == 90 || metadata?.rotation == 270) {
                 // If the video is rotated, we need to swap width and height
                 Presentation.createForWidthAndHeight(
@@ -89,19 +89,14 @@ class VideoCompressor @Inject constructor(
         val inputMediaItem = MediaItem.fromUri(uri)
         val outputMediaItem = EditedMediaItem.Builder(inputMediaItem)
             .setFrameRate(newFrameRate)
-            .run {
+            .setEffects(Effects(emptyList(), listOf(videoResizeEffect)))
-                if (videoResizeEffect != null) {
-                    setEffects(Effects(emptyList(), listOf(videoResizeEffect)))
-                } else {
-                    this
-                }
-            }
             .build()
 
         val encoderFactory = DefaultEncoderFactory.Builder(context)
             .setRequestedVideoEncoderSettings(
                 VideoEncoderSettings.Builder()
-                    .setBitrateMode(MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_CBR)
+                    // Use VBR which is generally better for quality and compatibility, although slightly worse for file size
+                    .setBitrateMode(MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_VBR)
                     .setBitrate(newBitrate)
                     .build()
             )