|
|
|
@ -16,6 +16,7 @@ import ( |
|
|
|
"github.com/aler9/gortsplib/pkg/rtpaac" |
|
|
|
"github.com/aler9/gortsplib/pkg/rtpaac" |
|
|
|
"github.com/aler9/gortsplib/pkg/rtph264" |
|
|
|
"github.com/aler9/gortsplib/pkg/rtph264" |
|
|
|
"github.com/notedit/rtmp/av" |
|
|
|
"github.com/notedit/rtmp/av" |
|
|
|
|
|
|
|
"github.com/pion/rtcp" |
|
|
|
"github.com/pion/rtp" |
|
|
|
"github.com/pion/rtp" |
|
|
|
|
|
|
|
|
|
|
|
"github.com/aler9/rtsp-simple-server/internal/conf" |
|
|
|
"github.com/aler9/rtsp-simple-server/internal/conf" |
|
|
|
@ -39,7 +40,7 @@ func pathNameAndQuery(inURL *url.URL) (string, url.Values, string) { |
|
|
|
|
|
|
|
|
|
|
|
type rtmpConnTrackIDPayloadPair struct { |
|
|
|
type rtmpConnTrackIDPayloadPair struct { |
|
|
|
trackID int |
|
|
|
trackID int |
|
|
|
buf []byte |
|
|
|
packet *rtp.Packet |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
type rtmpConnPathManager interface { |
|
|
|
type rtmpConnPathManager interface { |
|
|
|
@ -330,14 +331,7 @@ func (c *rtmpConn) runRead(ctx context.Context) error { |
|
|
|
pair := data.(rtmpConnTrackIDPayloadPair) |
|
|
|
pair := data.(rtmpConnTrackIDPayloadPair) |
|
|
|
|
|
|
|
|
|
|
|
if videoTrack != nil && pair.trackID == videoTrackID { |
|
|
|
if videoTrack != nil && pair.trackID == videoTrackID { |
|
|
|
var pkt rtp.Packet |
|
|
|
nalus, pts, err := h264Decoder.DecodeUntilMarker(pair.packet) |
|
|
|
err := pkt.Unmarshal(pair.buf) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
c.log(logger.Warn, "unable to decode RTP packet: %v", err) |
|
|
|
|
|
|
|
continue |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
nalus, pts, err := h264Decoder.DecodeUntilMarker(&pkt) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
if err != rtph264.ErrMorePacketsNeeded && err != rtph264.ErrNonStartingPacketAndNoPrevious { |
|
|
|
if err != rtph264.ErrMorePacketsNeeded && err != rtph264.ErrNonStartingPacketAndNoPrevious { |
|
|
|
c.log(logger.Warn, "unable to decode video track: %v", err) |
|
|
|
c.log(logger.Warn, "unable to decode video track: %v", err) |
|
|
|
@ -398,14 +392,7 @@ func (c *rtmpConn) runRead(ctx context.Context) error { |
|
|
|
return err |
|
|
|
return err |
|
|
|
} |
|
|
|
} |
|
|
|
} else if audioTrack != nil && pair.trackID == audioTrackID { |
|
|
|
} else if audioTrack != nil && pair.trackID == audioTrackID { |
|
|
|
var pkt rtp.Packet |
|
|
|
aus, pts, err := aacDecoder.Decode(pair.packet) |
|
|
|
err := pkt.Unmarshal(pair.buf) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
c.log(logger.Warn, "unable to decode RTP packet: %v", err) |
|
|
|
|
|
|
|
continue |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
aus, pts, err := aacDecoder.Decode(&pkt) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
if err != rtpaac.ErrMorePacketsNeeded { |
|
|
|
if err != rtpaac.ErrMorePacketsNeeded { |
|
|
|
c.log(logger.Warn, "unable to decode audio track: %v", err) |
|
|
|
c.log(logger.Warn, "unable to decode audio track: %v", err) |
|
|
|
@ -510,9 +497,9 @@ func (c *rtmpConn) runPublish(ctx context.Context) error { |
|
|
|
rtcpSenders := rtcpsenderset.New(tracks, rres.stream.onPacketRTCP) |
|
|
|
rtcpSenders := rtcpsenderset.New(tracks, rres.stream.onPacketRTCP) |
|
|
|
defer rtcpSenders.Close() |
|
|
|
defer rtcpSenders.Close() |
|
|
|
|
|
|
|
|
|
|
|
onPacketRTP := func(trackID int, payload []byte) { |
|
|
|
onPacketRTP := func(trackID int, pkt *rtp.Packet) { |
|
|
|
rtcpSenders.OnPacketRTP(trackID, payload) |
|
|
|
rtcpSenders.OnPacketRTP(trackID, pkt) |
|
|
|
rres.stream.onPacketRTP(trackID, payload) |
|
|
|
rres.stream.onPacketRTP(trackID, pkt) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
for { |
|
|
|
for { |
|
|
|
@ -555,17 +542,8 @@ func (c *rtmpConn) runPublish(ctx context.Context) error { |
|
|
|
return fmt.Errorf("error while encoding H264: %v", err) |
|
|
|
return fmt.Errorf("error while encoding H264: %v", err) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
bytss := make([][]byte, len(pkts)) |
|
|
|
for _, pkt := range pkts { |
|
|
|
for i, pkt := range pkts { |
|
|
|
onPacketRTP(videoTrackID, pkt) |
|
|
|
byts, err := pkt.Marshal() |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return fmt.Errorf("error while encoding H264: %v", err) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
bytss[i] = byts |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for _, byts := range bytss { |
|
|
|
|
|
|
|
onPacketRTP(videoTrackID, byts) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
case av.AAC: |
|
|
|
case av.AAC: |
|
|
|
@ -578,17 +556,8 @@ func (c *rtmpConn) runPublish(ctx context.Context) error { |
|
|
|
return fmt.Errorf("error while encoding AAC: %v", err) |
|
|
|
return fmt.Errorf("error while encoding AAC: %v", err) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
bytss := make([][]byte, len(pkts)) |
|
|
|
for _, pkt := range pkts { |
|
|
|
for i, pkt := range pkts { |
|
|
|
onPacketRTP(audioTrackID, pkt) |
|
|
|
byts, err := pkt.Marshal() |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
|
|
|
|
return fmt.Errorf("error while encoding AAC: %v", err) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
bytss[i] = byts |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
for _, byts := range bytss { |
|
|
|
|
|
|
|
onPacketRTP(audioTrackID, byts) |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
@ -646,12 +615,12 @@ func (c *rtmpConn) onReaderAccepted() { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// onReaderPacketRTP implements reader.
|
|
|
|
// onReaderPacketRTP implements reader.
|
|
|
|
func (c *rtmpConn) onReaderPacketRTP(trackID int, payload []byte) { |
|
|
|
func (c *rtmpConn) onReaderPacketRTP(trackID int, pkt *rtp.Packet) { |
|
|
|
c.ringBuffer.Push(rtmpConnTrackIDPayloadPair{trackID, payload}) |
|
|
|
c.ringBuffer.Push(rtmpConnTrackIDPayloadPair{trackID, pkt}) |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// onReaderPacketRTCP implements reader.
|
|
|
|
// onReaderPacketRTCP implements reader.
|
|
|
|
func (c *rtmpConn) onReaderPacketRTCP(trackID int, payload []byte) { |
|
|
|
func (c *rtmpConn) onReaderPacketRTCP(trackID int, pkt rtcp.Packet) { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// onReaderAPIDescribe implements reader.
|
|
|
|
// onReaderAPIDescribe implements reader.
|
|
|
|
|
aler9
5 years ago
committed by
Alessandro Ros