apps/plugin-rtsp
1
0
Fork 0
mirror of https://github.com/Monibuca/plugin-rtsp.git synced 2025-09-27 12:02:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2 from zbjlala/master

Browse Source 
master
This commit is contained in:
dexter
2020-08-26 22:17:37 +08:00
committed by GitHub
parent 8b1892209d 0e4406ad14
commit fd64a69a12
5 changed files with 78 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client.go
View File

@@ -144,7 +144,7 @@ func (client *RTSP) requestStream() (err error) {
client.connRW = bufio.NewReadWriter(bufio.NewReaderSize(&timeoutConn, networkBuffer), bufio.NewWriterSize(&timeoutConn, networkBuffer)) client.connRW = bufio.NewReadWriter(bufio.NewReaderSize(&timeoutConn, networkBuffer), bufio.NewWriterSize(&timeoutConn, networkBuffer))
headers := make(map[string]string) headers := make(map[string]string)
headers["Require"] = "implicit-play" //headers["Require"] = "implicit-play"
// An OPTIONS request returns the request types the server will accept. // An OPTIONS request returns the request types the server will accept.
resp, err := client.Request("OPTIONS", headers) resp, err := client.Request("OPTIONS", headers)
if err != nil { if err != nil {
@@ -191,7 +191,8 @@ func (client *RTSP) requestStream() (err error) {
client.SDPMap = ParseSDP(client.SDPRaw) client.SDPMap = ParseSDP(client.SDPRaw)
session := "" session := ""
if videoInfo, ok := client.SDPMap["video"]; ok { if videoInfo, ok := client.SDPMap["video"]; ok {
client.VControl = videoInfo.Control for i := 0; i < len(videoInfo.Control); i++ {
client.VControl = videoInfo.Control[i]
client.VCodec = videoInfo.Codec client.VCodec = videoInfo.Codec
client.WriteSPS(videoInfo.SpropParameterSets[0]) client.WriteSPS(videoInfo.SpropParameterSets[0])
client.WritePPS(videoInfo.SpropParameterSets[1]) client.WritePPS(videoInfo.SpropParameterSets[1])
@@ -227,8 +228,10 @@ func (client *RTSP) requestStream() (err error) {
session, _ = resp.Header["Session"].(string) session, _ = resp.Header["Session"].(string)
session = strings.Split(session, ";")[0] session = strings.Split(session, ";")[0]
} }
}
if audioInfo, ok := client.SDPMap["audio"]; ok { if audioInfo, ok := client.SDPMap["audio"]; ok {
client.AControl = audioInfo.Control for i := 0; i < len(audioInfo.Control); i++ {
client.AControl = audioInfo.Control[i]
client.ACodec = audioInfo.Codec client.ACodec = audioInfo.Codec
if len(audioInfo.Config) < 2 { if len(audioInfo.Config) < 2 {
Printf("Setup audio err codec not support: %s", client.ACodec) Printf("Setup audio err codec not support: %s", client.ACodec)
@@ -266,6 +269,7 @@ func (client *RTSP) requestStream() (err error) {
session, _ = resp.Header["Session"].(string) session, _ = resp.Header["Session"].(string)
session = strings.Split(session, ";")[0] session = strings.Split(session, ";")[0]
} }
}
headers = make(map[string]string) headers = make(map[string]string)
if session != "" { if session != "" {
headers["Session"] = session headers["Session"] = session

2
go.mod
View File

@@ -5,6 +5,6 @@ go 1.13
require ( require (
github.com/Monibuca/engine/v2 v2.1.2 github.com/Monibuca/engine/v2 v2.1.2
github.com/Monibuca/plugin-rtp v0.0.0-20200531014802-504413c0dfcb github.com/Monibuca/plugin-rtp v0.0.0-20200531014802-504413c0dfcb
github.com/pion/rtp v1.5.4 // indirect github.com/pion/rtp v1.6.0 // indirect
github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf github.com/teris-io/shortid v0.0.0-20171029131806-771a37caa5cf
) )

4
go.sum
View File

@@ -22,8 +22,12 @@ github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+v
github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/pion/randutil v0.0.0 h1:aLWLVhTG2jzoD25F0OlW6nXvXrjoGwiXq2Sz7j7NzL0=
github.com/pion/randutil v0.0.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
github.com/pion/rtp v1.5.4 h1:PuNg6xqV3brIUihatcKZj1YDUs+M45L0ZbrZWYtkDxY= github.com/pion/rtp v1.5.4 h1:PuNg6xqV3brIUihatcKZj1YDUs+M45L0ZbrZWYtkDxY=
github.com/pion/rtp v1.5.4/go.mod h1:bg60AL5GotNOlYZsqycbhDtEV3TkfbpXG0KBiUq29Mg= github.com/pion/rtp v1.5.4/go.mod h1:bg60AL5GotNOlYZsqycbhDtEV3TkfbpXG0KBiUq29Mg=
github.com/pion/rtp v1.6.0 h1:4Ssnl/T5W2LzxHj9ssYpGVEQh3YYhQFNVmSWO88MMwk=
github.com/pion/rtp v1.6.0/go.mod h1:QgfogHsMBVE/RFNno467U/KBqfUywEH+HK+0rtnwsdI=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

4
sdp-parser.go
View File

@@ -11,7 +11,7 @@ type SDPInfo struct {
AVType string AVType string
Codec string Codec string
TimeScale int TimeScale int
Control string Control []string
Rtpmap int Rtpmap int
Config []byte Config []byte
SpropParameterSets [][]byte SpropParameterSets [][]byte
@@ -51,7 +51,7 @@ func ParseSDP(sdpRaw string) map[string]*SDPInfo {
val := keyval[1] val := keyval[1]
switch key { switch key {
case "control": case "control":
info.Control = val info.Control = append(info.Control, val)
case "rtpmap": case "rtpmap":
info.Rtpmap, _ = strconv.Atoi(val) info.Rtpmap, _ = strconv.Atoi(val)
} }

4
session.go
View File

@@ -320,13 +320,13 @@ func (session *RTSP) handleRequest(req *Request) {
if session.Publish(streamPath) { if session.Publish(streamPath) {
sdp, ok := session.SDPMap["audio"] sdp, ok := session.SDPMap["audio"]
if ok { if ok {
session.AControl = sdp.Control session.AControl = sdp.Control[0]
session.ACodec = sdp.Codec session.ACodec = sdp.Codec
session.WriteASC(sdp.Config) session.WriteASC(sdp.Config)
Printf("audio codec[%s]\n", session.ACodec) Printf("audio codec[%s]\n", session.ACodec)
} }
if sdp, ok = session.SDPMap["video"]; ok { if sdp, ok = session.SDPMap["video"]; ok {
session.VControl = sdp.Control session.VControl = sdp.Control[0]
session.VCodec = sdp.Codec session.VCodec = sdp.Codec
session.WriteSPS(sdp.SpropParameterSets[0]) session.WriteSPS(sdp.SpropParameterSets[0])
session.WritePPS(sdp.SpropParameterSets[1]) session.WritePPS(sdp.SpropParameterSets[1])