From 02a26445beb954d87ccde9b371e3a93e82d579f4 Mon Sep 17 00:00:00 2001
From: Raymond Yang <sdc957@gmail.com>
Date: Fri, 19 May 2023 14:02:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5HiSharpDX=E7=9A=84=E7=A8=8B?=
 =?UTF-8?q?=E5=BC=8F=E7=A2=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/compiler.xml                            |   2 +-
 .idea/gradle.xml                              |   2 +-
 .idea/misc.xml                                |   3 +-
 .../ray650128/gstreamer_demo_app/Constants.kt |   7 +
 .../gstreamer_demo_app/PreferenceUtil.kt      |   2 +-
 .../ui/mainScreen/MainActivity.kt             |  18 +-
 .../ui/mainScreen/MainViewModel.kt            |  23 +--
 .../ui/mainScreen/SplitViewFragment.kt        | 190 +++++++++---------
 gstreamer_player/jni/gst_player.c             |   2 +-
 9 files changed, 126 insertions(+), 123 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 659bf43..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="16" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 823f760..ac904ed 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="semeru-16" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0ad850a..ebf6080 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -16,5 +15,5 @@
     </option>
   </component>
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_16_PREVIEW" project-jdk-name="11" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/Constants.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/Constants.kt
index 0568cce..8746dd2 100644
--- a/app/src/main/java/com/ray650128/gstreamer_demo_app/Constants.kt
+++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/Constants.kt
@@ -1,5 +1,12 @@
 package com.ray650128.gstreamer_demo_app
 
 object Constants {
+    //region Split mode
+    const val SPLIT_MODE_SIXTEEN = 16
+    const val SPLIT_MODE_NINE = 9
+    const val SPLIT_MODE_FOUR = 4
+    const val SPLIT_MODE_SINGLE = 1
+    //endregion
+
     const val CONF_DELAY_BASE_MILLIS = 1000L
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/PreferenceUtil.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/PreferenceUtil.kt
index b57d581..51a057c 100644
--- a/app/src/main/java/com/ray650128/gstreamer_demo_app/PreferenceUtil.kt
+++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/PreferenceUtil.kt
@@ -19,6 +19,6 @@ object PreferenceUtil {
         set(value) = sharedPreferences.edit().putBoolean(IS_FIRST_OPEN_KEY, value).apply()
 
     var lastSplitMode: Int
-        get() = sharedPreferences.getInt(LAST_SPLIT_MODE, MainViewModel.PAGE_MODE_ONE)
+        get() = sharedPreferences.getInt(LAST_SPLIT_MODE, Constants.SPLIT_MODE_SINGLE)
         set(value) = sharedPreferences.edit().putInt(LAST_SPLIT_MODE, value).apply()
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt
index 8dd5161..295b785 100644
--- a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt
+++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainActivity.kt
@@ -57,27 +57,27 @@ class MainActivity : AppCompatActivity() {
     private fun initContentView() = binding.apply {
         //region Content area
         button.setOnClickListener {
-            if (splitMode == MainViewModel.PAGE_MODE_ONE) return@setOnClickListener
-            viewModel.setSplitMode(MainViewModel.PAGE_MODE_ONE)
+            if (splitMode == Constants.SPLIT_MODE_SINGLE) return@setOnClickListener
+            viewModel.setSplitMode(Constants.SPLIT_MODE_SINGLE)
             Log.e(TAG, "+++ split style: 1")
         }
 
         button2.setOnClickListener {
-            if (splitMode == MainViewModel.PAGE_MODE_FOUR) return@setOnClickListener
-            viewModel.setSplitMode(MainViewModel.PAGE_MODE_FOUR)
+            if (splitMode == Constants.SPLIT_MODE_FOUR) return@setOnClickListener
+            viewModel.setSplitMode(Constants.SPLIT_MODE_FOUR)
             Log.e(TAG, "+++ split style: 4")
         }
 
         button3.setOnClickListener {
-            if (splitMode == MainViewModel.PAGE_MODE_NINE) return@setOnClickListener
-            viewModel.setSplitMode(MainViewModel.PAGE_MODE_NINE)
+            if (splitMode == Constants.SPLIT_MODE_NINE) return@setOnClickListener
+            viewModel.setSplitMode(Constants.SPLIT_MODE_NINE)
             Log.e(TAG, "+++ split style: 9")
         }
 
         button4.setOnClickListener {
-            if (splitMode == MainViewModel.PAGE_MODE_SIXTEEN) return@setOnClickListener
-            viewModel.setSplitMode(MainViewModel.PAGE_MODE_SIXTEEN)
-            Log.e(TAG, "+++ split style: 9")
+            if (splitMode == Constants.SPLIT_MODE_SIXTEEN) return@setOnClickListener
+            viewModel.setSplitMode(Constants.SPLIT_MODE_SIXTEEN)
+            Log.e(TAG, "+++ split style: 16")
         }
         //endregion
     }
diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainViewModel.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainViewModel.kt
index a498191..7225400 100644
--- a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainViewModel.kt
+++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/MainViewModel.kt
@@ -19,7 +19,7 @@ class MainViewModel: ViewModel() {
                 stream1 = "/media/video1",
                 stream2 = "/media/video2",
             ),
-            Device(
+            /*Device(
                 deviceName = "192.168.0.73",
                 ip = "192.168.0.73",
                 rtspPort = "554",
@@ -27,8 +27,8 @@ class MainViewModel: ViewModel() {
                 password = "hs22601576",
                 stream1 = "/media/video1",
                 stream2 = "/media/video2",
-            ),
-            Device(
+            ),*/
+            /*Device(
                 deviceName = "192.168.0.79",
                 ip = "192.168.0.79",
                 rtspPort = "554",
@@ -36,7 +36,7 @@ class MainViewModel: ViewModel() {
                 password = "1q2w3e4r!",
                 stream1 = "/media/video1",
                 stream2 = "/media/video2",
-            ),
+            ),*/
             Device(
                 deviceName = "192.168.0.88",
                 ip = "211.23.78.226",
@@ -64,7 +64,7 @@ class MainViewModel: ViewModel() {
                 stream1 = "/v01",
                 stream2 = "/v02",
             ),
-            Device(
+            /*Device(
                 deviceName = "192.168.0.76",
                 ip = "211.23.78.226",
                 rtspPort = "8576",
@@ -72,7 +72,7 @@ class MainViewModel: ViewModel() {
                 password = "123456",
                 stream1 = "/profile1",
                 stream2 = "/profile2",
-            ),
+            ),*/
             Device(
                 deviceName = "192.168.0.82",
                 ip = "192.168.0.82",
@@ -91,7 +91,7 @@ class MainViewModel: ViewModel() {
                 stream1 = "/profile1",
                 stream2 = "/profile2",
             ),
-            Device(
+            /*Device(
                 deviceName = "192.168.0.95",
                 ip = "192.168.0.95",
                 rtspPort = "554",
@@ -99,7 +99,7 @@ class MainViewModel: ViewModel() {
                 password = "123456",
                 stream1 = "/profile1",
                 stream2 = "/profile2",
-            )
+            )*/
         )
     }
 
@@ -137,11 +137,4 @@ class MainViewModel: ViewModel() {
         }
         return tmpData
     }
-
-    companion object {
-        const val PAGE_MODE_ONE = 1
-        const val PAGE_MODE_FOUR = 4
-        const val PAGE_MODE_NINE = 9
-        const val PAGE_MODE_SIXTEEN = 16
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt
index 290c7fd..ca207f6 100644
--- a/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt
+++ b/app/src/main/java/com/ray650128/gstreamer_demo_app/ui/mainScreen/SplitViewFragment.kt
@@ -25,7 +25,7 @@ class SplitViewFragment : Fragment() {
     val viewModel: SplitViewModel by activityViewModels()
 
     private var mPageNum: Int = 0
-    private var splitMode = MainViewModel.PAGE_MODE_ONE
+    private var splitMode = Constants.SPLIT_MODE_SINGLE
     private var streamType = VideoView.SUB_STREAM
     private var isClickable = true
 
@@ -98,111 +98,115 @@ class SplitViewFragment : Fragment() {
 
             baseView.rowCount = maxRow
             baseView.columnCount = maxCol
-            Log.e("${TAG}_$mPageNum", "baseView.rowCount: ${baseView.rowCount}, baseView.columnCount: ${baseView.columnCount}")
+
+            for (col in 0 until maxCol) {
+                for (row in 0 until maxRow) {
+                    val videoView = VideoView(requireContext())
+                    val layoutParam = GridLayout.LayoutParams().apply {
+                        topMargin = 0.dp
+                        bottomMargin = 0.dp
+                        marginEnd = 0.dp
+                        marginStart = 0.dp
+
+                        // 調整間距
+                        when (splitMode) {
+                            Constants.SPLIT_MODE_FOUR -> {
+                                when (col) {
+                                    0 -> bottomMargin = 2.dp
+                                    1 -> topMargin = 2.dp
+                                }
+                                when (row) {
+                                    0 -> marginEnd = 2.dp
+                                    1 -> marginStart = 2.dp
+                                }
+                            }
+                            Constants.SPLIT_MODE_NINE -> {
+                                if (col == 1) {
+                                    topMargin = 4.dp
+                                    bottomMargin = 4.dp
+                                }
+                                if (row == 1) {
+                                    marginEnd = 4.dp
+                                    marginStart = 4.dp
+                                }
+                            }
+                            Constants.SPLIT_MODE_SIXTEEN -> {
+                                if (col == 1) {
+                                    topMargin = 4.dp
+                                    bottomMargin = 2.dp
+                                }
+                                if (col == 2) {
+                                    topMargin = 2.dp
+                                    bottomMargin = 4.dp
+                                }
+                                if (row == 1) {
+                                    marginStart = 4.dp
+                                    marginEnd = 2.dp
+                                }
+                                if (row == 2) {
+                                    marginStart = 2.dp
+                                    marginEnd = 4.dp
+                                }
+                            }
+                        }
+                    }
+                    baseView.addView(videoView, layoutParam)
+                    videoViews.add(videoView)
+                }
+            }
 
             baseView.post {
-                for (col in 0 until maxCol) {
-                    for (row in 0 until maxRow) {
-                        val videoView = VideoView(requireContext())
-                        val layoutParam = GridLayout.LayoutParams().apply {
-                            topMargin = 0.dp
-                            bottomMargin = 0.dp
-                            marginEnd = 0.dp
-                            marginStart = 0.dp
-
-                            // 調整間距
-                            when (splitMode) {
-                                MainViewModel.PAGE_MODE_ONE -> {
-                                    width = (baseView.width / maxRow)
-                                    height = (baseView.height / maxCol)
-                                }
-                                MainViewModel.PAGE_MODE_FOUR -> {
-                                    when (col) {
-                                        0 -> bottomMargin = 2.dp
-                                        1 -> topMargin = 2.dp
-                                    }
-                                    when (row) {
-                                        0 -> marginEnd = 2.dp
-                                        1 -> marginStart = 2.dp
-                                    }
-                                    width = (baseView.width / maxRow) - maxRow.dp
-                                    height = (baseView.height / maxCol) - maxCol.dp
-                                }
-                                MainViewModel.PAGE_MODE_NINE -> {
-                                    if (col == 1) {
-                                        topMargin = 4.dp
-                                        bottomMargin = 4.dp
-                                    }
-                                    if (row == 1) {
-                                        marginEnd = 4.dp
-                                        marginStart = 4.dp
-                                    }
-                                    width = (baseView.width / maxRow) - maxRow.dp
-                                    height = (baseView.height / maxCol) - maxCol.dp
-                                }
-                                MainViewModel.PAGE_MODE_SIXTEEN -> {
-                                    if (col == 1) {
-                                        topMargin = 4.dp
-                                        bottomMargin = 2.dp
-                                    }
-                                    if (col == 2) {
-                                        topMargin = 2.dp
-                                        bottomMargin = 4.dp
-                                    }
-                                    if (row == 1) {
-                                        marginStart = 4.dp
-                                        marginEnd = 2.dp
-                                    }
-                                    if (row == 2) {
-                                        marginStart = 2.dp
-                                        marginEnd = 4.dp
-                                    }
-                                    width = (baseView.width / maxRow) - maxRow.dp
-                                    height = (baseView.height / maxCol) - maxCol.dp
-                                }
-                            }
-                        }
-                        baseView.addView(videoView, layoutParam)
-                        videoViews.add(videoView)
+                // 根據分割數量決定子項目的寬度
+                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
                     }
                 }
-
-                setAllUrl()
-
-                if (isClickable) {
-                    for (position in videoViews.indices) {
-                        videoViews[position].setOnClickListener {
-                            if (position >= data.size) return@setOnClickListener
-                            if (!videoViews[position].isPlaying) {
-                                return@setOnClickListener
-                            }
-                            MainScope().launch {
-                                stopAll()
-                                delay(splitMode * Constants.CONF_DELAY_BASE_MILLIS)
-                                val item = data[position]
-                                val bundle = Bundle().apply {
-                                    //putInt(MonitoringActivity.BUNDLE_DEVICE_ID, item.id)
-                                    //putInt(MonitoringActivity.BUNDLE_CHANNEL_ID, item.channelId)
-                                    putParcelable(MonitoringActivity.BUNDLE_DEVICE, item)
-                                }
-                                val intent = Intent(requireContext(), MonitoringActivity::class.java)
-                                intent.putExtras(bundle)
-                                startActivity(intent)
-                                //gotoActivity(MonitoringActivity::class.java, bundle)*/
-                                //Log.d("${TAG}_$mPageNum", "check: $item")
-                            }
-                        }
-                    }
+                videoViews.forEach { videoView ->
+                    videoView.layoutParams?.width = cellWidth
+                    videoView.layoutParams?.height = cellHeight
                 }
             }
         }
+
+        if (isClickable) {
+            for (position in videoViews.indices) {
+                videoViews[position].setOnClickListener {
+                    if (position >= data.size) return@setOnClickListener
+                    if (!videoViews[position].isPlaying) {
+                        return@setOnClickListener
+                    }
+                    stopAll()
+                    val item = data[position]
+                    val bundle = Bundle().apply {
+                        //putInt(MonitoringActivity.BUNDLE_DEVICE_ID, item.id)
+                        //putInt(MonitoringActivity.BUNDLE_CHANNEL_ID, item.channelId)
+                        putParcelable(MonitoringActivity.BUNDLE_DEVICE, item)
+                    }
+                    val intent = Intent(requireContext(), MonitoringActivity::class.java)
+                    intent.putExtras(bundle)
+                    startActivity(intent)
+                    //gotoActivity(MonitoringActivity::class.java, bundle)*/
+                    //Log.d("${TAG}_$mPageNum", "check: $item")
+                }
+            }
+        }
+
+        setAllUrl()
     }
 
     private fun setAllUrl() {
         for (index in data.indices) {
             videoViews[index].setData(data[index])
             videoViews[index].setTextVisible(
-                (splitMode != MainViewModel.PAGE_MODE_NINE && splitMode != MainViewModel.PAGE_MODE_SIXTEEN)
+                (splitMode != Constants.SPLIT_MODE_NINE && splitMode != Constants.SPLIT_MODE_SIXTEEN)
             )
         }
     }
diff --git a/gstreamer_player/jni/gst_player.c b/gstreamer_player/jni/gst_player.c
index e41a009..5534d8a 100644
--- a/gstreamer_player/jni/gst_player.c
+++ b/gstreamer_player/jni/gst_player.c
@@ -250,7 +250,7 @@ static void *app_function(void *userdata) {
     g_main_context_push_thread_default(data->context);
 
     /* Build pipeline */
-    data->pipeline = gst_parse_launch("playbin", &error);
+    data->pipeline = gst_parse_launch("playbin3", &error);
     if (error) {
         gchar *message = g_strdup_printf("Unable to build pipeline: %s", error->message);
         g_clear_error(&error);