Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@ class RtmpStreamClient(
rtmpClient.setCustomAmfObject(amfObject)
}

fun setCustomMetadata(metadata: Map<String, Any>) {
rtmpClient.setCustomMetadata(metadata)
}

/**
* Should notify onConnectionFailed if read packet from the server failed
*/
Expand Down
2 changes: 1 addition & 1 deletion rtmp/src/main/java/com/pedro/rtmp/amf/v0/AmfObject.kt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ open class AmfObject(private val properties: LinkedHashMap<AmfString, AmfData> =
open fun setProperty(name: String, data: AmfData) = putProperty(name, data)

open fun setProperty(name: String, data: Any) {
val newValue= when (data) {
val newValue = when (data) {
is String -> AmfString(data)
is Int -> AmfNumber(data.toDouble())
is Long -> AmfNumber(data.toDouble())
Expand Down
2 changes: 1 addition & 1 deletion rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Integer.kt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import java.io.OutputStream
/**
* Created by pedro on 29/04/21.
*/
class Amf3Integer: Amf3Data() {
class Amf3Integer(private val value: Int = 0): Amf3Data() {

override fun readBody(input: InputStream) {
TODO("Not yet implemented")
Expand Down
57 changes: 26 additions & 31 deletions rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Object.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package com.pedro.rtmp.amf.v3

import com.pedro.rtmp.amf.v0.AmfNull
import java.io.InputStream
import java.io.OutputStream

Expand All @@ -35,43 +36,37 @@ open class Amf3Object(private val properties: HashMap<Amf3String, Amf3Data> = Li
return null
}

open fun setProperty(name: String, data: String) {
val key = Amf3String(name)
val value = Amf3String(data)
properties[key] = value
bodySize += key.getSize()
bodySize += value.getSize() + 1
}
open fun setProperty(name: String, data: String) = putProperty(name, Amf3String(data))

open fun setProperty(name: String, data: Boolean) {
val key = Amf3String(name)
val value = if (data) Amf3True() else Amf3False()
properties[key] = value
bodySize += key.getSize()
bodySize += value.getSize() + 1
}
open fun setProperty(name: String, data: Boolean) = putProperty(name, if (data) Amf3True() else Amf3False())

open fun setProperty(name: String, data: Amf3Data) {
val key = Amf3String(name)
properties[key] = data
bodySize += key.getSize()
bodySize += data.getSize() + 1
}
open fun setProperty(name: String, data: Amf3Data) = putProperty(name, data)

open fun setProperty(name: String) {
val key = Amf3String(name)
val value = Amf3Null()
properties[key] = value
bodySize += key.getSize()
bodySize += value.getSize() + 1
open fun setProperty(name: String) = putProperty(name, Amf3Null())

open fun setProperty(name: String, data: Double) = putProperty(name, Amf3Double(data))

open fun setProperty(name: String, data: Any) {
val newValue = when (data) {
is String -> Amf3String(data)
is Int -> Amf3Integer(data)
is Double -> Amf3Double(data)
is Float -> Amf3Double(data.toDouble())
is Boolean -> if (data) Amf3True() else Amf3False()
is Amf3Data -> data
else -> throw IllegalArgumentException("Unsupported value type: ${data::class.java.name}")
}
putProperty(name, newValue)
}

open fun setProperty(name: String, data: Double) {
private fun putProperty(name: String, value: Amf3Data) {
val key = Amf3String(name)
val value = Amf3Double(data)
properties[key] = value
bodySize += key.getSize()
bodySize += value.getSize() + 1
val previous = properties.put(key, value)
bodySize += if (previous != null) {
value.getSize() - previous.getSize()
} else {
key.getSize() + value.getSize() + 1
}
}


Expand Down
1 change: 1 addition & 0 deletions rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManager.kt
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ abstract class CommandsManager {
var audioDisabled = false
var videoDisabled = false
var customAmfObject: Map<String, Any> = emptyMap()
var customMetadata: Map<String, Any> = emptyMap()
private var bytesRead = 0
private var lastAcknowledgementSequence = 0

Expand Down
3 changes: 3 additions & 0 deletions rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManagerAmf0.kt
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ class CommandsManagerAmf0: CommandsManager() {
amfEcmaArray.setProperty("stereo", isStereo)
}
amfEcmaArray.setProperty("filesize", 0.0)
customMetadata.forEach { (key, value) ->
amfEcmaArray.setProperty(key, value)
}
metadata.addData(amfEcmaArray)

metadata.writeHeader(socket)
Expand Down
3 changes: 3 additions & 0 deletions rtmp/src/main/java/com/pedro/rtmp/rtmp/CommandsManagerAmf3.kt
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,9 @@ class CommandsManagerAmf3: CommandsManager() {
amfEcmaArray.setProperty("stereo", isStereo)
}
amfEcmaArray.setProperty("filesize", 0.0)
customMetadata.forEach { (key, value) ->
amfEcmaArray.setProperty(key, value)
}
metadata.addData(amfEcmaArray)

metadata.writeHeader(socket)
Expand Down
4 changes: 4 additions & 0 deletions rtmp/src/main/java/com/pedro/rtmp/rtmp/RtmpClient.kt
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@ class RtmpClient(private val connectChecker: ConnectChecker) {
commandsManager.customAmfObject = amfObject
}

fun setCustomMetadata(metadata: Map<String, Any>) {
commandsManager.customMetadata = metadata
}

fun setAuthorization(user: String?, password: String?) {
commandsManager.setAuth(user, password)
}
Expand Down
Loading