add log

yylive · Jan 20, 2025 · ac43cc2 · ac43cc2
1 parent 5ad9805
commit ac43cc2
Show file tree

Hide file tree

Showing 12 changed files with 45 additions and 1 deletion.
diff --git a/app/src/main/java/com/yy/yyeva/player/EvaDemoActivity.kt b/app/src/main/java/com/yy/yyeva/player/EvaDemoActivity.kt
@@ -222,6 +222,10 @@ class EvaDemoActivity : Activity(), IEvaAnimListener {
         ELog.i(TAG, "onVideoComplete")
     }
 
+    override fun onVideoPlayFinish() {
+        ELog.i(TAG, "onVideoPlayFinish")
+    }
+
     /**
      * 播放器被销毁情况下会调用
      */

diff --git a/app/src/main/java/com/yy/yyeva/player/EvaDownloadDemoActivity.kt b/app/src/main/java/com/yy/yyeva/player/EvaDownloadDemoActivity.kt
@@ -245,6 +245,10 @@ class EvaDownloadDemoActivity : Activity(), IEvaAnimListener {
         ELog.i(TAG, "onVideoComplete")
     }
 
+    override fun onVideoPlayFinish() {
+        ELog.i(TAG, "onVideoPlayFinish")
+    }
+
     /**
      * 播放器被销毁情况下会调用
      */

diff --git a/app/src/main/java/com/yy/yyeva/player/EvaKeyDemoActivity.kt b/app/src/main/java/com/yy/yyeva/player/EvaKeyDemoActivity.kt
@@ -234,6 +234,10 @@ class EvaKeyDemoActivity : Activity(), IEvaAnimListener {
         ELog.i(TAG, "onVideoComplete")
     }
 
+    override fun onVideoPlayFinish() {
+        ELog.i(TAG, "onVideoPlayFinish")
+    }
+
     /**
      * 播放器被销毁情况下会调用
      */

diff --git a/app/src/main/java/com/yy/yyeva/player/EvaKeyListDemoActivity.kt b/app/src/main/java/com/yy/yyeva/player/EvaKeyListDemoActivity.kt
@@ -141,6 +141,10 @@ class EvaKeyListDemoActivity : Activity(), IEvaAnimListener {
         ELog.i(TAG, "onVideoComplete")
     }
 
+    override fun onVideoPlayFinish() {
+        ELog.i(TAG, "onVideoPlayFinish")
+    }
+
     /**
      * 播放器被销毁情况下会调用
      */

diff --git a/app/src/main/java/com/yy/yyeva/player/EvaKeyRecyclerAdapter.kt b/app/src/main/java/com/yy/yyeva/player/EvaKeyRecyclerAdapter.kt
@@ -176,6 +176,10 @@ class EvaKeyRecyclerAdapter():RecyclerView.Adapter<EvaKeyRecyclerAdapter.EvaKeyH
                     ELog.i(TAG, "onVideoComplete")
                 }
 
+                override fun onVideoPlayFinish() {
+                    ELog.i(TAG, "onVideoPlayFinish")
+                }
+
                 override fun onVideoDestroy() {
                     ELog.i(TAG, "onVideoDestroy")
                 }

diff --git a/yyevac/src/main/cpp/yyevajni.cpp b/yyevac/src/main/cpp/yyevajni.cpp
@@ -95,6 +95,7 @@ JNIEXPORT void JNICALL YYEVA(videoSizeChange)(
 JNIEXPORT jint JNICALL YYEVA(initRender)(
         JNIEnv *env, jobject instance, jint controllerId,
         jobject surface, jboolean isNeedYUV, jboolean isNormalMp4, jboolean isVideoRecord) {
+    ELOGV("initRender");
     lock_guard<mutex> auto_lock(mtx);
     //创建window
     ANativeWindow *window = ANativeWindow_fromSurface(env,surface);
@@ -478,7 +479,7 @@ JNIEXPORT void JNICALL YYEVA(stopRecord)(
 JNIEXPORT void JNICALL YYEVA(setLog)(
         JNIEnv *env,
         jobject instance, jobject log) {
-    ELOGV("nativeSetListener");
+    ELOGV("setLog");
 
     JavaVM *javaVm;
     if (env->GetJavaVM(&javaVm) != JNI_OK) {

diff --git a/yyevac/src/main/java/com/yy/yyeva/EvaAnimPlayer.kt b/yyevac/src/main/java/com/yy/yyeva/EvaAnimPlayer.kt
@@ -89,6 +89,7 @@ class EvaAnimPlayer(val evaAnimView: IEvaAnimView) {
     }
 
     fun startPlay(evaFileContainer: IEvaFileContainer) {
+        ELog.i(TAG, "startPlay")
         isStartRunning = true
         prepareDecoder()
         if (decoder?.prepareThread() == false) {
@@ -170,5 +171,6 @@ class EvaAnimPlayer(val evaAnimView: IEvaAnimView) {
                 isLoop = this@EvaAnimPlayer.isLoop
             }
         }
+        ELog.i(TAG, "prepareDecoder")
     }
 }
diff --git a/yyevac/src/main/java/com/yy/yyeva/decoder/EvaDecoder.kt b/yyevac/src/main/java/com/yy/yyeva/decoder/EvaDecoder.kt
@@ -87,6 +87,7 @@ abstract class Decoder(val playerEva: EvaAnimPlayer) : IEvaAnimListener {
     }
 
     fun preparePlay(videoWidth: Int, videoHeight: Int) {
+        ELog.i(TAG, "preparePlay $videoWidth, $videoHeight")
         playerEva.configManager.defaultConfig(videoWidth, videoHeight)
         playerEva.configManager.config?.apply {
 //            render?.setAnimConfig(this)
@@ -165,6 +166,12 @@ abstract class Decoder(val playerEva: EvaAnimPlayer) : IEvaAnimListener {
         playerEva.evaAnimListener?.onVideoComplete(lastFrame)
     }
 
+    override fun onVideoPlayFinish() {
+        ELog.i(TAG, "onVideoPlayFinish")
+        playerEva.evaAnimListener?.onVideoPlayFinish()
+    }
+
+
     override fun onVideoDestroy() {
         ELog.i(TAG, "onVideoDestroy")
         playerEva.evaAnimListener?.onVideoDestroy()

diff --git a/yyevac/src/main/java/com/yy/yyeva/decoder/EvaHardDecoder.kt b/yyevac/src/main/java/com/yy/yyeva/decoder/EvaHardDecoder.kt
@@ -13,6 +13,7 @@ import android.opengl.GLES20
 import android.os.Environment
 import com.yy.yyeva.EvaAnimPlayer
 import com.yy.yyeva.util.EvaConstant
+import com.yy.yyeva.view.EvaAudioPlayer
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 
@@ -116,6 +117,7 @@ class EvaHardDecoder(playerEva: EvaAnimPlayer) : Decoder(playerEva), SurfaceText
     }
 
     private fun startPlay(evaFileContainer: IEvaFileContainer) {
+        ELog.i(TAG, "startPlay")
         var extractor: MediaExtractor? = null
         var decoder: MediaCodec? = null
         var format: MediaFormat? = null

diff --git a/yyevac/src/main/java/com/yy/yyeva/inter/IEvaAnimListener.kt b/yyevac/src/main/java/com/yy/yyeva/inter/IEvaAnimListener.kt
@@ -34,6 +34,8 @@ interface IEvaAnimListener {
      */
     fun onVideoComplete(lastFrame: Boolean = false)
 
+    fun onVideoPlayFinish()
+
     /**
      * 视频被销毁
      */

diff --git a/yyevac/src/main/java/com/yy/yyeva/view/EvaAnimView.kt b/yyevac/src/main/java/com/yy/yyeva/view/EvaAnimView.kt
@@ -73,6 +73,10 @@ open class EvaAnimView @JvmOverloads constructor(context: Context, attrs: Attrib
                 evaAnimListener?.onVideoComplete()
             }
 
+            override fun onVideoPlayFinish() {
+                evaAnimListener?.onVideoPlayFinish()
+            }
+
             override fun onVideoDestroy() {
                 hide()
                 evaAnimListener?.onVideoDestroy()

diff --git a/yyevac/src/main/java/com/yy/yyeva/view/EvaAnimViewV3.kt b/yyevac/src/main/java/com/yy/yyeva/view/EvaAnimViewV3.kt
@@ -75,6 +75,11 @@ open class EvaAnimViewV3 @JvmOverloads constructor(context: Context, attrs: Attr
                 evaAnimListener?.onVideoComplete(lastFrame)
             }
 
+            override fun onVideoPlayFinish() {
+                ELog.i(TAG, "onVideoPlayFinish")
+                evaAnimListener?.onVideoPlayFinish()
+            }
+
             override fun onVideoDestroy() {
                 hide()
                 evaAnimListener?.onVideoDestroy()
@@ -368,6 +373,7 @@ open class EvaAnimViewV3 @JvmOverloads constructor(context: Context, attrs: Attr
                 ELog.e(TAG, "AnimView is GONE, can't play")
                 return@ui
             }
+            ELog.i(TAG, "startPlay ${evaFileContainer.getFile()?.absolutePath}")
             if (!playerEva.isRunning()) {
                 lastEvaFile = evaFileContainer
                 playerEva.startPlay(evaFileContainer)
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,8 @@ interface IEvaAnimListener { @@
          */
         fun onVideoComplete(lastFrame: Boolean = false)
+        fun onVideoPlayFinish()
         /**
          * 视频被销毁
          */
@@ Expand Down @@