fix srt retry

pedroSG94 · Nov 3, 2023 · d917778 · d917778
1 parent 6e864a3
commit d917778
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 19 deletions.
diff --git a/srt/src/main/java/com/pedro/srt/mpeg2ts/packets/AacPacket.kt b/srt/src/main/java/com/pedro/srt/mpeg2ts/packets/AacPacket.kt
@@ -74,9 +74,11 @@ class AacPacket(
     callback(packets)
   }
 
-  override fun resetPacket() {
-    sampleRate = 44100
-    isStereo = true
+  override fun resetPacket(resetInfo: Boolean) {
+    if (resetInfo) {
+      sampleRate = 44100
+      isStereo = true
+    }
   }
 
   fun sendAudioInfo(sampleRate: Int, stereo: Boolean) {

diff --git a/srt/src/main/java/com/pedro/srt/mpeg2ts/packets/BasePacket.kt b/srt/src/main/java/com/pedro/srt/mpeg2ts/packets/BasePacket.kt
@@ -56,11 +56,11 @@ abstract class BasePacket(
     callback: (List<MpegTsPacket>) -> Unit
   )
 
-  abstract fun resetPacket()
+  abstract fun resetPacket(resetInfo: Boolean)
 
-  fun reset() {
+  fun reset(resetInfo: Boolean) {
     mpegTsPacketizer.reset()
-    resetPacket()
+    resetPacket(resetInfo)
   }
 
   fun setLimitSize(limitSize: Int) {

diff --git a/srt/src/main/java/com/pedro/srt/mpeg2ts/packets/H26XPacket.kt b/srt/src/main/java/com/pedro/srt/mpeg2ts/packets/H26XPacket.kt
@@ -107,10 +107,12 @@ class H26XPacket(
     callback(packets)
   }
 
-  override fun resetPacket() {
-    vps = null
-    sps = null
-    pps = null
+  override fun resetPacket(resetInfo: Boolean) {
+    if (resetInfo) {
+      vps = null
+      sps = null
+      pps = null
+    }
     configSend = false
   }
 

diff --git a/srt/src/main/java/com/pedro/srt/srt/SrtClient.kt b/srt/src/main/java/com/pedro/srt/srt/SrtClient.kt
@@ -216,14 +216,11 @@ class SrtClient(private val connectCheckerSrt: ConnectCheckerSrt) {
   }
 
   private suspend fun disconnect(clear: Boolean) {
-    if (isStreaming) srtSender.stop()
-    val error = runCatching {
+    if (isStreaming) srtSender.stop(clear)
+    runCatching {
       commandsManager.writeShutdown(socket)
-      socket?.close()
-    }.exceptionOrNull()
-    if (error != null) {
-      Log.e(TAG, "disconnect error", error)
     }
+    socket?.close()
     if (clear) {
       reTries = numRetry
       doingRetry = false

diff --git a/srt/src/main/java/com/pedro/srt/srt/SrtSender.kt b/srt/src/main/java/com/pedro/srt/srt/SrtSender.kt
@@ -210,13 +210,13 @@ class SrtSender(
     }
   }
 
-  suspend fun stop() {
+  suspend fun stop(clear: Boolean) {
     running = false
     psiManager.reset()
     service.clear()
     mpegTsPacketizer.reset()
-    aacPacket.reset()
-    h26XPacket.reset()
+    aacPacket.reset(clear)
+    h26XPacket.reset(clear)
     resetSentAudioFrames()
     resetSentVideoFrames()
     resetDroppedAudioFrames()

diff --git a/srt/src/main/java/com/pedro/srt/utils/SrtSocket.kt b/srt/src/main/java/com/pedro/srt/utils/SrtSocket.kt
@@ -29,15 +29,18 @@ class SrtSocket(private val host: String, private val port: Int) {
   private val TAG = "SrtSocket"
   private var socket: DatagramSocket? = null
   private var packetSize = Constants.MTU
+  private val timeout = 5000
 
   fun connect() {
     val address = InetAddress.getByName(host)
     socket = DatagramSocket()
     socket?.connect(address, port)
+    socket?.soTimeout = timeout
   }
 
   fun close() {
     if (socket?.isClosed == false) {
+      socket?.disconnect()
       socket?.close()
       socket = null
     }