New RTMP module.

Author: shogo4405

app/build.gradle.kts

@@ -39,6 +39,7 @@ android {
 
 dependencies {
     implementation(project(":haishinkit"))
+    implementation(project(":rtmp"))
     implementation(project(":lottie"))
     implementation(project(":compose"))
     implementation(libs.accompanist.permissions)

app/src/main/java/com/haishinkit/app/MainActivity.kt

@@ -5,11 +5,14 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.material3.MaterialTheme
+import com.haishinkit.rtmp.RtmpStreamSessionFactory
+import com.haishinkit.stream.StreamSession
 
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
+        StreamSession.Builder.registerFactory(RtmpStreamSessionFactory)
         setContent {
             MaterialTheme {
                 MainScreen()

app/src/main/java/com/haishinkit/app/MediaProjectionService.kt

@@ -19,23 +19,17 @@ import android.os.Messenger
 import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
+import androidx.core.net.toUri
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.haishinkit.event.Event
-import com.haishinkit.event.EventUtils
-import com.haishinkit.event.IEventListener
 import com.haishinkit.graphics.effect.LanczosVideoEffect
 import com.haishinkit.graphics.effect.VideoEffect
 import com.haishinkit.media.MediaMixer
 import com.haishinkit.media.source.MediaProjectionSource
-import com.haishinkit.rtmp.RtmpConnection
-import com.haishinkit.rtmp.RtmpStream
+import com.haishinkit.stream.StreamSession
 
-class MediaProjectionService :
-    Service(),
-    IEventListener {
+class MediaProjectionService : Service() {
     private lateinit var mixer: MediaMixer
-    private lateinit var stream: RtmpStream
-    private lateinit var connection: RtmpConnection
+    private lateinit var session: StreamSession
     private lateinit var videoSource: MediaProjectionSource
     private val localBroadcastManager: LocalBroadcastManager by lazy {
         LocalBroadcastManager.getInstance(this)
@@ -54,12 +48,12 @@ class MediaProjectionService :
             override fun handleMessage(msg: Message) {
                 when (msg.what) {
                     MSG_CONNECT -> {
-                        connection.connect(Preference.shared.rtmpURL)
+                        // session.connect(StreamSession.Method.INGEST)
                     }
 
                     MSG_CLOSE -> {
                         Log.i(TAG, "MSG_CLOSE")
-                        connection.close()
+                        // session.close()
                         stopSelf()
                     }
 
@@ -116,33 +110,27 @@ class MediaProjectionService :
             getSystemService(MEDIA_PROJECTION_SERVICE) as MediaProjectionManager
 
         // mixer.attachAudio(AudioRecordSource(this))
-        mixer.registerOutput(stream)
-
-        stream.listener = listener
+        mixer.registerOutput(session.stream)
         data?.let {
             val source =
                 MediaProjectionSource(
                     this,
                     mediaProjectionManager.getMediaProjection(Activity.RESULT_OK, it),
                 )
             // mixer.attachVideo(0, source)
-            stream.videoSetting.width = source.video.videoSize.width shr 2
-            stream.videoSetting.height = source.video.videoSize.height shr 2
+            // stream.videoSetting.width = source.video.videoSize.width shr 2
+            // stream.videoSetting.height = source.video.videoSize.height shr 2
             videoSource = source
-            Log.e(TAG, "${stream.videoSetting.width}:${stream.videoSetting.height}")
         }
-
-        connection.connect(Preference.shared.rtmpURL)
         return START_NOT_STICKY
     }
 
     override fun onCreate() {
         super.onCreate()
         mixer = MediaMixer(applicationContext)
         messenger = Messenger(handler)
-        connection = RtmpConnection()
-        connection.addEventListener(Event.RTMP_STATUS, this)
-        stream = RtmpStream(applicationContext, connection)
+        session =
+            StreamSession.Builder(applicationContext, Preference.shared.rtmpURL.toUri()).build()
         localBroadcastManager.registerReceiver(
             isRunningReceiver,
             IntentFilter(ACTION_SERVICE_RUNNING),
@@ -152,20 +140,9 @@ class MediaProjectionService :
     override fun onDestroy() {
         super.onDestroy()
         mixer.dispose()
-        connection.dispose()
         localBroadcastManager.unregisterReceiver(isRunningReceiver)
     }
 
-    override fun handleEvent(event: Event) {
-        Log.i(TAG, event.toString())
-        val data = EventUtils.toMap(event)
-        val code = data["code"].toString()
-        if (code == RtmpConnection.Code.CONNECT_SUCCESS.rawValue) {
-            stream.publish(Preference.shared.streamName)
-        }
-        Log.i(TAG, code)
-    }
-
     companion object {
         private const val ACTION_SERVICE_RUNNING: String = "ACTION_SERVICE_RUNNING"
 
@@ -176,8 +153,6 @@ class MediaProjectionService :
         const val NOTIFY_TITLE = "Recording."
 
         var data: Intent? = null
-        var listener: RtmpStream.Listener? = null
-
         const val MSG_CONNECT = 0
         const val MSG_CLOSE = 1
         const val MSG_SET_VIDEO_EFFECT = 2

build.gradle.kts

@@ -33,4 +33,5 @@ dependencies {
     dokka(project(":haishinkit:"))
     dokka(project(":compose:"))
     dokka(project(":lottie:"))
+    dokka(project(":rtmp:"))
 }

haishinkit/src/main/java/com/haishinkit/media/BufferController.kt

@@ -5,7 +5,7 @@ import android.util.Log
 import java.util.concurrent.LinkedBlockingDeque
 import java.util.concurrent.atomic.AtomicInteger
 
-internal class BufferController<T>(
+class BufferController<T>(
     suffix: String,
 ) : Object() {
     interface Listener {

haishinkit/src/main/java/com/haishinkit/media/MediaLink.kt

@@ -21,7 +21,7 @@ import kotlin.coroutines.CoroutineContext
 /**
  * The MediaLink class can be used to synchronously play audio and video streams.
  */
-internal class MediaLink(
+class MediaLink(
     val stream: Stream,
 ) : Running,
     CoroutineScope,
@@ -54,7 +54,7 @@ internal class MediaLink(
     override val coroutineContext: CoroutineContext
         get() = Dispatchers.Default
 
-    internal var audioTrack: AudioTrack? = null
+    var audioTrack: AudioTrack? = null
         set(value) {
             syncMode =
                 if (value == null) {

haishinkit/src/main/java/com/haishinkit/metrics/FrameTracker.kt

@@ -4,7 +4,7 @@ import android.util.Log
 import kotlin.math.pow
 import kotlin.math.sqrt
 
-internal class FrameTracker {
+class FrameTracker {
     private class Frame(
         val type: String,
     ) {

haishinkit/src/main/java/com/haishinkit/net/NetSocketImpl.kt

@@ -18,7 +18,7 @@ import javax.net.ssl.SSLSocket
 import javax.net.ssl.SSLSocketFactory
 import kotlin.coroutines.CoroutineContext
 
-internal class NetSocketImpl :
+class NetSocketImpl :
     NetSocket,
     CoroutineScope {
     override var timeout = DEFAULT_TIMEOUT

haishinkit/src/main/java/com/haishinkit/stream/Stream.kt

@@ -13,15 +13,14 @@ import com.haishinkit.media.MediaLink
 import com.haishinkit.media.MediaOutput
 import com.haishinkit.media.MediaOutputDataSource
 import com.haishinkit.media.MediaType
-import com.haishinkit.rtmp.RtmpStream
 import com.haishinkit.screen.Screen
 import com.haishinkit.screen.VideoScreenObject
 import java.lang.ref.WeakReference
 import java.nio.ByteBuffer
 import java.util.concurrent.atomic.AtomicBoolean
 
 /**
- * The Stream class is the foundation of a [RtmpStream].
+ * The Stream class is the foundation of a [com.haishinkit.rtmp.RtmpStream].
  */
 @Suppress("UNUSED")
 abstract class Stream(
@@ -75,7 +74,7 @@ abstract class Stream(
             return field
         }
 
-    internal val mediaLink: MediaLink by lazy {
+    val mediaLink: MediaLink by lazy {
         MediaLink(this)
     }
 
@@ -155,7 +154,7 @@ abstract class Stream(
         videoCodec.surface = surface
     }
 
-    internal fun queueOutputBuffer(
+    fun queueOutputBuffer(
         type: MediaType,
         index: Int,
         payload: ByteBuffer?,

haishinkit/src/main/java/com/haishinkit/stream/StreamSession.kt

@@ -2,13 +2,11 @@ package com.haishinkit.stream
 
 import android.content.Context
 import android.net.Uri
-import com.haishinkit.rtmp.RtmpConnection
-import com.haishinkit.rtmp.RtmpSession
 
 /**
  * [StreamSession] is a session for live streaming.
  *
- * Streaming with [RtmpConnection] is difficult to use because it requires many idioms.
+ * Streaming with [com.haishinkit.rtmp.RtmpConnection] is difficult to use because it requires many idioms.
  * This is a helper class specialized for a one-connection, one-stream setup.
  */
 interface StreamSession {
@@ -24,7 +22,28 @@ interface StreamSession {
         private val context: Context,
         private val uri: Uri,
     ) {
-        fun build(): StreamSession = RtmpSession(context, uri)
+        companion object {
+            private var factoryMap = mutableMapOf<String, StreamSessionFactory>()
+
+            /**
+             * Registers a stream session factory.
+             */
+            fun registerFactory(factory: StreamSessionFactory) {
+                factory.protocols.forEach {
+                    factoryMap[it] = factory
+                }
+            }
+        }
+
+        fun build(): StreamSession {
+            val scheme = uri.scheme
+            for (factory in factoryMap) {
+                if (factory.key == scheme) {
+                    return factory.value.create(context, uri)
+                }
+            }
+            throw NullPointerException()
+        }
     }
 
     /**