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

fix github.com/nareix/codec api change

Browse Source
This commit is contained in:
nareix 2016-06-08 15:29:49 +08:00
parent d5075b55b2
commit e9a3828572
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
client.go
View File

@ -16,6 +16,7 @@ import (
"github.com/nareix/av" "github.com/nareix/av"
"github.com/nareix/codec/h264parser" "github.com/nareix/codec/h264parser"
"github.com/nareix/codec/aacparser" "github.com/nareix/codec/aacparser"
"github.com/nareix/codec"
"github.com/nareix/rtsp/sdp" "github.com/nareix/rtsp/sdp"
"github.com/nareix/av/pktqueue" "github.com/nareix/av/pktqueue"
) )
@ -205,7 +206,7 @@ func (self *Client) ReadResponse() (res Response, err error) {
} }
if res.StatusCode != 200 && res.StatusCode != 401 { if res.StatusCode != 200 && res.StatusCode != 401 {
err = fmt.Errorf("StatusCode=%d invalid", res.StatusCode) err = fmt.Errorf("rtsp: StatusCode=%d invalid", res.StatusCode)
return return
} }
@ -237,7 +238,7 @@ func (self *Client) ReadResponse() (res Response, err error) {
if realm != "" && nonce != "" { if realm != "" && nonce != "" {
if self.url.User == nil { if self.url.User == nil {
err = fmt.Errorf("please provide username and password") err = fmt.Errorf("rtsp: please provide username and password")
return return
} }
var username string var username string
@ -245,7 +246,7 @@ func (self *Client) ReadResponse() (res Response, err error) {
var ok bool var ok bool
username = self.url.User.Username() username = self.url.User.Username()
if password, ok = self.url.User.Password(); !ok { if password, ok = self.url.User.Password(); !ok {
err = fmt.Errorf("please provide password") err = fmt.Errorf("rtsp: please provide password")
return return
} }
hs1 := md5hash(username+":"+realm+":"+password) hs1 := md5hash(username+":"+realm+":"+password)
@ -320,7 +321,7 @@ func (self *Client) Describe() (streams []av.CodecData, err error) {
} }
} }
if res.ContentLength == 0 { if res.ContentLength == 0 {
err = fmt.Errorf("Describe failed") err = fmt.Errorf("rtsp: Describe failed, StatusCode=%d", res.StatusCode)
return return
} }
@ -334,6 +335,10 @@ func (self *Client) Describe() (streams []av.CodecData, err error) {
for _, info := range sdp.Decode(body) { for _, info := range sdp.Decode(body) {
stream := &Stream{Sdp: info} stream := &Stream{Sdp: info}
if false {
fmt.Println("sdp:", info.TimeScale)
}
if info.PayloadType >= 96 && info.PayloadType <= 127 { if info.PayloadType >= 96 && info.PayloadType <= 127 {
switch info.Type { switch info.Type {
case av.H264: case av.H264:
@ -350,31 +355,31 @@ func (self *Client) Describe() (streams []av.CodecData, err error) {
} }
if len(sps) > 0 && len(pps) > 0 { if len(sps) > 0 && len(pps) > 0 {
if stream.CodecData, err = h264parser.NewCodecDataFromSPSAndPPS(sps, pps); err != nil { if stream.CodecData, err = h264parser.NewCodecDataFromSPSAndPPS(sps, pps); err != nil {
err = fmt.Errorf("h264 sps/pps invalid: %s", err) err = fmt.Errorf("rtsp: h264 sps/pps invalid: %s", err)
return return
} }
} else { } else {
err = fmt.Errorf("h264 sdp sprop-parameter-sets invalid: missing sps or pps") err = fmt.Errorf("rtsp: h264 sdp sprop-parameter-sets invalid: missing sps or pps")
return return
} }
case av.AAC: case av.AAC:
if len(info.Config) == 0 { if len(info.Config) == 0 {
err = fmt.Errorf("aac sdp config missing") err = fmt.Errorf("rtsp: aac sdp config missing")
return return
} }
if stream.CodecData, err = aacparser.NewCodecDataFromMPEG4AudioConfigBytes(info.Config); err != nil { if stream.CodecData, err = aacparser.NewCodecDataFromMPEG4AudioConfigBytes(info.Config); err != nil {
err = fmt.Errorf("aac sdp config invalid: %s", err) err = fmt.Errorf("rtsp: aac sdp config invalid: %s", err)
return return
} }
} }
} else { } else {
switch info.PayloadType { switch info.PayloadType {
case 0: case 0:
stream.CodecData = av.NewPCMMulawCodecData() stream.CodecData = codec.NewPCMMulawCodecData()
default: default:
err = fmt.Errorf("PayloadType=%d unsupported", info.PayloadType) err = fmt.Errorf("rtsp: PayloadType=%d unsupported", info.PayloadType)
return return
} }
} }
@ -464,7 +469,7 @@ func (self *Stream) handlePacket(timestamp uint32, packet []byte) (err error) {
return return
} }
case naluType == 28: case naluType == 28: // FU-A
/* /*
0 1 2 3 0 1 2 3
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
@ -528,8 +533,12 @@ func (self *Stream) handlePacket(timestamp uint32, packet []byte) (err error) {
} }
} }
case naluType == 24:
err = fmt.Errorf("rtsp: unsupported H264 STAP-A")
return
default: default:
err = fmt.Errorf("unsupported H264 naluType=%d", naluType) err = fmt.Errorf("rtsp: unsupported H264 naluType=%d", naluType)
return return
} }
@ -667,6 +676,9 @@ func (self *Client) poll() (err error) {
stream := self.streams[i] stream := self.streams[i]
if stream.gotpkt { if stream.gotpkt {
time := float64(stream.timestamp)/float64(stream.Sdp.TimeScale) time := float64(stream.timestamp)/float64(stream.Sdp.TimeScale)
if false {
fmt.Printf("rtsp: #%d %d/%d %d\n", i, stream.timestamp, stream.Sdp.TimeScale, len(stream.pkt.Data))
}
self.pktque.WriteTimePacket(i, time, stream.pkt) self.pktque.WriteTimePacket(i, time, stream.pkt)
stream.pkt = av.Packet{} stream.pkt = av.Packet{}
stream.gotpkt = false stream.gotpkt = false