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

add FILE_HAS_xxx

Browse Source
This commit is contained in:
nareix 2016-06-25 18:29:12 +08:00
parent 9a774cd9e0
commit de23a44d37
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
flvio/flvio.go
View File

@ -61,7 +61,7 @@ const (
SOUND_STEREO = 1 SOUND_STEREO = 1
AAC_SEQHDR = 0 AAC_SEQHDR = 0
AAC_RAW = 0 AAC_RAW = 1
) )
type Audiodata struct { type Audiodata struct {
@ -187,7 +187,7 @@ const (
FRAME_KEY = 1 FRAME_KEY = 1
FRAME_INTER = 2 FRAME_INTER = 2
CODEC_AAC = 7 VIDEO_H264 = 7
) )
type Videodata struct { type Videodata struct {
@ -236,7 +236,7 @@ func (self *Videodata) Unmarshal(r *pio.Reader) (err error) {
return return
} }
self.FrameType = flags >> 4 self.FrameType = flags >> 4
self.CodecID = flags & 0xff self.CodecID = flags & 0xf
if self.AVCPacketType, err = r.ReadU8(); err != nil { if self.AVCPacketType, err = r.ReadU8(); err != nil {
return return
} }
@ -273,7 +273,16 @@ func (self Videodata) Marshal(w *pio.Writer) (err error) {
return return
} }
func ReadFileHeader(r *pio.Reader) (err error) { const (
// TypeFlagsReserved UB[5]
// TypeFlagsAudio UB[1] Audio tags are present
// TypeFlagsReserved UB[1] Must be 0
// TypeFlagsVideo UB[1] Video tags are present
FILE_HAS_VIDEO = 0x4
FILE_HAS_AUDIO = 0x1
)
func ReadFileHeader(r *pio.Reader) (flags uint8, err error) {
var cc3 uint32 var cc3 uint32
if cc3, err = r.ReadU24BE(); err != nil { if cc3, err = r.ReadU24BE(); err != nil {
return return
@ -288,8 +297,7 @@ func ReadFileHeader(r *pio.Reader) (err error) {
return return
} }
// flags if flags, err = r.ReadU8(); err != nil {
if _, err = r.ReadI8(); err != nil {
return return
} }
@ -386,23 +394,12 @@ func WriteTag(w *pio.Writer, tag Tag, timestamp int32) (err error) {
return return
} }
func WriteFileHeader(w *pio.Writer, hasVideo bool, hasAudio bool) (err error) { func WriteFileHeader(w *pio.Writer, flags uint8) (err error) {
// 'FLV', version 1 // 'FLV', version 1
if err = w.WriteI32BE(0x464c5601); err != nil { if err = w.WriteI32BE(0x464c5601); err != nil {
return return
} }
// TypeFlagsReserved UB[5]
// TypeFlagsAudio UB[1] Audio tags are present
// TypeFlagsReserved UB[1] Must be 0
// TypeFlagsVideo UB[1] Video tags are present
var flags uint8
if hasAudio {
flags |= 1 << 2
}
if hasVideo {
flags |= 1
}
if err = w.WriteU8(flags); err != nil { if err = w.WriteU8(flags); err != nil {
return return
} }