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

add Width and Height params to SimpleH264Writer

Browse Source
This commit is contained in:
nareix 2015-11-27 15:41:37 +08:00
parent 10cf2743c7
commit 8005e55dcb
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test.go
View File

@ -36,6 +36,7 @@ func ProbeFile(filename string) (err error) {
return return
} }
dumper := &atom.Dumper{}
var moov *atom.Movie var moov *atom.Movie
lr := &io.LimitedReader{R: osfile, N: finfo.Size()} lr := &io.LimitedReader{R: osfile, N: finfo.Size()}
@ -53,6 +54,9 @@ func ProbeFile(filename string) (err error) {
log.Println("read '%s' atom failed", cc4) log.Println("read '%s' atom failed", cc4)
return return
} }
atom.WalkMovie(dumper, moov)
} else {
fmt.Println("atom:", cc4)
} }
if _, err = atom.ReadDummy(lr, int(ar.N)); err != nil { if _, err = atom.ReadDummy(lr, int(ar.N)); err != nil {
@ -66,9 +70,6 @@ func ProbeFile(filename string) (err error) {
return return
} }
dumper := &atom.Dumper{}
atom.WalkMovie(dumper, moov)
return return
} }

18
writer.go
View File

@ -13,6 +13,9 @@ type SimpleH264Writer struct {
SPS []byte SPS []byte
PPS []byte PPS []byte
Width int
Height int
duration int duration int
sample *atom.SampleTable sample *atom.SampleTable
@ -33,6 +36,14 @@ func (self *SimpleH264Writer) prepare() (err error) {
self.sample = &atom.SampleTable{ self.sample = &atom.SampleTable{
SampleDesc: &atom.SampleDesc{ SampleDesc: &atom.SampleDesc{
Avc1Desc: &atom.Avc1Desc{ Avc1Desc: &atom.Avc1Desc{
DataRefIdx: 1,
HorizontalResolution: 72,
VorizontalResolution: 72,
Width: self.Width,
Height: self.Height,
FrameCount: 1,
Depth: 24,
ColorTableId: -1,
Conf: &atom.Avc1Conf{}, Conf: &atom.Avc1Conf{},
}, },
}, },
@ -149,15 +160,18 @@ func (self *SimpleH264Writer) Finish() (err error) {
PreferredRate: atom.IntToFixed(1), PreferredRate: atom.IntToFixed(1),
PreferredVolume: atom.IntToFixed(1), PreferredVolume: atom.IntToFixed(1),
Matrix: [9]int{0x10000, 0, 0, 0, 0x10000, 0, 0, 0, 0x40000000}, Matrix: [9]int{0x10000, 0, 0, 0, 0x10000, 0, 0, 0, 0x40000000},
NextTrackId: 2,
} }
track := &atom.Track{ track := &atom.Track{
Header: &atom.TrackHeader{ Header: &atom.TrackHeader{
Flags: 0x0001, // enabled TrackId: 1,
Flags: 0x0003, // Track enabled | Track in movie
Duration: self.duration, Duration: self.duration,
Volume: atom.IntToFixed(1), Volume: atom.IntToFixed(1),
Matrix: [9]int{0x10000, 0, 0, 0, 0x10000, 0, 0, 0, 0x40000000}, Matrix: [9]int{0x10000, 0, 0, 0, 0x10000, 0, 0, 0, 0x40000000},
TrackId: 1, TrackWidth: atom.IntToFixed(self.Width),
TrackHeight: atom.IntToFixed(self.Height),
}, },
Media: &atom.Media{ Media: &atom.Media{