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

add error check

Browse Source
This commit is contained in:
nareix 2016-06-28 15:36:10 +08:00
parent 6e4e8031d3
commit 7d7a93ce1d
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
server.go
View File

@ -567,7 +567,9 @@ func (self *Conn) connectPlay() (err error) {
"videoCodecs": 252, "videoCodecs": 252,
"videoFunction": 1, "videoFunction": 1,
}) })
self.writeCommandMsgEnd(3, 0) if err = self.writeCommandMsgEnd(3, 0); err != nil {
return
}
for { for {
if err = self.pollMsg(); err != nil { if err = self.pollMsg(); err != nil {
@ -589,7 +591,9 @@ func (self *Conn) connectPlay() (err error) {
} }
} else { } else {
if self.msgtypeid == msgtypeidWindowAckSize { if self.msgtypeid == msgtypeidWindowAckSize {
self.writeWindowAckSize(2500000) if err = self.writeWindowAckSize(2500000); err != nil {
return
}
} }
} }
} }
@ -602,10 +606,14 @@ func (self *Conn) connectPlay() (err error) {
flvio.WriteAMF0Val(w, "createStream") flvio.WriteAMF0Val(w, "createStream")
flvio.WriteAMF0Val(w, 2) flvio.WriteAMF0Val(w, 2)
flvio.WriteAMF0Val(w, nil) flvio.WriteAMF0Val(w, nil)
self.writeCommandMsgEnd(3, 0) if err = self.writeCommandMsgEnd(3, 0); err != nil {
return
}
// > SetBufferLength 0,100ms // > SetBufferLength 0,100ms
self.writeSetBufferLength(0, 100) if err = self.writeSetBufferLength(0, 100); err != nil {
return
}
for { for {
if err = self.pollMsg(); err != nil { if err = self.pollMsg(); err != nil {
@ -633,7 +641,9 @@ func (self *Conn) connectPlay() (err error) {
flvio.WriteAMF0Val(w, 0) flvio.WriteAMF0Val(w, 0)
flvio.WriteAMF0Val(w, nil) flvio.WriteAMF0Val(w, nil)
flvio.WriteAMF0Val(w, playpath) flvio.WriteAMF0Val(w, playpath)
self.writeCommandMsgEnd(8, self.avmsgsid) if err = self.writeCommandMsgEnd(8, self.avmsgsid); err != nil {
return
}
self.reading = true self.reading = true
self.playing = true self.playing = true
@ -722,14 +732,18 @@ func (self *Conn) WritePacket(pkt av.Packet) (err error) {
audiodata := self.makeAACAudiodata(stream.(av.AudioCodecData), flvio.AAC_RAW, pkt.Data) audiodata := self.makeAACAudiodata(stream.(av.AudioCodecData), flvio.AAC_RAW, pkt.Data)
w := self.writeAudioDataStart() w := self.writeAudioDataStart()
audiodata.Marshal(w) audiodata.Marshal(w)
self.writeAudioDataEnd(ts) if err = self.writeAudioDataEnd(ts); err != nil {
return
}
case av.H264: case av.H264:
videodata := self.makeH264Videodata(flvio.AVC_NALU, pkt.IsKeyFrame, pkt.Data) videodata := self.makeH264Videodata(flvio.AVC_NALU, pkt.IsKeyFrame, pkt.Data)
videodata.CompositionTime = int32(timeToTs(pkt.CompositionTime)) videodata.CompositionTime = int32(timeToTs(pkt.CompositionTime))
w := self.writeVideoDataStart() w := self.writeVideoDataStart()
videodata.Marshal(w) videodata.Marshal(w)
self.writeVideoDataEnd(ts) if err = self.writeVideoDataEnd(ts); err != nil {
return
}
} }
return return
@ -771,6 +785,8 @@ func (self *Conn) WriteHeader(streams []av.CodecData) (err error) {
} }
metadata["audiodatarate"] = 156 metadata["audiodatarate"] = 156
metadata["audiosamplerate"] = 3
metadata["audiosamplesize"] = 1
} }
} }