Browse Source

RTMP client: do not print errors in case of fragmented AAC frames

pull/344/head v0.15.4
aler9 4 years ago
parent
commit
7fab9e5749
  1. 5
      internal/clientrtmp/client.go

5
internal/clientrtmp/client.go

@ -325,8 +325,6 @@ func (c *Client) runRead() {
// send them together. // send them together.
marker := (pair.buf[1] >> 7 & 0x1) > 0 marker := (pair.buf[1] >> 7 & 0x1) > 0
if marker { if marker {
c.conn.NetConn().SetWriteDeadline(time.Now().Add(c.writeTimeout))
dts := time.Since(videoStartDTS) dts := time.Since(videoStartDTS)
// avoid duplicate DTS // avoid duplicate DTS
@ -336,6 +334,7 @@ func (c *Client) runRead() {
} }
videoLastDTS = dts videoLastDTS = dts
c.conn.NetConn().SetWriteDeadline(time.Now().Add(c.writeTimeout))
err := c.conn.WriteH264(videoBuf, dts) err := c.conn.WriteH264(videoBuf, dts)
if err != nil { if err != nil {
return err return err
@ -346,7 +345,9 @@ func (c *Client) runRead() {
} else if audioTrack != nil && pair.trackID == audioTrack.ID { } else if audioTrack != nil && pair.trackID == audioTrack.ID {
aus, pts, err := aacDecoder.Decode(pair.buf) aus, pts, err := aacDecoder.Decode(pair.buf)
if err != nil { if err != nil {
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)
}
continue continue
} }

Loading…
Cancel
Save