version 1.3.3

pedroSG94 · Oct 28, 2024 · 119e829 · 119e829
1 parent a95bab6
commit 119e829
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -15,8 +15,8 @@ allprojects {
   }
 }
 dependencies {
-  implementation 'com.github.pedroSG94:RTSP-Server:1.3.2'
-  implementation 'com.github.pedroSG94.RootEncoder:library:2.5.3'
+  implementation 'com.github.pedroSG94:RTSP-Server:1.3.3'
+  implementation 'com.github.pedroSG94.RootEncoder:library:2.5.4'
 }
 
 ```
diff --git a/app/src/main/java/com/pedro/sample/CameraDemoActivity.kt b/app/src/main/java/com/pedro/sample/CameraDemoActivity.kt
@@ -3,12 +3,8 @@ package com.pedro.sample
 import android.graphics.SurfaceTexture
 import android.os.Build
 import android.os.Bundle
-import android.os.Environment
-import android.util.Log
 import android.view.TextureView
-import android.view.View
 import android.view.WindowManager
-import android.widget.Button
 import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
@@ -21,8 +17,6 @@ import com.pedro.library.view.AutoFitTextureView
 import com.pedro.rtspserver.RtspServerCamera1
 import com.pedro.rtspserver.server.ClientListener
 import com.pedro.rtspserver.server.ServerClient
-import java.io.File
-import java.io.IOException
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
@@ -122,7 +116,6 @@ class CameraDemoActivity : AppCompatActivity(), ConnectChecker, ClientListener,
   }
 
   override fun onConnectionFailed(reason: String) {
-    Log.e("Pedro", "failed: $reason")
     toast("Failed: $reason")
     rtspServerCamera1.stopStream()
     if (!rtspServerCamera1.isRecording) ScreenOrientation.unlockScreen(this)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,7 +1,7 @@
 [versions]
 libraryGroup = "com.github.pedroSG94"
-versionCode = "132"
-versionName = "1.3.2"
+versionCode = "133"
+versionName = "1.3.3"
 
 #plugins versions
 agp = "8.6.1"
@@ -14,7 +14,7 @@ appcompat = "1.6.1"
 constraintlayout = "2.1.4"
 coroutines = "1.9.0"
 ktor = "3.0.0"
-rootEncoder = "2.5.3"
+rootEncoder = "2.5.4"
 
 [libraries]
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }

diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/server/RtspServer.kt b/rtspserver/src/main/java/com/pedro/rtspserver/server/RtspServer.kt
@@ -15,12 +15,9 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.cancelAndJoin
-import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import java.io.IOException
-import java.lang.RuntimeException
 import java.net.NetworkInterface
-import java.net.SocketException
 import java.nio.ByteBuffer
 import java.util.concurrent.Semaphore
 import java.util.concurrent.TimeUnit

diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/server/ServerClient.kt b/rtspserver/src/main/java/com/pedro/rtspserver/server/ServerClient.kt
@@ -74,13 +74,25 @@ class ServerClient(
               rtspSender.setAudioInfo(serverCommandManager.sampleRate, serverCommandManager.isStereo)
             }
 
+            val videoPorts = if (!serverCommandManager.videoDisabled) {
+              serverCommandManager.videoPorts.toTypedArray()
+            } else arrayOf<Int?>(null, null)
+            val videoServerPorts = if (!serverCommandManager.videoDisabled) {
+              serverCommandManager.videoServerPorts
+            } else arrayOf<Int?>(null, null)
+            val audioPorts = if (!serverCommandManager.audioDisabled) {
+              serverCommandManager.audioPorts.toTypedArray()
+            } else arrayOf<Int?>(null, null)
+            val audioServerPorts = if (!serverCommandManager.audioDisabled) {
+              serverCommandManager.audioServerPorts
+            } else arrayOf<Int?>(null, null)
+
             rtspSender.setSocketsInfo(
               serverCommandManager.protocol,
               socket.getHost(),
-              serverCommandManager.videoServerPorts,
-              serverCommandManager.audioServerPorts,
-              serverCommandManager.videoPorts.toIntArray(),
-              serverCommandManager.audioPorts.toIntArray(),
+              videoServerPorts,
+              audioServerPorts,
+              videoPorts, audioPorts
             )
             rtspSender.setSocket(socket)
             rtspSender.start()

diff --git a/rtspserver/src/main/java/com/pedro/rtspserver/server/ServerCommandManager.kt b/rtspserver/src/main/java/com/pedro/rtspserver/server/ServerCommandManager.kt
@@ -10,9 +10,6 @@ import com.pedro.rtsp.rtsp.commands.CommandsManager
 import com.pedro.rtsp.rtsp.commands.Method
 import com.pedro.rtsp.rtsp.commands.SdpBody
 import com.pedro.rtsp.utils.RtpConstants
-import com.pedro.rtsp.utils.encodeToString
-import com.pedro.rtsp.utils.getData
-import java.io.BufferedReader
 import java.io.IOException
 import java.net.SocketException
 import java.util.regex.Pattern
@@ -31,8 +28,8 @@ class ServerCommandManager: CommandsManager() {
   private var serverPort: Int = 0
 
   private val TAG = "ServerCommandManager"
-  var audioPorts = ArrayList<Int>()
-  var videoPorts = ArrayList<Int>()
+  var audioPorts = ArrayList<Int?>()
+  var videoPorts = ArrayList<Int?>()
 
   fun setServerInfo(serverIp: String, serverPort: Int) {
     this.serverIp = serverIp