add videotrimmer source library to project

Author: MaoliWolf

.idea/gradle.xml

@@ -48,10 +48,9 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    implementation 'com.github.freddyfang:android-video-trimmer:v1.0.0'
-
-
+    implementation project(':videotrimmer')
     implementation 'com.github.MasayukiSuda:Mp4Composer-android:v0.4.0'
     implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.8.4'
     implementation 'com.android.volley:volley:1.1.1'
+
 }

app/build.gradle

@@ -4,6 +4,8 @@ import android.app.Activity
 import android.content.Intent
 import android.content.res.Resources
 import android.graphics.*
+import android.media.MediaCodec
+import android.media.MediaMetadataRetriever
 import android.media.MediaPlayer
 import android.os.Bundle
 import android.util.Log
@@ -33,6 +35,7 @@ import kotlinx.android.synthetic.main.activity_live.*
 import net.ossrs.rtmp.ConnectCheckerRtmp
 import java.io.File
 import java.io.InputStream
+import java.nio.ByteBuffer
 import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.math.round
@@ -135,13 +138,10 @@ class LiveActivity : AppCompatActivity(), ConnectCheckerRtmp, SurfaceHolder.Call
                     .show()
                 sdVideoPreview.visibility = View.VISIBLE
 
-//                if (rtmpFile!!.prepareAudio(tmpFile.absolutePath) && rtmpFile!!.prepareVideo(tmpFile.absolutePath)) {
-//
-//                }
             }
         } else {
             runOnUiThread {
-                Toast.makeText(this, "剪輯完成檔案", Toast.LENGTH_SHORT).show()
+                Toast.makeText(this, "剪輯完成", Toast.LENGTH_SHORT).show()
             }
         }
     }
@@ -719,7 +719,9 @@ class LiveActivity : AppCompatActivity(), ConnectCheckerRtmp, SurfaceHolder.Call
     private fun openSideVideos() {
         goHome()
         videoList.visibility = View.VISIBLE
+        videoList.bringToFront()
         main_control.visibility = View.INVISIBLE
+        main_control.bringToFront()
 
         data.isSelectEnabled = false
         data.selectedVideoList = MutableList(0) { "" }
@@ -732,16 +734,25 @@ class LiveActivity : AppCompatActivity(), ConnectCheckerRtmp, SurfaceHolder.Call
                     try {
                         val mp = MediaPlayer()
                         mp.setDataSource(it.absolutePath)
-                        i++
                         mp.prepare()
                         mp.setOnPreparedListener { mediaPlayer ->
+                            i++
                             val time: Int = mediaPlayer.duration
                             runOnUiThread {
                                 addVideoToList(it.nameWithoutExtension, (time / 1000), i)
                             }
                             mediaPlayer.release()
 
                         }
+                        mp.setOnErrorListener { mediaPlayer, what, extra ->
+                            i++
+                            runOnUiThread {
+                                addVideoToList(it.nameWithoutExtension, -1, i)
+                            }
+                            mediaPlayer.release()
+
+                            false
+                        }
                     } catch (e: Exception) {
 
                     }
@@ -774,11 +785,15 @@ class LiveActivity : AppCompatActivity(), ConnectCheckerRtmp, SurfaceHolder.Call
         rtmpCamera1 = RtmpCamera1(rtmpCameraPreview, this)
         rtmpCamera1!!.setReTries(100)
 
-
         rtmpFile = RtmpFromFile(rtmpFilePreview, this, this, this)
 
         rtmpCameraPreview.holder.addCallback(this)
 
+
+//        var info = MediaCodec.BufferInfo()
+//        var buffer = ByteBuffer.allocate(100)
+//        rtmpCamera1!!.getVideoData(buffer, info)
+
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -876,7 +891,11 @@ class LiveActivity : AppCompatActivity(), ConnectCheckerRtmp, SurfaceHolder.Call
 
         var timeText = TextView(this)
         timeText.setTextColor(Color.GRAY)
-        timeText.text = time.toString() + "s"
+        if (time < 0) {
+            timeText.text = "NaN"
+        } else {
+            timeText.text = time.toString() + "s"
+        }
         timeText.layoutParams = Constraints.LayoutParams(
             ConstraintLayout.LayoutParams.WRAP_CONTENT,
             ConstraintLayout.LayoutParams.WRAP_CONTENT

app/src/main/java/net/zentring/live/LiveActivity.kt

@@ -1,2 +1,3 @@
+include ':videotrimmer'
 include ':app'
 rootProject.name = "Live"

settings.gradle

@@ -0,0 +1 @@
+/build

videotrimmer/.gitignore

@@ -0,0 +1,48 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+android {
+    compileSdkVersion 28
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    kotlinOptions {
+        freeCompilerArgs = ['-Xjvm-default=compatibility']
+        jvmTarget = '1.8'
+    }
+
+    androidExtensions {
+        experimental = true
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.core:core-ktx:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation "androidx.recyclerview:recyclerview:1.1.0-beta01"
+
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+}

videotrimmer/build.gradle

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

videotrimmer/proguard-rules.pro

@@ -0,0 +1,26 @@
+package idv.luchafang.videotrimmer;
+
+import android.content.Context;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("idv.luchafang.videotrimmer.test", appContext.getPackageName());
+    }
+}

videotrimmer/src/androidTest/java/idv/luchafang/videotrimmer/ExampleInstrumentedTest.java

@@ -0,0 +1,2 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="idv.luchafang.videotrimmer"/>

videotrimmer/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+package idv.luchafang.videotrimmer
+
+internal fun obtainVideoTrimmerPresenter() = VideoTrimmerPresenter()

videotrimmer/src/main/java/idv/luchafang/videotrimmer/Injection.kt

@@ -0,0 +1,32 @@
+package idv.luchafang.videotrimmer
+
+import idv.luchafang.videotrimmer.data.TrimmerDraft
+import java.io.File
+
+internal interface VideoTrimmerContract {
+    interface View {
+        fun getSlidingWindowWidth(): Int
+        fun setupAdaptor(video: File, frames: List<Long>, frameWidth: Int)
+        fun setupSlidingWindow()
+
+        fun restoreSlidingWindow(left: Float, right: Float)
+        fun restoreVideoFrameList(framePosition: Int, frameOffset: Int)
+    }
+
+    interface Presenter {
+        fun onViewAttached(view: View)
+        fun onViewDetached()
+
+        fun setVideo(video: File)
+        fun setMaxDuration(millis: Long)
+        fun setMinDuration(millis: Long)
+        fun setFrameCountInWindow(count: Int)
+        fun setOnSelectedRangeChangedListener(listener: VideoTrimmerView.OnSelectedRangeChangedListener)
+
+        fun isValidState(): Boolean
+        fun show()
+
+        fun getTrimmerDraft(): TrimmerDraft
+        fun restoreTrimmer(draft: TrimmerDraft)
+    }
+}