zishuo/rtsp-simple-server
1
0
Fork 0
mirror of https://github.com/aler9/rtsp-simple-server synced 2025-11-03 09:51:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtmp: move implementation to gortmplib (#4968)

Browse Source
This commit is contained in:
Alessandro Ros
2025-09-13 11:50:36 +02:00
committed by GitHub
parent e8b746b6d5
commit 1b8897d30d
164 changed files with 61 additions and 13218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/protocols/rtmp/to_stream.go
View File

@@ -4,6 +4,8 @@ import (
"errors"
"time"
"github.com/bluenviron/gortmplib"
"github.com/bluenviron/gortmplib/pkg/message"
"github.com/bluenviron/gortsplib/v4/pkg/description"
"github.com/bluenviron/gortsplib/v4/pkg/format"
"github.com/bluenviron/mediamtx/internal/stream"
@@ -24,8 +26,12 @@ func durationToTimestamp(d time.Duration, clockRate int) int64 {
return multiplyAndDivide(int64(d), int64(clockRate), int64(time.Second))
}
func fourCCToString(c message.FourCC) string {
return string([]byte{byte(c >> 24), byte(c >> 16), byte(c >> 8), byte(c)})
}
// ToStream maps a RTMP stream to a MediaMTX stream.
func ToStream(r *Reader, stream **stream.Stream) ([]*description.Media, error) {
func ToStream(r *gortmplib.Reader, stream **stream.Stream) ([]*description.Media, error) {
var medias []*description.Media
for _, track := range r.Tracks() {
@@ -73,7 +79,7 @@ func ToStream(r *Reader, stream **stream.Stream) ([]*description.Media, error) {
}
medias = append(medias, medi)
r.OnDataH265(ttrack, func(pts time.Duration, au [][]byte) {
r.OnDataH265(ttrack, func(pts time.Duration, _ time.Duration, au [][]byte) {
(*stream).WriteUnit(medi, ctrack, &unit.H265{
Base: unit.Base{
NTP: time.Now(),
@@ -90,7 +96,7 @@ func ToStream(r *Reader, stream **stream.Stream) ([]*description.Media, error) {
}
medias = append(medias, medi)
r.OnDataH264(ttrack, func(pts time.Duration, au [][]byte) {
r.OnDataH264(ttrack, func(pts time.Duration, _ time.Duration, au [][]byte) {
(*stream).WriteUnit(medi, ctrack, &unit.H264{
Base: unit.Base{
NTP: time.Now(),