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

add sdp field PayloadType, bugfix

Browse Source
This commit is contained in:
nareix 2016-06-06 16:47:35 +08:00
parent fed739021e
commit 9af997cd0f
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sdp/parser.go
View File

@ -10,22 +10,23 @@ import (
type Info struct {
AVType string
Type av.CodecType
Type int
TimeScale int
Control string
Rtpmap int
Config []byte
SpropParameterSets [][]byte
PayloadType int
}
func Decode(content string) (infos []Info) {
var info *Info
for _, line := range strings.Split(content, "\n") {
line = strings.Trim(line, "\r")
line = strings.TrimSpace(line)
typeval := strings.SplitN(line, "=", 2)
if len(typeval) == 2 {
fields := strings.Split(typeval[1], " ")
fields := strings.SplitN(typeval[1], " ", 2)
switch typeval[0] {
case "m":
@ -34,13 +35,17 @@ func Decode(content string) (infos []Info) {
case "audio", "video":
infos = append(infos, Info{AVType: fields[0]})
info = &infos[len(infos)-1]
mfields := strings.Split(fields[1], " ")
if len(mfields) >= 3 {
info.PayloadType, _ = strconv.Atoi(mfields[2])
}
}
}
case "a":
if info != nil {
for _, field := range fields {
keyval := strings.Split(field, ":")
keyval := strings.SplitN(field, ":", 2)
if len(keyval) >= 2 {
key := keyval[0]
val := keyval[1]
@ -54,13 +59,12 @@ func Decode(content string) (infos []Info) {
keyval = strings.Split(field, "/")
if len(keyval) >= 2 {
key := keyval[0]
info.TimeScale, _ = strconv.Atoi(keyval[1])
switch key {
case "MPEG4-GENERIC":
info.Type = av.AAC
info.TimeScale, _ = strconv.Atoi(keyval[1])
case "H264":
info.Type = av.H264
info.TimeScale, _ = strconv.Atoi(keyval[1])
}
}
keyval = strings.Split(field, ";")
@ -68,7 +72,7 @@ func Decode(content string) (infos []Info) {
for _, field := range keyval {
keyval := strings.SplitN(field, "=", 2)
if len(keyval) == 2 {
key := keyval[0]
key := strings.TrimSpace(keyval[0])
val := keyval[1]
switch key {
case "config":

10
sdp/parser_test.go
View File

@ -21,7 +21,7 @@ m=video 0 RTP/AVP 96
c=IN IP4 0.0.0.0
b=AS:300
a=rtpmap:96 H264/90000
a=fmtp:96 packetization-mode=1;profile-level-id=640028;sprop-parameter-sets=Z2QAKK2EBUViuKxUdCAqKxXFYqOhAVFYrisVHQgKisVxWKjoQFRWK4rFR0ICorFcVio6ECSFITk8nyfk/k/J8nm5s00IEkKQnJ5Pk/J/J+T5PNzZprQFoe0qQAAAHgAABDgYEABJPAAUmW974XhEI1A=,aO48sA==;config=0000000167640028ad84054562b8ac5474202a2b15c562a3a1015158ae2b151d080a8ac57158a8e84054562b8ac5474202a2b15c562a3a10248521393c9f27e4fe4fc9f279b9b34d081242909c9e4f93f27f27e4f93cdcd9a6b405a1ed2a4000001e00000438181000493c0014996f7be1784423500000000168ee3cb0
a=fmtp:96 profile-level-id=420029; packetization-mode=1; sprop-parameter-sets=Z00AHpWoKA9k,aO48gA==
a=x-dimensions: 720, 480
a=x-framerate: 15
a=control:track1
@ -31,6 +31,14 @@ b=AS:256
a=rtpmap:96 MPEG4-GENERIC/16000/2
a=fmtp:96 streamtype=5;profile-level-id=1;mode=AAC-hbr;sizelength=13;indexlength=3;indexdeltalength=3;config=1408
a=control:track2
m=audio 0 RTP/AVP 0
c=IN IP4 0.0.0.0
b=AS:50
a=recvonly
a=control:rtsp://109.195.127.207:554/mpeg4cif/trackID=2
a=rtpmap:0 PCMU/8000
a=Media_header:MEDIAINFO=494D4B48010100000400010010710110401F000000FA000000000000000000000000000000000000;
a=appversion:1.0
`)
t.Logf("%v", infos)
}