expose setFlashVersion to StreamClient

pedroSG94 · May 7, 2024 · 69a2ee2 · 69a2ee2
1 parent 4255059
commit 69a2ee2
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/library/src/main/java/com/pedro/library/util/streamclient/GenericStreamClient.kt b/library/src/main/java/com/pedro/library/util/streamclient/GenericStreamClient.kt
@@ -32,6 +32,16 @@ class GenericStreamClient(
 
   private var connectedStreamClient : StreamBaseClient? = null
 
+  /**
+   * Must be called before start stream or will be ignored.
+   *
+   * Set flash version used in connect command.
+   * Default value FMLE/3.0 (compatible; Lavf57.56.101)
+   */
+  fun setFlashVersion(flashVersion: String) {
+    rtmpClient.setFlashVersion(flashVersion)
+  }
+
   /**
    * Add certificates for TLS connection
    */

diff --git a/library/src/main/java/com/pedro/library/util/streamclient/RtmpStreamClient.kt b/library/src/main/java/com/pedro/library/util/streamclient/RtmpStreamClient.kt
@@ -27,6 +27,16 @@ class RtmpStreamClient(
   private val streamClientListener: StreamClientListener?
 ): StreamBaseClient() {
 
+  /**
+   * Must be called before start stream or will be ignored.
+   *
+   * Set flash version used in connect command.
+   * Default value FMLE/3.0 (compatible; Lavf57.56.101)
+   */
+  fun setFlashVersion(flashVersion: String) {
+    rtmpClient.setFlashVersion(flashVersion)
+  }
+
   /**
    * Add certificates for TLS connection
    */

diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManager.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManager.kt
@@ -49,7 +49,7 @@ abstract class CommandsManager {
   var appName = ""
   var streamName = ""
   var tcUrl = ""
-  var flashVer: String = "FMLE/3.0 (compatible; Lavf57.56.101)"
+  var flashVersion: String = "FMLE/3.0 (compatible; Lavf57.56.101)"
   var user: String? = null
   var password: String? = null
   var onAuth = false
@@ -86,10 +86,6 @@ abstract class CommandsManager {
     this.password = password
   }
 
-  fun setFlashVer(flashVer: String) {
-    this.flashVer = flashVer
-  }
-
   protected fun getCurrentTimestamp(): Int {
     return (TimeUtils.getCurrentTimeMillis() / 1000 - timestamp).toInt()
   }

diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManagerAmf0.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManagerAmf0.kt
@@ -40,7 +40,7 @@ class CommandsManagerAmf0: CommandsManager() {
         BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_CONNECTION.mark))
     val connectInfo = AmfObject()
     connectInfo.setProperty("app", appName + auth)
-    connectInfo.setProperty("flashVer", flashVer)
+    connectInfo.setProperty("flashVer", flashVersion)
     connectInfo.setProperty("tcUrl", tcUrl + auth)
     if (!videoDisabled) {
       if (videoCodec == VideoCodec.H265) {

diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManagerAmf3.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManagerAmf3.kt
@@ -18,9 +18,6 @@ package com.pedro.rtmp.rtmp
 
 import android.util.Log
 import com.pedro.common.VideoCodec
-import com.pedro.rtmp.amf.v0.AmfData
-import com.pedro.rtmp.amf.v0.AmfStrictArray
-import com.pedro.rtmp.amf.v0.AmfString
 import com.pedro.rtmp.amf.v3.Amf3Array
 import com.pedro.rtmp.amf.v3.Amf3Data
 import com.pedro.rtmp.amf.v3.Amf3Dictionary
@@ -42,7 +39,7 @@ class CommandsManagerAmf3: CommandsManager() {
         BasicHeader(ChunkType.TYPE_0, ChunkStreamId.OVER_CONNECTION.mark))
     val connectInfo = Amf3Object()
     connectInfo.setProperty("app", appName + auth)
-    connectInfo.setProperty("flashVer", flashVer)
+    connectInfo.setProperty("flashVer", flashVersion)
     connectInfo.setProperty("tcUrl", tcUrl + auth)
     if (!videoDisabled) {
       if (videoCodec == VideoCodec.H265) {

diff --git a/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt b/rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt
@@ -187,8 +187,8 @@ class RtmpClient(private val connectChecker: ConnectChecker) {
     commandsManager.fps = fps
   }
 
-  fun setFlashVer(flashVer: String) {
-    commandsManager.flashVer = flashVer
+  fun setFlashVersion(flashVersion: String) {
+    commandsManager.flashVersion = flashVersion
   }
 
   fun connect(url: String?) {