mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mts-chunking

This commit is contained in:
saxon 2019-02-16 09:17:43 +10:30
parent 281aa47fd5 725b40b114
commit 34daa45b46
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
stream/mts/encoder.go
View File

@ -122,6 +122,7 @@ type Encoder struct {
dst io.Writer dst io.Writer
clock time.Duration clock time.Duration
lastTime time.Time
frameInterval time.Duration frameInterval time.Duration
ptsOffset time.Duration ptsOffset time.Duration
tsSpace [PacketSize]byte tsSpace [PacketSize]byte
@ -247,7 +248,9 @@ func (e *Encoder) writePSI() error {
// tick advances the clock one frame interval. // tick advances the clock one frame interval.
func (e *Encoder) tick() { func (e *Encoder) tick() {
e.clock += e.frameInterval now := time.Now()
e.clock += now.Sub(e.lastTime)
e.lastTime = now
} }
// pts retuns the current presentation timestamp. // pts retuns the current presentation timestamp.

5
stream/rtp/encoder.go
View File

@ -51,6 +51,7 @@ type Encoder struct {
seqNo uint16 seqNo uint16
clock time.Duration clock time.Duration
frameInterval time.Duration frameInterval time.Duration
lastTime time.Time
fps int fps int
buffer []byte buffer []byte
pktSpace [defPktSize]byte pktSpace [defPktSize]byte
@ -120,7 +121,9 @@ func (e *Encoder) Encode(payload []byte) error {
// tick advances the clock one frame interval. // tick advances the clock one frame interval.
func (e *Encoder) tick() { func (e *Encoder) tick() {
e.clock += e.frameInterval now := time.Now()
e.clock += now.Sub(e.lastTime)
e.lastTime = now
} }
// nxtTimestamp gets the next timestamp // nxtTimestamp gets the next timestamp