-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rtmp: support additional Enhanced-RTMP features (#3685)
new features: * Opus and AC-3 streaming * multitrack streaming, compatible with OBS multitrack video and OBS VOD audio track
- Loading branch information
Showing
44 changed files
with
2,423 additions
and
972 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 0 additions & 26 deletions
26
internal/protocols/rtmp/message/extended_mpeg2ts_sequence_start.go
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
61 changes: 61 additions & 0 deletions
61
internal/protocols/rtmp/message/msg_audio_ex_coded_frames.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
package message | ||
|
||
import ( | ||
"fmt" | ||
"time" | ||
|
||
"github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage" | ||
) | ||
|
||
// AudioExCodedFrames is a CodedFrames extended message. | ||
type AudioExCodedFrames struct { | ||
ChunkStreamID byte | ||
DTS time.Duration | ||
MessageStreamID uint32 | ||
FourCC FourCC | ||
Payload []byte | ||
} | ||
|
||
func (m *AudioExCodedFrames) unmarshal(raw *rawmessage.Message) error { | ||
if len(raw.Body) < 5 { | ||
return fmt.Errorf("not enough bytes") | ||
} | ||
|
||
m.ChunkStreamID = raw.ChunkStreamID | ||
m.DTS = raw.Timestamp | ||
m.MessageStreamID = raw.MessageStreamID | ||
|
||
m.FourCC = FourCC(raw.Body[1])<<24 | FourCC(raw.Body[2])<<16 | FourCC(raw.Body[3])<<8 | FourCC(raw.Body[4]) | ||
switch m.FourCC { | ||
case FourCCOpus, FourCCAC3, FourCCMP4A: | ||
default: | ||
return fmt.Errorf("unsupported fourCC: %v", m.FourCC) | ||
} | ||
|
||
m.Payload = raw.Body[5:] | ||
|
||
return nil | ||
} | ||
|
||
func (m AudioExCodedFrames) marshalBodySize() int { | ||
return 5 + len(m.Payload) | ||
} | ||
|
||
func (m AudioExCodedFrames) marshal() (*rawmessage.Message, error) { | ||
body := make([]byte, m.marshalBodySize()) | ||
|
||
body[0] = (9 << 4) | byte(AudioExTypeCodedFrames) | ||
body[1] = uint8(m.FourCC >> 24) | ||
body[2] = uint8(m.FourCC >> 16) | ||
body[3] = uint8(m.FourCC >> 8) | ||
body[4] = uint8(m.FourCC) | ||
copy(body[5:], m.Payload) | ||
|
||
return &rawmessage.Message{ | ||
ChunkStreamID: m.ChunkStreamID, | ||
Timestamp: m.DTS, | ||
Type: uint8(TypeAudio), | ||
MessageStreamID: m.MessageStreamID, | ||
Body: body, | ||
}, nil | ||
} |
Oops, something went wrong.