pimhwang
/
mediamtx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

rtmp server: change value of MessageStreamID of outgoing messages

pull/1128/head
aler9 3 years ago
parent
820ba067f2
commit
e255d004e3
7 changed files with 36 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      internal/core/rtmp_conn.go
  2. 6
      internal/core/rtmp_server_test.go
  3. 2
      internal/core/rtmp_source_test.go
  4. 4
      internal/rtmp/conn.go
  5. 32
      internal/rtmp/conn_test.go
  6. 5
      internal/rtmp/message/msg_audio.go
  7. 5
      internal/rtmp/message/msg_video.go

8
internal/core/rtmp_conn.go
Unescape View File

@ -410,8 +410,8 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error { @@ -410,8 +410,8 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error {
c.nconn.SetWriteDeadline(time.Now().Add(time.Duration(c.writeTimeout)))
err = c.conn.WriteMessage(&message.MsgVideo{
ChunkStreamID: 6,
MessageStreamID: 1,
ChunkStreamID: message.MsgVideoChunkStreamID,
MessageStreamID: 0x1000000,
IsKeyFrame: idrPresent,
H264Type: flvio.AVC_NALU,
Payload: avcc,
@ -442,8 +442,8 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error { @@ -442,8 +442,8 @@ func (c *rtmpConn) runRead(ctx context.Context, u *url.URL) error {
for i, au := range aus {
c.nconn.SetWriteDeadline(time.Now().Add(time.Duration(c.writeTimeout)))
err := c.conn.WriteMessage(&message.MsgAudio{
ChunkStreamID: 4,
MessageStreamID: 1,
ChunkStreamID: message.MsgAudioChunkStreamID,
MessageStreamID: 0x1000000,
Rate: flvio.SOUND_44Khz,
Depth: flvio.SOUND_16BIT,
Channels: flvio.SOUND_STEREO,

6
internal/core/rtmp_server_test.go
Unescape View File

@ -112,7 +112,7 @@ func TestRTMPServerPublishRead(t *testing.T) { @@ -112,7 +112,7 @@ func TestRTMPServerPublishRead(t *testing.T) {
require.Equal(t, audioTrack, audioTrack2)
err = conn1.WriteMessage(&message.MsgVideo{
ChunkStreamID: 6,
ChunkStreamID: message.MsgVideoChunkStreamID,
MessageStreamID: 0x1000000,
IsKeyFrame: true,
H264Type: flvio.AVC_NALU,
@ -123,8 +123,8 @@ func TestRTMPServerPublishRead(t *testing.T) { @@ -123,8 +123,8 @@ func TestRTMPServerPublishRead(t *testing.T) {
msg1, err := conn2.ReadMessage()
require.NoError(t, err)
require.Equal(t, &message.MsgVideo{
ChunkStreamID: 6,
MessageStreamID: 1,
ChunkStreamID: message.MsgVideoChunkStreamID,
MessageStreamID: 0x1000000,
IsKeyFrame: true,
H264Type: flvio.AVC_NALU,
Payload: []byte{

2
internal/core/rtmp_source_test.go
Unescape View File

@ -85,7 +85,7 @@ func TestRTMPSource(t *testing.T) { @@ -85,7 +85,7 @@ func TestRTMPSource(t *testing.T) {
<-connected
err = conn.WriteMessage(&message.MsgVideo{
ChunkStreamID: 6,
ChunkStreamID: message.MsgVideoChunkStreamID,
MessageStreamID: 0x1000000,
IsKeyFrame: true,
H264Type: flvio.AVC_NALU,

4
internal/rtmp/conn.go
Unescape View File

@ -910,7 +910,7 @@ func (c *Conn) WriteTracks(videoTrack *gortsplib.TrackH264, audioTrack *gortspli @@ -910,7 +910,7 @@ func (c *Conn) WriteTracks(videoTrack *gortsplib.TrackH264, audioTrack *gortspli
}.Marshal()
err = c.WriteMessage(&message.MsgVideo{
ChunkStreamID: 6,
ChunkStreamID: message.MsgVideoChunkStreamID,
MessageStreamID: 0x1000000,
IsKeyFrame: true,
H264Type: flvio.AVC_SEQHDR,
@ -928,7 +928,7 @@ func (c *Conn) WriteTracks(videoTrack *gortsplib.TrackH264, audioTrack *gortspli @@ -928,7 +928,7 @@ func (c *Conn) WriteTracks(videoTrack *gortsplib.TrackH264, audioTrack *gortspli
}
err = c.WriteMessage(&message.MsgAudio{
ChunkStreamID: 4,
ChunkStreamID: message.MsgAudioChunkStreamID,
MessageStreamID: 0x1000000,
Rate: flvio.SOUND_44Khz,
Depth: flvio.SOUND_16BIT,

32
internal/rtmp/conn_test.go
Unescape View File

@ -786,8 +786,8 @@ func TestReadTracks(t *testing.T) { @@ -786,8 +786,8 @@ func TestReadTracks(t *testing.T) {
PPS: pps,
}.Marshal()
err = mrw.Write(&message.MsgVideo{
ChunkStreamID: 6,
MessageStreamID: 1,
ChunkStreamID: message.MsgVideoChunkStreamID,
MessageStreamID: 0x1000000,
IsKeyFrame: true,
H264Type: flvio.AVC_SEQHDR,
Payload: buf,
@ -802,8 +802,8 @@ func TestReadTracks(t *testing.T) { @@ -802,8 +802,8 @@ func TestReadTracks(t *testing.T) {
}.Marshal()
require.NoError(t, err)
err = mrw.Write(&message.MsgAudio{
ChunkStreamID: 4,
MessageStreamID: 1,
ChunkStreamID: message.MsgAudioChunkStreamID,
MessageStreamID: 0x1000000,
Rate: flvio.SOUND_44Khz,
Depth: flvio.SOUND_16BIT,
Channels: flvio.SOUND_STEREO,
@ -848,8 +848,8 @@ func TestReadTracks(t *testing.T) { @@ -848,8 +848,8 @@ func TestReadTracks(t *testing.T) {
PPS: pps,
}.Marshal()
err = mrw.Write(&message.MsgVideo{
ChunkStreamID: 6,
MessageStreamID: 1,
ChunkStreamID: message.MsgVideoChunkStreamID,
MessageStreamID: 0x1000000,
IsKeyFrame: true,
H264Type: flvio.AVC_SEQHDR,
Payload: buf,
@ -888,8 +888,8 @@ func TestReadTracks(t *testing.T) { @@ -888,8 +888,8 @@ func TestReadTracks(t *testing.T) {
PPS: pps,
}.Marshal()
err = mrw.Write(&message.MsgVideo{
ChunkStreamID: 6,
MessageStreamID: 1,
ChunkStreamID: message.MsgVideoChunkStreamID,
MessageStreamID: 0x1000000,
IsKeyFrame: true,
H264Type: flvio.AVC_SEQHDR,
Payload: buf,
@ -904,8 +904,8 @@ func TestReadTracks(t *testing.T) { @@ -904,8 +904,8 @@ func TestReadTracks(t *testing.T) {
}.Marshal()
require.NoError(t, err)
err = mrw.Write(&message.MsgAudio{
ChunkStreamID: 4,
MessageStreamID: 1,
ChunkStreamID: message.MsgAudioChunkStreamID,
MessageStreamID: 0x1000000,
Rate: flvio.SOUND_44Khz,
Depth: flvio.SOUND_16BIT,
Channels: flvio.SOUND_STEREO,
@ -921,8 +921,8 @@ func TestReadTracks(t *testing.T) { @@ -921,8 +921,8 @@ func TestReadTracks(t *testing.T) {
PPS: pps,
}.Marshal()
err = mrw.Write(&message.MsgVideo{
ChunkStreamID: 6,
MessageStreamID: 1,
ChunkStreamID: message.MsgVideoChunkStreamID,
MessageStreamID: 0x1000000,
IsKeyFrame: true,
H264Type: flvio.AVC_SEQHDR,
Payload: buf,
@ -937,8 +937,8 @@ func TestReadTracks(t *testing.T) { @@ -937,8 +937,8 @@ func TestReadTracks(t *testing.T) {
}.Marshal()
require.NoError(t, err)
err = mrw.Write(&message.MsgAudio{
ChunkStreamID: 4,
MessageStreamID: 1,
ChunkStreamID: message.MsgAudioChunkStreamID,
MessageStreamID: 0x1000000,
Rate: flvio.SOUND_44Khz,
Depth: flvio.SOUND_16BIT,
Channels: flvio.SOUND_STEREO,
@ -1238,7 +1238,7 @@ func TestWriteTracks(t *testing.T) { @@ -1238,7 +1238,7 @@ func TestWriteTracks(t *testing.T) {
msg, err = mrw.Read()
require.NoError(t, err)
require.Equal(t, &message.MsgVideo{
ChunkStreamID: 6,
ChunkStreamID: message.MsgVideoChunkStreamID,
MessageStreamID: 0x1000000,
IsKeyFrame: true,
H264Type: flvio.AVC_SEQHDR,
@ -1256,7 +1256,7 @@ func TestWriteTracks(t *testing.T) { @@ -1256,7 +1256,7 @@ func TestWriteTracks(t *testing.T) {
msg, err = mrw.Read()
require.NoError(t, err)
require.Equal(t, &message.MsgAudio{
ChunkStreamID: 4,
ChunkStreamID: message.MsgAudioChunkStreamID,
MessageStreamID: 0x1000000,
Rate: flvio.SOUND_44Khz,
Depth: flvio.SOUND_16BIT,

5
internal/rtmp/message/msg_audio.go
Unescape View File

@ -10,6 +10,11 @@ import ( @@ -10,6 +10,11 @@ import (
"github.com/aler9/rtsp-simple-server/internal/rtmp/rawmessage"
)
const (
// this is the chunk stream ID that is usually used to send MsgAudio{}
MsgAudioChunkStreamID = 6
)
// MsgAudio is an audio message.
type MsgAudio struct {
ChunkStreamID byte

5
internal/rtmp/message/msg_video.go
Unescape View File

@ -10,6 +10,11 @@ import ( @@ -10,6 +10,11 @@ import (
"github.com/aler9/rtsp-simple-server/internal/rtmp/rawmessage"
)
const (
// this is the chunk stream ID that is usually used to send MsgVideo{}
MsgVideoChunkStreamID = 6
)
// MsgVideo is a video message.
type MsgVideo struct {
ChunkStreamID byte

Write Preview
Loading…
Cancel
Save