Merge pull request #114 from a914-gowtham/master

a914-gowtham · web-flow · commit c20d49cb3612 · 2025-08-25T23:10:08.000+05:30
media3 migration first commit
diff --git a/README.md b/README.md
@@ -6,11 +6,11 @@
 This library is deprecated, it was depended on [ffmpeg-kit](https://github.com/arthenica/ffmpeg-kit?tab=readme-ov-file). Since ffmpeg-kit has been removed, due to ffmpeg license issue. 
 hereafter, users will encounter a "failed to resolve" issue. 
 
-### Solution: 
+### Alternates:
+1. https://github.com/Hassaan-Javed/gowtham-video-trimmer-fork - instead of FFmpeg, [LiTr library](https://github.com/linkedin/LiTr) is used in this fork.
+
+2. Fork this repo and replace video processing part with [Media3 library](https://android-developers.googleblog.com/2025/03/media-processing-performance-jetpack-media3-transformer.html) or local FFmpeg 
 
-Replace video processing part with [Media3 library](https://android-developers.googleblog.com/2025/03/media-processing-performance-jetpack-media3-transformer.html)  / [LiTr library](https://github.com/linkedin/LiTr)
-or
-Use ffmpeg-kit and this library locally
 
 Sorry for the inconvenience.
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,8 +5,8 @@ android {
     defaultConfig {
         applicationId "com.gowtham.videotrimmer"
         minSdkVersion 24
-        targetSdkVersion 34
-        compileSdk = 34
+        targetSdkVersion 36
+        compileSdk = 36
         versionCode 1
         versionName "1.0"
         multiDexEnabled true
diff --git a/library/build.gradle b/library/build.gradle
@@ -12,8 +12,8 @@ android {
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 34
-        compileSdk = 34
+        targetSdkVersion 36
+        compileSdk = 36
         consumerProguardFiles "consumer-rules.pro"
 
         ndkVersion '22.1.7171670'
@@ -46,12 +46,14 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.android.exoplayer:exoplayer:2.17.1'
-    implementation 'com.arthenica:ffmpeg-kit-min:6.0-1'
     implementation 'com.github.bumptech.glide:glide:4.15.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.15.1'
     implementation 'com.akexorcist:localization:1.2.9'
     implementation 'com.google.code.gson:gson:2.9.0'
     implementation "androidx.coordinatorlayout:coordinatorlayout:1.2.0"
+
+    implementation("androidx.media3:media3-transformer:1.8.0")
+
 }
 repositories {
     mavenCentral()
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -8,7 +8,6 @@
 
     <application>
         <activity android:name=".ui.ActVideoTrimmer"
-            android:screenOrientation="portrait"
             android:launchMode="singleTask"
             android:theme="@style/VideoTrimmerTheme"
             android:exported="true"/>
diff --git a/library/src/main/java/com/gowtham/library/ui/ActVideoTrimmer.java b/library/src/main/java/com/gowtham/library/ui/ActVideoTrimmer.java
diff --git a/library/src/main/java/com/gowtham/library/utils/CompressOption.java b/library/src/main/java/com/gowtham/library/utils/CompressOption.java
@@ -2,54 +2,53 @@
 
 public class CompressOption {
 
-    private int frameRate=30;
-
-    private String bitRate="0k";
-
-    private int width=0;
-
-    private int height=0;
 
     public CompressOption() {
     }
 
-    public CompressOption(int frameRate, String bitRate, int width, int height) {
-        this.frameRate = frameRate;
-        this.bitRate = bitRate;
-        this.width = width;
-        this.height = height;
-    }
+    private int bitRate= 0;
 
-    public void setFrameRate(int frameRate) {
-        this.frameRate = frameRate;
-    }
+    private float compressionScale=0;
 
-    public void setBitRate(String bitRate) {
+    public CompressOption(int bitRate, float compressionScaleForResolution) {
         this.bitRate = bitRate;
+        this.compressionScale = compressionScaleForResolution;
     }
 
-    public int getWidth() {
-        return width;
+    private VideoRes videoRes= null;
+
+    public CompressOption(VideoRes videoRes) {
+        this.videoRes = videoRes;
     }
 
-    public void setWidth(int width) {
-        this.width = width;
+
+    private boolean isUserSelection;
+
+    public CompressOption(boolean isUserSelection) {
+        this.isUserSelection = isUserSelection;
     }
 
-    public int getHeight() {
-        return height;
+    public void setBitRate(int bitRate) {
+        this.bitRate = bitRate;
     }
 
-    public void setHeight(int height) {
-        this.height = height;
+    public float getCompressionScale() {
+        return compressionScale;
     }
 
-    public int getFrameRate() {
-        return frameRate;
+    public void setCompressionScale(float compressionScale) {
+        this.compressionScale = compressionScale;
     }
 
-    public String getBitRate() {
+    public int getBitRate() {
         return bitRate;
     }
 
+    public VideoRes getVideoRes() {
+        return videoRes;
+    }
+
+    public void setVideoRes(VideoRes videoRes) {
+        this.videoRes = videoRes;
+    }
 }
diff --git a/library/src/main/java/com/gowtham/library/utils/TrimmerUtils.java b/library/src/main/java/com/gowtham/library/utils/TrimmerUtils.java
@@ -15,6 +15,7 @@
 
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.core.util.Pair;
 
 import com.google.gson.Gson;
 
@@ -26,27 +27,7 @@
 
 public class TrimmerUtils {
 
-    public static String formatCSeconds(long timeInSeconds) {
-        long hours = timeInSeconds / 3600;
-        long secondsLeft = timeInSeconds - hours * 3600;
-        long minutes = secondsLeft / 60;
-        long seconds = secondsLeft - minutes * 60;
 
-        String formattedTime = "";
-        if (hours < 10)
-            formattedTime += "0";
-        formattedTime += hours + ":";
-
-        if (minutes < 10)
-            formattedTime += "0";
-        formattedTime += minutes + ":";
-
-        if (seconds < 10)
-            formattedTime += "0";
-        formattedTime += seconds;
-
-        return formattedTime;
-    }
 
     public static int getColor(Context context, int color) {
         return ContextCompat.getColor(context, color);
@@ -150,24 +131,31 @@ public static int getBitRate(Activity context, Uri videoPath) {
     }
 
 
-    public static int[] getVideoWidthHeight(Activity context, Uri videoPath) {
+    public static Pair<Integer, Integer> getVideoRes(Activity context, Uri videoUri) {
         try {
-            MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-            retriever.setDataSource(context,videoPath);
-            int width = Integer.parseInt(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH));
-            int height = Integer.parseInt(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT));
-            retriever.release();
-            return new int[]{width,height};
+            MediaMetadataRetriever metaRetriever = new MediaMetadataRetriever();
+            metaRetriever.setDataSource(context, videoUri);
+            String height = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_HEIGHT);
+            String width = metaRetriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_WIDTH);
+            int w = TrimmerUtils.clearNull(width).isEmpty() ? 0 : Integer.parseInt(width);
+            int h = Integer.parseInt(height);
+            int rotation = TrimmerUtils.getVideoRotation(context, videoUri);
+            if (rotation == 90 || rotation == 270) {
+//                int temp = w;
+//                w = h;
+//                h = temp;
+            }
+            return new Pair<>(w, h);
         } catch (Exception e) {
             e.printStackTrace();
         }
         return null;
     }
 
-    public static int getVideoRotation(Activity context, Uri videoPath) {
+    public static int getVideoRotation(Activity context, Uri videoUri) {
         try {
             MediaMetadataRetriever retriever = new MediaMetadataRetriever();
-            retriever.setDataSource(context,videoPath);
+            retriever.setDataSource(context,videoUri);
             int rotation = Integer.parseInt(retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_VIDEO_ROTATION));
             retriever.release();
             return rotation;
diff --git a/library/src/main/java/com/gowtham/library/utils/VideoRes.kt b/library/src/main/java/com/gowtham/library/utils/VideoRes.kt
@@ -0,0 +1,10 @@
+package com.gowtham.library.utils
+
+object VideoRes {
+
+    const val SD_LOW= "360p"
+    const val SD= "480p"
+    const val HD= "720p"
+    const val FULL_HD= "1080p"
+
+}
diff --git a/library/src/main/java/com/gowtham/library/utils/ViewUtil.kt b/library/src/main/java/com/gowtham/library/utils/ViewUtil.kt
@@ -3,9 +3,9 @@ package com.gowtham.library.utils
 import android.content.res.Resources
 import android.graphics.Rect
 import android.os.Build
+import android.util.Log
 import android.util.TypedValue
 import android.view.View
-import androidx.core.view.doOnLayout
 
 object ViewUtil {
 
@@ -15,16 +15,33 @@ object ViewUtil {
         Resources.getSystem().displayMetrics).toInt()
 
     @JvmStatic
-    fun systemGestureExclusionRects(viewRoot: View) {
+    fun dpToPx(dp: Int): Int{
+
+        return TypedValue.applyDimension(
+            TypedValue.COMPLEX_UNIT_DIP,
+            dp.toFloat(),
+            Resources.getSystem().displayMetrics).toInt()
+    }
+    @JvmStatic
+    fun systemGestureExclusionRects(viewRoot: View, thumbnailViewer: View) {
+        var rendered= false
         viewRoot.post {
-            viewRoot.apply {
-                doOnLayout {
-                    // updating exclusion rect
-                    val rects = mutableListOf<Rect>()
-                    rects.add(Rect(0,resources.displayMetrics.heightPixels-(120.toPx),width,resources.displayMetrics.heightPixels-(55.toPx)))
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
-                        systemGestureExclusionRects = rects
-                    }
+            viewRoot.addOnLayoutChangeListener { v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom ->
+                if (rendered){
+                    return@addOnLayoutChangeListener
+                }
+                rendered= true
+                val rects = mutableListOf<Rect>()
+                rects.add(
+                    Rect(
+                        0,
+                        thumbnailViewer.top-20.toPx,
+                        viewRoot.width,
+                        thumbnailViewer.bottom+ 20.toPx
+                    )
+                )
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+                    viewRoot.systemGestureExclusionRects = rects
                 }
             }
         }
diff --git a/library/src/main/res/drawable/trimmer_arrow_back_white.xml b/library/src/main/res/drawable/trimmer_arrow_back_white.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+    
+</vector>
diff --git a/library/src/main/res/layout/act_video_trimmer.xml b/library/src/main/res/layout/act_video_trimmer.xml
@@ -3,19 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     style="@style/StyleRoot"
-    android:background="#303030"
+    android:background="#000000"
     android:id="@+id/root_view"
     tools:ignore="ContentDescription">
 
-    <LinearLayout style="@style/FView">
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="#00000000"
+        android:elevation="5dp"
+        app:navigationIcon="@drawable/trimmer_arrow_back_white"
+        app:titleTextColor="@color/colorWhite" />
 
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="#212121"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:titleTextColor="@color/colorWhite" />
+    <LinearLayout style="@style/FView">
 
         <RelativeLayout style="@style/VWView">
 
@@ -42,7 +43,8 @@
 
     </LinearLayout>
 
-    <include layout="@layout/view_video_controller" />
+    <include layout="@layout/view_video_controller"
+        android:id="@+id/view_thumbnails"/>
 
     <TextView
         android:id="@+id/txt_start_duration"
@@ -52,6 +54,8 @@
         android:layout_marginBottom="40dp"
         android:textColor="#80FFFFFF"
         android:textSize="14sp"
+        android:text="00:00s"
+        tools:visibility="visible"
         android:visibility="gone" />
 
 
@@ -63,6 +67,8 @@
         android:layout_marginBottom="40dp"
         android:textColor="#80FFFFFF"
         android:textSize="14sp"
+        android:text="00:10s"
+        tools:visibility="visible"
         android:visibility="gone" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/library/src/main/res/layout/view_video_controller.xml b/library/src/main/res/layout/view_video_controller.xml
@@ -95,5 +95,18 @@
             android:paddingTop="10dp"
             android:paddingBottom="10dp"
             style="@style/ImageTrim" />
+
+
+        <ImageView
+            android:id="@+id/image_nine"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            style="@style/ImageTrim" />
+
+        <ImageView
+            android:id="@+id/image_ten"
+            android:paddingTop="10dp"
+            android:paddingBottom="10dp"
+            style="@style/ImageTrim" />
     </LinearLayout>
 </RelativeLayout>
