RepoMirrors/mediamtx
1
0
Fork 0
mirror of https://github.com/bluenviron/mediamtx synced 2024-12-14 18:54:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

hls, rtmp: fix video/audio sync

Browse Source
This commit is contained in:
aler9 2022-04-10 17:38:58 +02:00
parent f620484757
commit ce42c53a03
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
internal/core/hls_muxer.go
View File

@ -327,6 +327,8 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{})
writerDone := make(chan error)
go func() {
writerDone <- func() error {
var videoInitialPTS *time.Duration
for {
item, ok := m.ringBuffer.Pull()
if !ok {
@ -339,7 +341,16 @@ func (m *hlsMuxer) runInner(innerCtx context.Context, innerReady chan struct{})
continue
}
err = m.muxer.WriteH264(data.h264PTS, data.h264NALUs)
// video is decoded in another routine,
// while audio is decoded in this routine:
// we have to sync their PTS.
if videoInitialPTS == nil {
v := data.h264PTS
videoInitialPTS = &v
}
pts := data.h264PTS - *videoInitialPTS
err = m.muxer.WriteH264(pts, data.h264NALUs)
if err != nil {
m.log(logger.Warn, "unable to write segment: %v", err)
continue

20
internal/core/rtmp_conn.go
View File

@ -321,9 +321,10 @@ func (c *rtmpConn) runRead(ctx context.Context) error {
// disable read deadline
c.conn.SetReadDeadline(time.Time{})
var videoStartPTS time.Duration
var videoDTSEst *h264.DTSEstimator
var videoInitialPTS *time.Duration
videoFirstIDRFound := false
var videoFirstIDRPTS time.Duration
var videoDTSEst *h264.DTSEstimator
for {
item, ok := c.ringBuffer.Pull()
@ -337,6 +338,15 @@ func (c *rtmpConn) runRead(ctx context.Context) error {
continue
}
// video is decoded in another routine,
// while audio is decoded in this routine:
// we have to sync their PTS.
if videoInitialPTS == nil {
v := data.h264PTS
videoInitialPTS = &v
}
pts := data.h264PTS - *videoInitialPTS
// wait until we receive an IDR
if !videoFirstIDRFound {
if !h264.IDRPresent(data.h264NALUs) {
@ -344,7 +354,7 @@ func (c *rtmpConn) runRead(ctx context.Context) error {
}
videoFirstIDRFound = true
videoStartPTS = data.h264PTS
videoFirstIDRPTS = pts
videoDTSEst = h264.NewDTSEstimator()
}
@ -376,7 +386,7 @@ func (c *rtmpConn) runRead(ctx context.Context) error {
return err
}
pts := data.h264PTS - videoStartPTS
pts -= videoFirstIDRPTS
dts := videoDTSEst.Feed(pts)
c.conn.SetWriteDeadline(time.Now().Add(time.Duration(c.writeTimeout)))
@ -402,7 +412,7 @@ func (c *rtmpConn) runRead(ctx context.Context) error {
continue
}
pts -= videoStartPTS
pts -= videoFirstIDRPTS
if pts < 0 {
continue
}