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

adjust header

Browse Source
This commit is contained in:
nareix 2016-06-12 10:29:18 +08:00
parent f2dca8e369
commit eecd221159
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client.go
View File

@ -142,11 +142,11 @@ func (self *Client) WriteRequest(req Request) (err error) {
self.conn.Timeout = self.RtspTimeout self.conn.Timeout = self.RtspTimeout
self.cseq++ self.cseq++
req.Header = append(req.Header, self.Headers...)
req.Header = append(req.Header, fmt.Sprintf("CSeq: %d", self.cseq)) req.Header = append(req.Header, fmt.Sprintf("CSeq: %d", self.cseq))
for _, s := range self.authorization { for _, s := range self.authorization {
req.Header = append(req.Header, "Authorization: "+s) req.Header = append(req.Header, "Authorization: "+s)
} }
req.Header = append(req.Header, self.Headers...)
if err = self.writeLine(fmt.Sprintf("%s %s RTSP/1.0\r\n", req.Method, req.Uri)); err != nil { if err = self.writeLine(fmt.Sprintf("%s %s RTSP/1.0\r\n", req.Method, req.Uri)); err != nil {
return return
} }
@ -402,6 +402,7 @@ func (self *Client) Describe() (streams []av.CodecData, err error) {
req := Request{ req := Request{
Method: "DESCRIBE", Method: "DESCRIBE",
Uri: self.requestUri, Uri: self.requestUri,
Header: []string{"Accept: application/sdp"},
} }
if err = self.WriteRequest(req); err != nil { if err = self.WriteRequest(req); err != nil {
return return
@ -425,11 +426,7 @@ func (self *Client) Describe() (streams []av.CodecData, err error) {
} }
self.streams = []*Stream{} self.streams = []*Stream{}
sess, medias := sdp.Parse(body) _, medias := sdp.Parse(body)
if sess.Uri != "" {
self.requestUri = sess.Uri
}
for _, media := range medias { for _, media := range medias {
stream := &Stream{Sdp: media} stream := &Stream{Sdp: media}