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

change float64->float32

Browse Source
This commit is contained in:
nareix 2016-06-18 08:15:30 +08:00
parent 366f7b4dfa
commit c463a3678f
5 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
atom/atom.go
View File

@ -42,4 +42,3 @@ func WalkFile(w Walker, r io.Reader) (err error) {
return return
} }

1
atom/dumper.go
View File

@ -93,4 +93,3 @@ func (self Dumper) Bytes(val []byte) {
func (self Dumper) TimeStamp(val TimeStamp) { func (self Dumper) TimeStamp(val TimeStamp) {
self.Println(fmt.Sprintf("%s: %d", self.name, int(val))) self.Println(fmt.Sprintf("%s: %d", self.name, int(val)))
} }

12
demuxer.go
View File

@ -4,10 +4,10 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/nareix/av" "github.com/nareix/av"
"github.com/nareix/mp4/atom"
"github.com/nareix/mp4/isom"
"github.com/nareix/codec/aacparser" "github.com/nareix/codec/aacparser"
"github.com/nareix/codec/h264parser" "github.com/nareix/codec/h264parser"
"github.com/nareix/mp4/atom"
"github.com/nareix/mp4/isom"
"io" "io"
) )
@ -322,7 +322,7 @@ func (self *Demuxer) ReadPacket() (streamIndex int, pkt av.Packet, err error) {
return return
} }
func (self *Demuxer) CurrentTime() (time float64) { func (self *Demuxer) CurrentTime() (time float32) {
if len(self.streams) > 0 { if len(self.streams) > 0 {
stream := self.streams[0] stream := self.streams[0]
time = stream.tsToTime(stream.dts) time = stream.tsToTime(stream.dts)
@ -330,7 +330,7 @@ func (self *Demuxer) CurrentTime() (time float64) {
return return
} }
func (self *Demuxer) SeekToTime(time float64) (err error) { func (self *Demuxer) SeekToTime(time float32) (err error) {
for _, stream := range self.streams { for _, stream := range self.streams {
if stream.IsVideo() { if stream.IsVideo() {
if err = stream.seekToTime(time); err != nil { if err = stream.seekToTime(time); err != nil {
@ -395,7 +395,7 @@ func (self *Stream) readPacket() (pkt av.Packet, err error) {
return return
} }
func (self *Stream) seekToTime(time float64) (err error) { func (self *Stream) seekToTime(time float32) (err error) {
index := self.timeToSampleIndex(time) index := self.timeToSampleIndex(time)
if err = self.setSampleIndex(index); err != nil { if err = self.setSampleIndex(index); err != nil {
return return
@ -406,7 +406,7 @@ func (self *Stream) seekToTime(time float64) (err error) {
return return
} }
func (self *Stream) timeToSampleIndex(time float64) int { func (self *Stream) timeToSampleIndex(time float32) int {
targetTs := self.timeToTs(time) targetTs := self.timeToTs(time)
targetIndex := 0 targetIndex := 0

8
muxer.go
View File

@ -184,7 +184,7 @@ func (self *Muxer) WritePacket(streamIndex int, pkt av.Packet) (err error) {
} }
newpkt := pkt newpkt := pkt
newpkt.Data = payload newpkt.Data = payload
newpkt.Duration = float64(samples)/float64(sampleRate) newpkt.Duration = float32(samples) / float32(sampleRate)
if err = stream.writePacket(newpkt); err != nil { if err = stream.writePacket(newpkt); err != nil {
return return
} }
@ -258,21 +258,21 @@ func (self *Muxer) WriteTrailer() (err error) {
NextTrackId: 2, NextTrackId: 2,
} }
maxDur := float64(0) maxDur := float32(0)
timeScale := 10000 timeScale := 10000
for _, stream := range self.streams { for _, stream := range self.streams {
if err = stream.fillTrackAtom(); err != nil { if err = stream.fillTrackAtom(); err != nil {
return return
} }
dur := stream.tsToTime(stream.duration) dur := stream.tsToTime(stream.duration)
stream.trackAtom.Header.Duration = int(float64(timeScale) * dur) stream.trackAtom.Header.Duration = int(float32(timeScale) * dur)
if dur > maxDur { if dur > maxDur {
maxDur = dur maxDur = dur
} }
moov.Tracks = append(moov.Tracks, stream.trackAtom) moov.Tracks = append(moov.Tracks, stream.trackAtom)
} }
moov.Header.TimeScale = timeScale moov.Header.TimeScale = timeScale
moov.Header.Duration = int(float64(timeScale) * maxDur) moov.Header.Duration = int(float32(timeScale) * maxDur)
if err = self.mdatWriter.Close(); err != nil { if err = self.mdatWriter.Close(); err != nil {
return return

10
stream.go
View File

@ -14,7 +14,7 @@ type Stream struct {
idx int idx int
timeScale int64 timeScale int64
duration int64 duration int64
muxer *Muxer muxer *Muxer
@ -39,10 +39,10 @@ type Stream struct {
cttsEntry *atom.CompositionOffsetEntry cttsEntry *atom.CompositionOffsetEntry
} }
func (self *Stream) timeToTs(time float64) int64 { func (self *Stream) timeToTs(time float32) int64 {
return int64(time * float64(self.timeScale)) return int64(time * float32(self.timeScale))
} }
func (self *Stream) tsToTime(ts int64) float64 { func (self *Stream) tsToTime(ts int64) float32 {
return float64(ts) / float64(self.timeScale) return float32(ts) / float32(self.timeScale)
} }