From 4c3eaf972cbed592aad12942f82af4230aaeb302 Mon Sep 17 00:00:00 2001 From: davotoula Date: Thu, 25 Sep 2025 10:53:33 +0200 Subject: [PATCH] move to LightCompressor-enhanced fork corrected image vs video compressor library names --- amethyst/build.gradle | 4 ++-- .../amethyst/service/uploads/VideoCompressionHelper.kt | 2 ++ gradle/libs.versions.toml | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/amethyst/build.gradle b/amethyst/build.gradle index 34e20e556..e700680f7 100644 --- a/amethyst/build.gradle +++ b/amethyst/build.gradle @@ -332,9 +332,9 @@ dependencies { implementation libs.audiowaveform // Video compression lib - implementation libs.abedElazizShe.image.compressor + implementation libs.abedElazizShe.video.compressor.fork // Image compression lib - implementation libs.zelory.video.compressor + implementation libs.zelory.image.compressor // Cbor for cashuB format implementation libs.kotlinx.serialization.cbor 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 894b40708..a64e102f9 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 @@ -40,6 +40,8 @@ import java.util.UUID import kotlin.coroutines.resume import kotlin.math.roundToInt +// TODO: add Auto setting. Focus on small fast streams. 4->1080p, 1080p->720p, 720p and below stay the same resolution. Use existing matrix to determine bitrate. +// TODO: use bps api and don't floor at 1Mbps data class VideoInfo( val resolution: VideoResolution, val framerate: Float, diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 896582390..691f31f5f 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.3.3" +lightcompressor = "1.4.0" markdown = "e1151c8" media3 = "1.8.0" mockk = "1.14.5" @@ -63,7 +63,7 @@ core = "1.7.0" mavenPublish = "0.34.0" [libraries] -abedElazizShe-image-compressor = { group = "com.github.AbedElazizShe", name = "LightCompressor", version.ref = "lightcompressor" } +abedElazizShe-video-compressor-fork = { group = "com.github.davotoula", name = "LightCompressor-enhanced", version.ref = "lightcompressor" } 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" } @@ -145,7 +145,7 @@ vico-charts-compose = { group = "com.patrykandpatrick.vico", name = "compose", v vico-charts-core = { group = "com.patrykandpatrick.vico", name = "core", version.ref = "vico-charts" } vico-charts-m3 = { group = "com.patrykandpatrick.vico", name = "compose-m3", version.ref = "vico-charts" } vico-charts-views = { group = "com.patrykandpatrick.vico", name = "views", version.ref = "vico-charts" } -zelory-video-compressor = { group = "id.zelory", name = "compressor", version.ref = "zelory" } +zelory-image-compressor = { group = "id.zelory", name = "compressor", version.ref = "zelory" } zoomable = { group = "net.engawapg.lib", name = "zoomable", version.ref = "zoomable" } zxing = { group = "com.google.zxing", name = "core", version.ref = "zxing" } zxing-embedded = { group = "com.journeyapps", name = "zxing-android-embedded", version.ref = "zxingAndroidEmbedded" }