From 2a3c31cc5b785327bd213ce2292bde75963d08be Mon Sep 17 00:00:00 2001 From: davotoula Date: Sun, 12 Oct 2025 21:13:12 +0200 Subject: [PATCH 1/2] Use latest LightCompressor-enhanced: Fix for Progressive download Replaced obsolete MP4 parser libraries with native MediaMuxer/MediaCodec --- amethyst/build.gradle | 6 ------ .../amethyst/service/uploads/VideoCompressionHelper.kt | 9 +-------- gradle/libs.versions.toml | 2 +- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/amethyst/build.gradle b/amethyst/build.gradle index aa3084380..b30502c32 100644 --- a/amethyst/build.gradle +++ b/amethyst/build.gradle @@ -151,12 +151,6 @@ android { signingConfig = signingConfigs.debug } } - // TODO: remove this when lightcompressor uses one MP4 parser only - packaging { - resources { - resources.pickFirsts.add('builddef.lst') - } - } flavorDimensions = ["channel"] diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt index 2369431f7..73fd68267 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt @@ -257,16 +257,9 @@ object VideoCompressionHelper { "Compressed [$size] ($reductionPercent% reduction)", ) - // Attempt to correct the path: if it contains "_temp" then remove it - val correctedPath = - if (path.contains("_temp")) { - path.replace("_temp", "") - } else { - path - } if (continuation.isActive) { continuation.resume( - MediaCompressorResult(Uri.fromFile(File(correctedPath)), contentType, size), + MediaCompressorResult(Uri.fromFile(File(path)), contentType, size), ) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c1527b5dd..595a5d690 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,7 +33,7 @@ languageId = "17.0.6" lazysodiumAndroid = "5.2.0" lazysodiumJava = "5.2.0" lifecycleRuntimeKtx = "2.9.4" -lightcompressor = "1.5.0" +lightcompressor = "use-native-libraries-for-avc-and-hevc-SNAPSHOT" markdown = "f92ef49c9d" media3 = "1.8.0" mockk = "1.14.5" From 13402fa5d4b856842a86e2e65195a0137baf05ba Mon Sep 17 00:00:00 2001 From: davotoula Date: Mon, 13 Oct 2025 09:25:11 +0200 Subject: [PATCH 2/2] Use lightcompressor-enhanced 1.6.0 release --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 595a5d690..69aa099e4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -33,7 +33,7 @@ languageId = "17.0.6" lazysodiumAndroid = "5.2.0" lazysodiumJava = "5.2.0" lifecycleRuntimeKtx = "2.9.4" -lightcompressor = "use-native-libraries-for-avc-and-hevc-SNAPSHOT" +lightcompressor-enhanced = "1.6.0" markdown = "f92ef49c9d" media3 = "1.8.0" mockk = "1.14.5" @@ -63,7 +63,7 @@ core = "1.7.0" mavenPublish = "0.34.0" [libraries] -abedElazizShe-video-compressor-fork = { group = "com.github.davotoula", name = "LightCompressor-enhanced", version.ref = "lightcompressor" } +abedElazizShe-video-compressor-fork = { group = "com.github.davotoula", name = "LightCompressor-enhanced", version.ref = "lightcompressor-enhanced" } accompanist-adaptive = { group = "com.google.accompanist", name = "accompanist-adaptive", version.ref = "accompanistAdaptive" } accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanistAdaptive" } androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }