fix has congestion and allow setvideoinfo before connect on rtsp

pedroSG94 · Sep 25, 2023 · 0552699 · 0552699
1 parent 0005d02
commit 0552699
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpSender.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpSender.kt
@@ -53,6 +53,7 @@ class RtmpSender(
   private var running = false
 
   private var cacheSize = 60
+  @Volatile
   private var itemsInQueue = 0
 
   private var job: Job? = null

diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspClient.kt
@@ -198,10 +198,9 @@ class RtspClient(private val connectCheckerRtsp: ConnectCheckerRtsp) {
                   connectCheckerRtsp.onConnectionFailedRtsp("sps or pps is null")
                 }
                 return@launch
-              } else {
-                rtspSender.setVideoInfo(commandsManager.sps!!, commandsManager.pps!!, commandsManager.vps)
               }
             }
+            rtspSender.setVideoInfo(commandsManager.sps!!, commandsManager.pps!!, commandsManager.vps)
           }
           if (!tlsEnabled) {
             connectionSocket = Socket()

diff --git a/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspSender.kt b/rtsp/src/main/java/com/pedro/rtsp/rtsp/RtspSender.kt
@@ -53,6 +53,7 @@ class RtspSender(private val connectCheckerRtsp: ConnectCheckerRtsp) {
   private val defaultCacheSize: Int
     get() = 10 * 1024 * 1024 / RtpConstants.MTU
   private var cacheSize = defaultCacheSize
+  @Volatile
   private var itemsInQueue = 0
   @Volatile
   private var running = 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
@@ -68,6 +68,7 @@ class SrtSender(
   private var running = false
 
   private var cacheSize = 60
+  @Volatile
   private var itemsInQueue = 0
 
   private var job: Job? = null