add rtmp opus support and record opus flv files

Author: pedroSG94

app/src/main/java/com/pedro/streamer/rotation/CameraFragment.kt

@@ -29,14 +29,12 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.annotation.RequiresApi
 import androidx.fragment.app.Fragment
-import com.pedro.common.AudioCodec
 import com.pedro.common.ConnectChecker
 import com.pedro.encoder.input.sources.video.Camera1Source
 import com.pedro.encoder.input.sources.video.Camera2Source
 import com.pedro.extrasources.CameraXSource
 import com.pedro.library.base.recording.RecordController
 import com.pedro.library.generic.GenericStream
-import com.pedro.library.rtmp.RtmpStream
 import com.pedro.library.util.BitrateAdapter
 import com.pedro.streamer.R
 import com.pedro.streamer.utils.PathUtils
@@ -76,10 +74,9 @@ class CameraFragment: Fragment(), ConnectChecker {
     fun getInstance(): CameraFragment = CameraFragment()
   }
 
-  val genericStream: RtmpStream by lazy {
-    RtmpStream(requireContext(), this).apply {
+  val genericStream: GenericStream by lazy {
+    GenericStream(requireContext(), this).apply {
       getGlInterface().autoHandleOrientation = true
-      setAudioCodec(AudioCodec.OPUS)
     }
   }
   private lateinit var surfaceView: SurfaceView

library/src/main/java/com/pedro/library/util/FlvMuxerRecordController.kt

@@ -24,6 +24,7 @@ import com.pedro.rtmp.flv.FlvType
 import com.pedro.rtmp.flv.audio.AudioFormat
 import com.pedro.rtmp.flv.audio.packet.AacPacket
 import com.pedro.rtmp.flv.audio.packet.G711Packet
+import com.pedro.rtmp.flv.audio.packet.OpusPacket
 import com.pedro.rtmp.flv.video.VideoFormat
 import com.pedro.rtmp.flv.video.packet.Av1Packet
 import com.pedro.rtmp.flv.video.packet.H264Packet
@@ -39,7 +40,6 @@ import kotlinx.coroutines.runInterruptible
 import java.io.ByteArrayOutputStream
 import java.io.FileDescriptor
 import java.io.FileOutputStream
-import java.io.IOException
 import java.io.OutputStream
 import java.nio.ByteBuffer
 import java.util.concurrent.LinkedBlockingQueue
@@ -72,13 +72,10 @@ class FlvMuxerRecordController: BaseRecordController() {
     }
 
     private fun start(listener: RecordController.Listener?) {
-        if (audioCodec == AudioCodec.OPUS) throw IOException("Unsupported AudioCodec: " + audioCodec.name)
-        when (audioCodec) {
-            AudioCodec.G711 -> audioPacket = G711Packet()
-            AudioCodec.AAC -> audioPacket = AacPacket().apply {
-                sendAudioInfo(sampleRate, isStereo)
-            }
-            else -> {}
+        audioPacket = when (audioCodec) {
+            AudioCodec.G711 -> G711Packet()
+            AudioCodec.AAC -> AacPacket().apply { sendAudioInfo(sampleRate, isStereo) }
+            AudioCodec.OPUS -> OpusPacket().apply { sendAudioInfo(sampleRate, isStereo) }
         }
         videoPacket = when (videoCodec) {
             VideoCodec.H264 -> H264Packet()
@@ -295,7 +292,7 @@ class FlvMuxerRecordController: BaseRecordController() {
         val audioCodecValue = when (audioCodec) {
             AudioCodec.AAC -> AudioFormat.AAC.value
             AudioCodec.G711 -> AudioFormat.G711_A.value
-            else -> throw IllegalArgumentException("unsupported null codec")
+            AudioCodec.OPUS -> AudioFormat.OPUS.value
         }
         info.setProperty("audiocodecid", audioCodecValue.toDouble())
         info.setProperty("audiosamplerate", sampleRate.toDouble())

rtmp/src/main/java/com/pedro/rtmp/flv/audio/config/OpusAudioSpecificConfig.kt

@@ -26,14 +26,14 @@ class OpusAudioSpecificConfig(private val sampleRate: Int, private val channels:
   val size = 19
 
   fun write(buffer: ByteArray, offset: Int) {
-    buffer[offset] = "O".toByte()
-    buffer[offset + 1] = "p".toByte()
-    buffer[offset + 2] = "u".toByte()
-    buffer[offset + 3] = "s".toByte()
-    buffer[offset + 4] = "H".toByte()
-    buffer[offset + 5] = "e".toByte()
-    buffer[offset + 6] = "a".toByte()
-    buffer[offset + 7] = "d".toByte()
+    buffer[offset] = 'O'.code.toByte()
+    buffer[offset + 1] = 'p'.code.toByte()
+    buffer[offset + 2] = 'u'.code.toByte()
+    buffer[offset + 3] = 's'.code.toByte()
+    buffer[offset + 4] = 'H'.code.toByte()
+    buffer[offset + 5] = 'e'.code.toByte()
+    buffer[offset + 6] = 'a'.code.toByte()
+    buffer[offset + 7] = 'd'.code.toByte()
     buffer[offset + 8] = 0x01 //version 1
     buffer[offset + 9] = channels.toByte()
     val preSkip = 3840 //this is the recommended value by the RFC

rtmp/src/main/java/com/pedro/rtmp/flv/audio/packet/OpusPacket.kt

@@ -50,7 +50,7 @@ class OpusPacket: BasePacket() {
     val ts = mediaFrame.info.timestamp / 1000
 
     //header is 5 bytes length:
-    //mark first byte as extended header
+    //mark first byte as extended header and packet type
     //4 bytes codec type
     val codec = AudioFormat.OPUS.value // { "O", "p", "u", "s" }
     header[1] = (codec shr 24).toByte()