Skip to content

Remove amf3 #2148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedroSG94 merged 4 commits into from
Jul 20, 2026
Merged

Remove amf3 #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6804d5a
remove related code to amf3
pedroSG94 Jul 20, 2026
3fb8ce8
remove unnecessary code init
pedroSG94 Jul 20, 2026
c302feb
remove unnecessary classes
pedroSG94 Jul 20, 2026
4c3155e
add sharedobject parser and refactor command
pedroSG94 Jul 20, 2026
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
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ dependencies {
- [x] RTMPS (under TLS)
- [x] RTMPT and RTMPTS (tunneled and tunneled under TLS)
- [x] AMF0
- [ ] AMF3

### RTSP:

Expand Down
4 changes: 4 additions & 0 deletions common/src/main/java/com/pedro/common/Extensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,10 @@ fun ByteArray.toUInt32(): Int {
return this[0].toInt() and 0xff shl 24 or (this[1].toInt() and 0xff shl 16) or (this[2].toInt() and 0xff shl 8) or (this[3].toInt() and 0xff)
}

fun ByteArray.toUInt64(): Long {
return (this[0].toLong() and 0xff shl 56) or (this[1].toLong() and 0xff shl 48) or (this[2].toLong() and 0xff shl 40) or (this[3].toLong() and 0xff shl 32) or (this[4].toLong() and 0xff shl 24) or (this[5].toLong() and 0xff shl 16) or (this[6].toLong() and 0xff shl 8) or (this[7].toLong() and 0xff)
}

fun ByteArray.toUInt32LittleEndian(): Int {
return Integer.reverseBytes(toUInt32())
}
Expand Down
4 changes: 2 additions & 2 deletions library/src/main/java/com/pedro/library/util/FlvMuxerRecordController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import com.pedro.encoder.video.VideoEncoderHelper
import com.pedro.library.base.recording.AsyncBaseRecordController
import com.pedro.library.base.recording.RecordController
import com.pedro.library.base.recording.RecordController.RecordTracks
import com.pedro.rtmp.amf.v0.AmfEcmaArray
import com.pedro.rtmp.amf.v0.AmfString
import com.pedro.rtmp.amf.AmfEcmaArray
import com.pedro.rtmp.amf.AmfString
import com.pedro.rtmp.flv.BasePacket
import com.pedro.rtmp.flv.FlvPacket
import com.pedro.rtmp.flv.FlvType
Expand Down
2 changes: 1 addition & 1 deletion .../java/com/pedro/rtmp/amf/v0/AmfBoolean.kt → ...ain/java/com/pedro/rtmp/amf/AmfBoolean.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import java.io.IOException
import java.io.InputStream
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/pedro/rtmp/amf/v0/AmfData.kt → ...c/main/java/com/pedro/rtmp/amf/AmfData.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import java.io.IOException
import java.io.InputStream
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/com/pedro/rtmp/amf/v0/AmfDate.kt → ...c/main/java/com/pedro/rtmp/amf/AmfDate.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import com.pedro.common.TimeUtils
import com.pedro.common.readUntil
Expand All @@ -36,7 +36,7 @@ class AmfDate(var date: Double = TimeUtils.getCurrentTimeMillis().toDouble()): A
val bytes = ByteArray(getSize() - 2)
input.readUntil(bytes)
val value = ByteBuffer.wrap(bytes).long
date = Double.Companion.fromBits(value)
date = Double.fromBits(value)
val timeZone = byteArrayOf(0x00, 0x00)
input.readUntil(timeZone)
}
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/pedro/rtmp/amf/v0/AmfEcmaArray.kt → ...n/java/com/pedro/rtmp/amf/AmfEcmaArray.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import com.pedro.common.readUInt32
import com.pedro.common.writeUInt32
Expand Down
2 changes: 1 addition & 1 deletion ...va/com/pedro/rtmp/amf/v0/AmfLongString.kt → .../java/com/pedro/rtmp/amf/AmfLongString.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import com.pedro.common.readUInt32
import com.pedro.common.readUntil
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/pedro/rtmp/amf/v0/AmfNull.kt → ...c/main/java/com/pedro/rtmp/amf/AmfNull.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import java.io.IOException
import java.io.InputStream
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/pedro/rtmp/amf/v0/AmfNumber.kt → ...main/java/com/pedro/rtmp/amf/AmfNumber.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import com.pedro.common.readUntil
import java.io.IOException
Expand All @@ -34,7 +34,7 @@ class AmfNumber(var value: Double = 0.0): AmfData() {
val bytes = ByteArray(getSize())
input.readUntil(bytes)
val value = ByteBuffer.wrap(bytes).long
this.value = Double.Companion.fromBits(value)
this.value = Double.fromBits(value)
}

@Throws(IOException::class)
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/pedro/rtmp/amf/v0/AmfObject.kt → ...main/java/com/pedro/rtmp/amf/AmfObject.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import java.io.BufferedInputStream
import java.io.IOException
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/pedro/rtmp/amf/v0/AmfObjectEnd.kt → ...n/java/com/pedro/rtmp/amf/AmfObjectEnd.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import com.pedro.common.readUntil
import java.io.IOException
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/pedro/rtmp/amf/v0/AmfStrictArray.kt → ...java/com/pedro/rtmp/amf/AmfStrictArray.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import com.pedro.common.readUInt32
import com.pedro.common.writeUInt32
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/pedro/rtmp/amf/v0/AmfString.kt → ...main/java/com/pedro/rtmp/amf/AmfString.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import com.pedro.common.readUInt16
import com.pedro.common.readUntil
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/com/pedro/rtmp/amf/v0/AmfType.kt → ...c/main/java/com/pedro/rtmp/amf/AmfType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

/**
* Created by pedro on 20/04/21.
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/pedro/rtmp/amf/v0/AmfUndefined.kt → ...n/java/com/pedro/rtmp/amf/AmfUndefined.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import java.io.IOException
import java.io.InputStream
Expand Down
2 changes: 1 addition & 1 deletion ...a/com/pedro/rtmp/amf/v0/AmfUnsupported.kt → ...java/com/pedro/rtmp/amf/AmfUnsupported.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import java.io.IOException
import java.io.InputStream
Expand Down
24 changes: 0 additions & 24 deletions rtmp/src/main/java/com/pedro/rtmp/amf/AmfVersion.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...a/com/pedro/rtmp/amf/v0/AmfXmlDocument.kt → ...java/com/pedro/rtmp/amf/AmfXmlDocument.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

package com.pedro.rtmp.amf.v0
package com.pedro.rtmp.amf

import org.w3c.dom.Document
import org.xml.sax.InputSource
Expand Down
40 changes: 0 additions & 40 deletions rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Array.kt
View file
Open in desktop

This file was deleted.

77 changes: 0 additions & 77 deletions rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Data.kt
View file
Open in desktop

This file was deleted.

40 changes: 0 additions & 40 deletions rtmp/src/main/java/com/pedro/rtmp/amf/v3/Amf3Dictionary.kt
View file
Open in desktop

This file was deleted.

Loading
Loading