加入TextureView支援

app/build.gradle

@@ -6,7 +6,6 @@ plugins {
 }
 
 android {
-    namespace 'com.ray650128.gstreamer_demo_app'
     ndkVersion "21.3.6528147"
     compileSdk 33
 
@@ -27,28 +26,29 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     kotlinOptions {
-        jvmTarget = '17'
+        jvmTarget = '1.8'
     }
     lint {
         abortOnError false
         checkReleaseBuilds false
     }
     viewBinding.enabled = true
+    namespace 'com.ray650128.gstreamer_demo_app'
 }
 
 dependencies {
 
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
@@ -56,6 +56,6 @@ dependencies {
     implementation project(path: ':gstreamer_player')
 
     // Android Jetpack lib
-    implementation("androidx.fragment:fragment-ktx:1.5.7")
+    implementation("androidx.fragment:fragment-ktx:1.5.5")
-    implementation("androidx.activity:activity-ktx:1.7.1")
+    implementation("androidx.activity:activity-ktx:1.6.1")
 }

app/src/main/java/com/ray650128/gstreamer_demo_app/DisplayUtils.kt

@@ -1,94 +0,0 @@
-package com.ray650128.gstreamer_demo_app
-
-import android.content.Context
-import android.os.Build
-import android.util.DisplayMetrics
-import android.view.WindowManager
-
-/**
- * 螢幕參數工具類別
- * @author Raymond Yang
- */
-class DisplayUtils(private var context: Context) {
-    private val TAG = DisplayUtils::class.java.simpleName
-
-    /**
-     * 取得螢幕寬度
-     * @return 螢幕寬度值
-     */
-    fun getScreenWidth(): Int {
-        val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            val windowMetrics = windowManager.currentWindowMetrics
-            windowMetrics.bounds.width()
-        } else {
-            val metric = DisplayMetrics()
-            @Suppress("DEPRECATION")
-            windowManager.defaultDisplay.getMetrics(metric)
-            metric.widthPixels
-        }
-    }
-
-    /**
-     * 取得螢幕高度
-     * @return 螢幕高度值
-     */
-    fun getScreenHeight(): Int {
-        val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            val windowMetrics = windowManager.currentWindowMetrics
-            windowMetrics.bounds.height()
-        } else {
-            val metric = DisplayMetrics()
-            @Suppress("DEPRECATION")
-            windowManager.defaultDisplay.getMetrics(metric)
-            metric.heightPixels
-        }
-    }
-
-    /**
-     * 取得狀態列高度
-     * @return 狀態列高度值
-     */
-    fun getStatusBarHeight(): Int {
-        var result = 0
-        val resourceId: Int = context.resources.getIdentifier(
-            "status_bar_height",
-            "dimen",
-            "android"
-        )
-        if (resourceId > 0) {
-            result = context.resources.getDimensionPixelSize(resourceId)
-        }
-        return result
-    }
-
-    /**
-     * 取得導航列高度
-     * @return 導航列高度值
-     */
-    fun getNavigationBarHeight(): Int {
-        val resources = context.resources
-        val resourceId: Int = resources.getIdentifier("navigation_bar_height", "dimen", "android")
-        return if (resourceId > 0) {
-            resources.getDimensionPixelSize(resourceId)
-        } else 0
-    }
-
-    /**
-     * 取得視窗範圍高度
-     * @return 視窗範圍高度值
-     */
-    fun getWindowHeight(): Int {
-        val screen = getScreenHeight()
-        val statusBar = getStatusBarHeight()
-        val navBar = getNavigationBarHeight()
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            screen - statusBar - navBar
-        } else {
-            screen
-        }
-    }
-}

app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt

@@ -94,7 +94,8 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun reloadVideoViews(list: List<List<Device>>?) {
+    private fun reloadVideoViews(list: List<List<Device>>?) = MainScope().launch {
+        val oldListCount = videoPageList.size
         for (videoPage in videoPageList) {
             supportFragmentManager.commit {
                 remove(videoPage)
@@ -103,6 +104,9 @@ class MainActivity : AppCompatActivity() {
         binding.viewPager.removeAllViews()
         videoPageList.clear()
 
+        if (oldListCount > 0) {
+            delay(500L)
+        }
         // 如果群組內沒有裝置，則顯示底圖
         if (list.isNullOrEmpty()) {
             binding.viewPager.setBackgroundResource(R.drawable.bg_not_in_playing)

app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt

@@ -6,12 +6,10 @@ import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ImageView
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.activityViewModels
 import androidx.gridlayout.widget.GridLayout
 import com.ray650128.gstreamer_demo_app.Constants
-import com.ray650128.gstreamer_demo_app.DisplayUtils
-import com.ray650128.gstreamer_demo_app.R
 import com.ray650128.gstreamer_demo_app.databinding.FragmentSplitViewBinding
 import com.ray650128.gstreamer_demo_app.dp
 import com.ray650128.gstreamer_demo_app.model.Device
@@ -56,6 +54,18 @@ class SplitViewFragment : Fragment() {
         super.onViewCreated(view, savedInstanceState)
 
         initView()
+
+        /*viewModel.activePage.observe(viewLifecycleOwner) {
+            if (it == null) return@observe
+            if (it == this.mPageNum) {
+                MainScope().launch {
+                    //delay(1000)
+                    //playAll()
+                }
+            } else {
+                //stopAll()
+            }
+        }*/
     }
 
     override fun onPause() {
@@ -78,7 +88,6 @@ class SplitViewFragment : Fragment() {
     }
 
     private fun initView() {
-        val displayUtil = DisplayUtils(requireContext())
         // 生成 VideoView 分割畫面
         binding.apply {
             val maxRow = sqrt(splitMode.toFloat()).toInt()
@@ -88,19 +97,6 @@ class SplitViewFragment : Fragment() {
             baseView.rowCount = maxRow
             baseView.columnCount = maxCol
 
-            val cellWidth: Int
-            val cellHeight: Int
-            when (splitMode) {
-                Constants.SPLIT_MODE_SINGLE -> {
-                    cellWidth = (displayUtil.getScreenWidth() / maxRow)
-                    cellHeight = (cellWidth * 0.5625).toInt()
-                }
-                else -> {
-                    cellWidth = (displayUtil.getScreenWidth() / maxRow) - maxRow.dp
-                    cellHeight = (cellWidth * 0.5625).toInt() - maxCol.dp
-                }
-            }
-
             for (col in 0 until maxCol) {
                 for (row in 0 until maxRow) {
                     val videoView = VideoView(requireContext())
@@ -110,9 +106,6 @@ class SplitViewFragment : Fragment() {
                         marginEnd = 0.dp
                         marginStart = 0.dp
 
-                        width = cellWidth
-                        height = cellHeight
-
                         // 調整間距
                         when (splitMode) {
                             Constants.SPLIT_MODE_FOUR -> {
@@ -159,16 +152,37 @@ class SplitViewFragment : Fragment() {
                     videoViews.add(videoView)
                 }
             }
+
+            baseView.post {
+                // 根據分割數量決定子項目的寬度
+                val cellWidth: Int
+                val cellHeight: Int
+                when (splitMode) {
+                    Constants.SPLIT_MODE_SINGLE -> {
+                        cellWidth = (baseView.width / maxRow)
+                        cellHeight = (baseView.height / maxCol)
+                    }
+                    else -> {
+                        cellWidth = (baseView.width / maxRow) - maxRow.dp
+                        cellHeight = (baseView.height / maxCol) - maxCol.dp
+                    }
+                }
+                videoViews.forEach { videoView ->
+                    videoView.layoutParams?.width = cellWidth
+                    videoView.layoutParams?.height = cellHeight
+                }
+            }
         }
 
         if (isClickable) {
-            videoViews.forEach { videoView ->
+            for (position in videoViews.indices) {
-                videoView.setOnClickListener {
+                videoViews[position].setOnClickListener {
-                    if (!videoView.isPlaying) {
+                    if (position >= data.size) return@setOnClickListener
+                    if (!videoViews[position].isPlaying) {
                         return@setOnClickListener
                     }
                     stopAll()
-                    val item = videoView.data
+                    val item = data[position]
                     val bundle = Bundle().apply {
                         //putInt(MonitoringActivity.BUNDLE_DEVICE_ID, item.id)
                         //putInt(MonitoringActivity.BUNDLE_CHANNEL_ID, item.channelId)
@@ -188,35 +202,38 @@ class SplitViewFragment : Fragment() {
 
     private fun setAllUrl() {
         for (index in data.indices) {
-            videoViews[index].data = data[index]
+            videoViews[index].setData(data[index])
             videoViews[index].setTextVisible(
                 (splitMode != Constants.SPLIT_MODE_NINE && splitMode != Constants.SPLIT_MODE_SIXTEEN)
             )
         }
     }
 
-    fun playAll() {
+    fun playAll() = MainScope().launch(Dispatchers.Main) {
-        videoViews.forEach { videoView ->
+        if (videoViews.isEmpty()) return@launch
-            if (videoView.isReady) {
+        //delay(splitMode * Constants.CONF_DELAY_BASE_MILLIS)
-                videoView.resetRetryCount()
+        for (index in data.indices) {
-                videoView.play()
+            if (!videoViews[index].isReady) continue
-            }
+            videoViews[index].resetRetryCount()
-        }
+            videoViews[index].play()
+            delay(300)
         }
+    }.start()
 
     fun stopAll() {
-        videoViews.forEach { videoView ->
+        if (videoViews.isEmpty()) return
-            videoView.stopRetryCount()
+        for (index in data.indices) {
-            if (videoView.isPlaying || !videoView.isLoading) {
+            videoViews[index].stopRetryCount()
-                videoView.pause()
+            if (!videoViews[index].isPlaying || videoViews[index].isLoading) continue
-            }
+            videoViews[index].pause()
         }
     }
 
     fun destroyAll() {
-        videoViews.forEach { videoView ->
+        if (videoViews.isEmpty()) return
-            //videoView.destroy()
+        for (index in data.indices) {
-            videoView.destroySurface()
+            //videoViews[index].destroy()
+            videoViews[index].destroySurface()
         }
     }
 

app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/VideoView.kt

@@ -35,25 +35,7 @@ class VideoView : ConstraintLayout, GstCallback {
 
     private lateinit var view: ItemVideoViewBinding
 
-    var streamType: Int = MAIN_STREAM
+    private var data: Device? = null
-
-    var data: Device? = null
-        set(value) {
-            field = value
-            if (field == null) {
-                view.textDeviceName.isVisible = false
-                isPlaying = false
-                isLoading = false
-                return
-            }
-            this.tag = field?.deviceName
-            view.textDeviceName.text = field?.deviceName
-            view.textDeviceName.isVisible = true
-            val rtspUrl = this.data?.getStreamPath(streamType) ?: return    // 如果 null 就不指派給 Gstreamer 了
-            gstLibrary.setTag(this.data!!.deviceName)
-            gstLibrary.setRtspUrl(rtspUrl)
-            Log.d("${TAG}_$tag", "Set device to: $field, rtspUrl = $rtspUrl")
-        }
 
     var isReady: Boolean = false
 
@@ -94,13 +76,12 @@ class VideoView : ConstraintLayout, GstCallback {
         view = ItemVideoViewBinding.inflate(layoutInflater, this, true)
         view.baseView.clipToOutline = true
 
+        //videoView.holder.addCallback(this)
         gstLibrary = GstLibrary(context)
+        //gstLibrary.setSurfaceHolder(videoView.holder)
         gstLibrary.setTextureView(videoView)
         gstLibrary.setOnStatusChangeListener(this)
 
-        //videoView.holder.addCallback(this)
-        //gstLibrary.setSurfaceHolder(videoView.holder)
-
         // View 預設狀態
         view.textDeviceName.isVisible = false
         isPlaying = false
@@ -113,6 +94,23 @@ class VideoView : ConstraintLayout, GstCallback {
         }
     }
 
+    fun setData(device: Device?, streamType: Int = SUB_STREAM) {
+        if (device == null) {
+            view.textDeviceName.isVisible = false
+            isPlaying = false
+            isLoading = false
+            return
+        }
+        this.data = device
+        this.tag = device.deviceName
+        view.textDeviceName.text = device.deviceName
+        view.textDeviceName.isVisible = true
+        val rtspUrl = this.data?.getStreamPath(streamType) ?: return    // 如果 null 就不指派給 Gstreamer 了
+        gstLibrary.setTag(this.data!!.deviceName)
+        gstLibrary.setRtspUrl(rtspUrl)
+        Log.d("${TAG}_$tag", "Set device to: $device, rtspUrl = $rtspUrl")
+    }
+
     fun setTextVisible(isVisible: Boolean) {
         view.textDeviceName.isVisible = isVisible
     }

build.gradle

@@ -7,8 +7,8 @@ buildscript {
 }
 
 plugins {
-    id 'com.android.application' version '8.0.1' apply false
+    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '8.0.1' apply false
+    id 'com.android.library' version '7.4.2' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
     id 'org.jetbrains.kotlin.plugin.parcelize' version '1.7.0' apply false
 }

gradle.properties

@@ -19,6 +19,3 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-android.defaults.buildfeatures.buildconfig=true
-android.nonTransitiveRClass=false
-android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Mar 24 14:41:01 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

gstreamer_player/build.gradle

@@ -2,10 +2,9 @@ apply plugin: 'com.android.library'
 apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
-    namespace 'com.hisharp.gstreamer_player'
     ndkVersion "21.3.6528147"
 
-    compileSdk 33
+    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 15
@@ -59,17 +58,6 @@ android {
             path 'jni/Android.mk'
         }
     }
-    buildFeatures {
-        renderScript true
-        aidl true
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = '17'
-    }
 }
 
 afterEvaluate {
@@ -81,7 +69,7 @@ afterEvaluate {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.9.0'
     testImplementation 'junit:junit:4.13.2'
     //implementation 'androidx.appcompat:appcompat:1.6.0'
 }

gstreamer_player/src/com/hisharp/gstreamer_player/GstLibrary.kt

@@ -142,36 +142,37 @@ class GstLibrary(context: Context) : Closeable, SurfaceHolder.Callback, TextureV
     }
 
     override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {
-        //Log.d("$TAG+$tag", String.format("Surface changed, format: %d, width: %d, height: %d", format, width, height))
+        Log.d("$TAG+$tag", String.format("Surface changed, format: %d, width: %d, height: %d", format, width, height))
         /*setSurfaceHolder(holder);*/
     }
 
     override fun surfaceDestroyed(holder: SurfaceHolder) {
-        //Log.d("$TAG+$tag", "Surface destroyed")
+        Log.d("$TAG+$tag", "Surface destroyed")
         this.isInit = false
         this.surface = null
-        releaseSurface()
+        //pause()
+        //releaseSurface()
     }
 
     override fun onSurfaceTextureAvailable(surface: SurfaceTexture, width: Int, height: Int) {
         this.surface = Surface(surface)
         this.surface?.let { nativeSurfaceInit(it) }
-        //Log.d("$TAG+$tag", "Surface onSurfaceTextureAvailable: $surface")
+        Log.d("$TAG+$tag", "Surface onSurfaceTextureAvailable: $surface")
     }
 
     override fun onSurfaceTextureSizeChanged(surface: SurfaceTexture, width: Int, height: Int) {
-        //Log.d("$TAG+$tag", "Surface onSurfaceTextureSizeChanged: $surface")
+        Log.d("$TAG+$tag", "Surface onSurfaceTextureSizeChanged: $surface")
     }
 
     override fun onSurfaceTextureDestroyed(surface: SurfaceTexture): Boolean {
-        //Log.d("$TAG+$tag", "Surface onSurfaceTextureDestroyed: $surface")
+        Log.d("$TAG+$tag", "Surface onSurfaceTextureDestroyed: $surface")
         this.isInit = false
         this.surface = null
         return isInit
     }
 
     override fun onSurfaceTextureUpdated(surface: SurfaceTexture) {
-        //Log.d("$TAG+$tag", "Surface onSurfaceTextureUpdated: $surface")
+        Log.d("$TAG+$tag", "Surface onSurfaceTextureUpdated: $surface")
     }
 
     companion object {