thefoxon/joy4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new pktque.Filter interface

Browse Source
This commit is contained in:
nareix 2016-07-13 20:19:47 +08:00
parent ff7d24c845
commit d4a1f50f7e
2 changed files with 0 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
av/pktque/normalizer.go
View File

@ -1,76 +0,0 @@
package pktque
import (
"time"
"github.com/nareix/joy4/av"
)
type Normalizer struct {
streams []av.CodecData
time []time.Duration
MaxAVTimeDiff time.Duration
timebase time.Duration
}
func (self *Normalizer) Correct(pkt *av.Packet) (ok bool) {
if len(self.streams) == 0 {
ok = true
return
}
start, end, correctable, correcttime := self.check(int(pkt.Idx))
time := pkt.Time - self.timebase
if time >= start && time < end {
ok = true
pkt.Time = time
self.time[pkt.Idx] = time
} else {
if correctable {
ok = true
self.timebase = pkt.Time - correcttime
pkt.Time = correcttime
self.time[pkt.Idx] = correcttime
}
}
return
}
func (self *Normalizer) check(i int) (start time.Duration, end time.Duration, correctable bool, correcttime time.Duration) {
minidx := -1
maxidx := -1
for j := range self.time {
if minidx == -1 || self.time[j] < self.time[minidx] {
minidx = j
}
if maxidx == -1 || self.time[j] > self.time[maxidx] {
maxidx = j
}
}
allthesame := self.time[minidx] == self.time[maxidx]
if i == minidx {
if allthesame {
correctable = true
} else {
correctable = false
}
} else {
correctable = true
}
start = self.time[minidx]
end = start + self.MaxAVTimeDiff
correcttime = start + time.Millisecond*40
return
}
func NewNormalizer(streams []av.CodecData) *Normalizer {
n := &Normalizer{}
n.streams = streams
n.MaxAVTimeDiff = time.Millisecond*500
n.time = make([]time.Duration, len(streams))
return n
}

33
av/pktque/walltime.go
View File

@ -1,33 +0,0 @@
package pktque
import (
"time"
"github.com/nareix/joy4/av"
)
type WalltimeDemuxer struct {
av.Demuxer
firsttime time.Time
}
func (self *WalltimeDemuxer) ReadPacket() (pkt av.Packet, err error) {
if pkt, err = self.Demuxer.ReadPacket(); err != nil {
return
}
if pkt.Idx == 0 {
if self.firsttime.IsZero() {
self.firsttime = time.Now()
}
pkttime := self.firsttime.Add(pkt.Time)
delta := pkttime.Sub(time.Now())
if delta > 0 {
time.Sleep(delta)
}
}
return
}
func NewWalltimeDemuxer(demuxer av.Demuxer) *WalltimeDemuxer {
return &WalltimeDemuxer{Demuxer: demuxer}
}