修改强制非空为?.apply，删除formatChange方法，添加使用yuv渲染时的log

Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/Decoder.kt

@@ -83,11 +83,12 @@ abstract class Decoder(val player: AnimPlayer) : IAnimListener {
         return createThread(renderThread, "anim_render_thread") && createThread(decodeThread, "anim_decode_thread")
     }
 
-    fun prepareRender(needAlign: Boolean): Boolean {
+    fun prepareRender(needYUV: Boolean): Boolean {
         if (render == null) {
             ALog.i(TAG, "prepareRender")
             player.animView.getSurfaceTexture()?.apply {
-                if (needAlign) {
+                if (needYUV) {
+                    ALog.i(TAG, "use yuv render")
                     render = YUVRender(this)
                 } else {
                     render = Render(this).apply {

Android/PlayerProj/animplayer/src/main/java/com/tencent/qgame/animplayer/HardDecoder.kt

@@ -58,7 +58,6 @@ class HardDecoder(player: AnimPlayer) : Decoder(player), SurfaceTexture.OnFrameA
         }
     }
 
-
     override fun onFrameAvailable(surfaceTexture: SurfaceTexture?) {
         if (isStopReq) return
         ALog.d(TAG, "onFrameAvailable")
@@ -150,7 +149,6 @@ class HardDecoder(player: AnimPlayer) : Decoder(player), SurfaceTexture.OnFrameA
             return
         }
 
-
         try {
             val mime = format.getString(MediaFormat.KEY_MIME) ?: ""
             ALog.i(TAG, "Video MIME is $mime")
@@ -184,8 +182,6 @@ class HardDecoder(player: AnimPlayer) : Decoder(player), SurfaceTexture.OnFrameA
         }
     }
 
-
-
     private fun startDecode(extractor: MediaExtractor ,decoder: MediaCodec) {
         val TIMEOUT_USEC = 10000L
         var inputChunk = 0
@@ -230,17 +226,13 @@ class HardDecoder(player: AnimPlayer) : Decoder(player), SurfaceTexture.OnFrameA
                     decoderStatus == MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED -> ALog.d(TAG, "decoder output buffers changed")
                     decoderStatus == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED -> {
                         outputFormat = decoder.outputFormat
-                        try {
-                            if (outputFormat!!.getInteger(MediaFormat.KEY_STRIDE) > 0 && outputFormat!!.getInteger(MediaFormat.KEY_SLICE_HEIGHT) > 0) {
-                                alignWidth = outputFormat!!.getInteger(MediaFormat.KEY_STRIDE)
-                                alignHeight = outputFormat!!.getInteger(MediaFormat.KEY_SLICE_HEIGHT)
+                        outputFormat?.apply {
+                            if (this.getInteger(MediaFormat.KEY_STRIDE) > 0 && this.getInteger(MediaFormat.KEY_SLICE_HEIGHT) > 0) {
+                                alignWidth = this.getInteger(MediaFormat.KEY_STRIDE)
+                                alignHeight = this.getInteger(MediaFormat.KEY_SLICE_HEIGHT)
                             }
-                        } catch (t: Throwable) {
-                            ALog.e(TAG, "formatChange $t", t)
                         }
                         ALog.i(TAG, "decoder output format changed: $outputFormat")
-                        // val (w,h) = formatChange(format)
-                        // videoSizeChange(w, h)
                     }
                     decoderStatus < 0 -> {
                         throw RuntimeException("unexpected result from decoder.dequeueOutputBuffer: $decoderStatus")
@@ -335,7 +327,6 @@ class HardDecoder(player: AnimPlayer) : Decoder(player), SurfaceTexture.OnFrameA
         return yuv420p
     }
 
-
     private fun yuvCopy(src: ByteArray, srcOffset: Int, inWidth: Int, inHeight: Int, dest: ByteArray, outWidth: Int, outHeight: Int) {
         for (h in 0 until inHeight) {
             if (h < outHeight) {
@@ -344,18 +335,6 @@ class HardDecoder(player: AnimPlayer) : Decoder(player), SurfaceTexture.OnFrameA
         }
     }
 
-    private fun formatChange(format: MediaFormat): Pair<Int, Int> {
-        try {
-            // 实际视频的纹理大小
-            val width = format.getInteger(MediaFormat.KEY_WIDTH)
-            val height = format.getInteger(MediaFormat.KEY_HEIGHT)
-            return Pair(width, height)
-        } catch (t: Throwable) {
-            ALog.e(TAG, "formatChange $t", t)
-        }
-        return Pair(0,0)
-    }
-
     private fun release(decoder: MediaCodec?, extractor: MediaExtractor?) {
         renderThread.handler?.post {
             render?.clearFrame()
@@ -382,7 +361,6 @@ class HardDecoder(player: AnimPlayer) : Decoder(player), SurfaceTexture.OnFrameA
         }
     }
 
-
     override fun destroy() {
         needDestroy = true
         if (isRunning) {