kunmeng/vdk
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fps

Browse Source
This commit is contained in:
deepch 2022-06-05 22:26:12 +03:00
parent 7d87dbe2dd
commit 898c5e5d57
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
format/ts/demuxer.go
View File

@ -3,14 +3,13 @@ package ts
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"io"
"time"
"github.com/deepch/vdk/av" "github.com/deepch/vdk/av"
"github.com/deepch/vdk/codec/aacparser" "github.com/deepch/vdk/codec/aacparser"
"github.com/deepch/vdk/codec/h264parser" "github.com/deepch/vdk/codec/h264parser"
"github.com/deepch/vdk/format/ts/tsio" "github.com/deepch/vdk/format/ts/tsio"
"github.com/deepch/vdk/utils/bits/pio" "github.com/deepch/vdk/utils/bits/pio"
"io"
"time"
) )
type Demuxer struct { type Demuxer struct {
@ -187,7 +186,7 @@ func (self *Demuxer) readTSPacket() (err error) {
return return
} }
func (self *Stream) addPacket(payload []byte, timedelta time.Duration) { func (self *Stream) addPacket(payload []byte, timedelta time.Duration, fixed time.Duration) {
dts := self.dts dts := self.dts
pts := self.pts pts := self.pts
@ -199,6 +198,8 @@ func (self *Stream) addPacket(payload []byte, timedelta time.Duration) {
if self.pt > 0 { if self.pt > 0 {
dur = dts + timedelta - self.pt dur = dts + timedelta - self.pt
} else {
dur = fixed
} }
self.pt = dts + timedelta self.pt = dts + timedelta
@ -243,7 +244,7 @@ func (self *Stream) payloadEnd() (n int, err error) {
return return
} }
} }
self.addPacket(payload[hdrlen:framelen], delta) self.addPacket(payload[hdrlen:framelen], delta, time.Duration(samples)*time.Second/time.Duration(config.SampleRate))
n++ n++
delta += time.Duration(samples) * time.Second / time.Duration(config.SampleRate) delta += time.Duration(samples) * time.Second / time.Duration(config.SampleRate)
payload = payload[framelen:] payload = payload[framelen:]
@ -259,6 +260,10 @@ func (self *Stream) payloadEnd() (n int, err error) {
switch { switch {
case naltype == 7: case naltype == 7:
sps = nalu sps = nalu
info, err := h264parser.ParseSPS(sps)
if err == nil {
self.fps = info.FPS
}
case naltype == 8: case naltype == 8:
pps = nalu pps = nalu
case h264parser.IsDataNALU(nalu): case h264parser.IsDataNALU(nalu):
@ -267,7 +272,7 @@ func (self *Stream) payloadEnd() (n int, err error) {
b := make([]byte, 4+len(nalu)) b := make([]byte, 4+len(nalu))
pio.PutU32BE(b[0:4], uint32(len(nalu))) pio.PutU32BE(b[0:4], uint32(len(nalu)))
copy(b[4:], nalu) copy(b[4:], nalu)
self.addPacket(b, time.Duration(0)) self.addPacket(b, time.Duration(0), (1000*time.Millisecond)/time.Duration(self.fps))
n++ n++
} }
} }
@ -278,7 +283,7 @@ func (self *Stream) payloadEnd() (n int, err error) {
b := make([]byte, 4+len(payload)) b := make([]byte, 4+len(payload))
pio.PutU32BE(b[0:4], uint32(len(payload))) pio.PutU32BE(b[0:4], uint32(len(payload)))
copy(b[4:], payload) copy(b[4:], payload)
self.addPacket(b, time.Duration(0)) self.addPacket(b, time.Duration(0), 0)
n++ n++
} }

2
format/ts/stream.go
View File

@ -19,7 +19,7 @@ type Stream struct {
tsw *tsio.TSWriter tsw *tsio.TSWriter
idx int idx int
fps uint
iskeyframe bool iskeyframe bool
pts, dts, pt time.Duration pts, dts, pt time.Duration
data []byte data []byte