apps/lkm
1
0
Fork 0
mirror of https://github.com/lkmio/lkm.git synced 2025-09-26 19:21:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

完善rtsp流封装sdp

Browse Source
This commit is contained in:
yangjiechina
2024-04-11 15:08:44 +08:00
parent d820efadaf
commit 9f22cb7829
4 changed files with 59 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api.go
View File

@@ -71,7 +71,7 @@ func (api *ApiServer) generateSinkId(remoteAddr string) stream.SinkId {
func (api *ApiServer) doPlay(sink stream.ISink) utils.HookState {
ok := utils.HookStateOK
sink.Play(func() {
stream.HookPlaying(sink, func() {
}, func(state utils.HookState) {
ok = state

2
rtc.html
View File

@@ -86,6 +86,8 @@
pc.onicecandidate = function (event) {
console.log("ice candidate:" + event.candidate)
}
console.log("offer:" + offer.sdp);
fetch(url, {
method: 'POST',
body: JSON.stringify(data),

5
rtsp/rtsp_server.go
View File

@@ -4,6 +4,7 @@ import (
"fmt"
"github.com/yangjiechina/avformat/transport"
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/live-server/log"
"net"
"net/textproto"
)
@@ -60,6 +61,8 @@ func (s *serverImpl) Close() {
}
func (s *serverImpl) OnConnected(conn net.Conn) {
log.Sugar.Debugf("rtsp连接 conn:%s", conn.RemoteAddr().String())
t := conn.(*transport.Conn)
t.Data = NewSession(conn)
}
@@ -83,5 +86,7 @@ func (s *serverImpl) OnPacket(conn net.Conn, data []byte) {
}
func (s *serverImpl) OnDisConnected(conn net.Conn, err error) {
log.Sugar.Debugf("rtsp断开连接 conn:%s", conn.RemoteAddr().String())
s.closeSession(conn)
}

112
rtsp/rtsp_stream.go
View File

@@ -8,6 +8,7 @@ import (
"github.com/yangjiechina/avformat/utils"
"github.com/yangjiechina/live-server/stream"
"net"
"strconv"
)
const (
@@ -132,8 +133,8 @@ func (t *tranStream) Input(packet utils.AVPacket) error {
}
func (t *tranStream) AddSink(sink_ stream.ISink) error {
sink_.(*sink).setTrackCount(len(t.TransStreamImpl.Tracks))
if err := sink_.SendHeader([]byte(t.sdp)); err != nil {
sink_.(*Sink).setTrackCount(len(t.TransStreamImpl.Tracks))
if err := sink_.(*Sink).SendHeader([]byte(t.sdp)); err != nil {
return err
}
@@ -186,68 +187,58 @@ func (t *tranStream) WriteHeader() error {
RepeatTimes: nil,
},
},
}
MediaDescriptions: []*sdp.MediaDescription{
{
MediaName: sdp.MediaName{
Media: "video",
Protos: []string{"RTP", "AVP"},
Formats: []string{"108"},
},
ConnectionInformation: &sdp.ConnectionInformation{
NetworkType: "IN",
AddressType: t.addrType,
Address: &sdp.Address{Address: t.addr.IP.String()},
},
Attributes: []sdp.Attribute{
sdp.NewAttribute("recvonly", ""),
sdp.NewAttribute("control:"+fmt.Sprintf(t.urlFormat, 0), ""),
sdp.NewAttribute("rtpmap:108 H264/90000", ""),
},
for i, track := range t.Tracks {
payloadType, _ := librtp.CodecIdPayloads[track.CodecId()]
mediaDescription := sdp.MediaDescription{
ConnectionInformation: &sdp.ConnectionInformation{
NetworkType: "IN",
AddressType: t.addrType,
Address: &sdp.Address{Address: t.addr.IP.String()},
},
{
MediaName: sdp.MediaName{
Media: "audio",
Protos: []string{"RTP", "AVP"},
Formats: []string{"97"},
},
ConnectionInformation: &sdp.ConnectionInformation{
NetworkType: "IN",
AddressType: t.addrType,
Address: &sdp.Address{Address: t.addr.IP.String()},
},
Attributes: []sdp.Attribute{
sdp.NewAttribute("recvonly", ""),
sdp.NewAttribute("control:"+fmt.Sprintf(t.urlFormat, 1), ""),
//用MP4A-LATM更准确一点
sdp.NewAttribute("rtpmap:97 mpeg4-generic/48000", ""),
//[14496-3], [RFC6416] profile-level-id:
//1 : Main Audio Profile Level 1
//9 : Speech Audio Profile Level 1
//15: High Quality Audio Profile Level 2
//30: Natural Audio Profile Level 1
//44: High Efficiency AAC Profile Level 2
//48: High Efficiency AAC v2 Profile Level 2
//55: Baseline MPEG Surround Profile (see ISO/IEC 23003-1) Level 3
//[RFC5619]
//a=fmtp:96 streamType=5; profile-level-id=44; mode=AAC-hbr; config=131
// 056E598; sizeLength=13; indexLength=3; indexDeltaLength=3; constant
// Duration=2048; MPS-profile-level-id=55; MPS-config=F1B4CF920442029B
// 501185B6DA00;
//低比特率用sizelength=6;indexlength=2;indexdeltalength=2
//[RFC3640]
//mode=AAC-hbr
sdp.NewAttribute("fmtp:97 profile-level-id=1;mode=AAC-hbr;sizelength=13;indexlength=3;indexdeltalength=3;", ""),
},
Attributes: []sdp.Attribute{
sdp.NewAttribute("recvonly", ""),
sdp.NewAttribute("control:"+fmt.Sprintf(t.urlFormat, i), ""),
sdp.NewAttribute(fmt.Sprintf("rtpmap:%d %s/%d", payloadType.Pt, payloadType.Encoding, payloadType.ClockRate), ""),
},
},
}
mediaDescription.MediaName.Protos = []string{"RTP", "AVP"}
mediaDescription.MediaName.Formats = []string{strconv.Itoa(payloadType.Pt)}
if utils.AVMediaTypeAudio == track.Type() {
mediaDescription.MediaName.Media = "audio"
if utils.AVCodecIdAAC == track.CodecId() {
//[14496-3], [RFC6416] profile-level-id:
//1 : Main Audio Profile Level 1
//9 : Speech Audio Profile Level 1
//15: High Quality Audio Profile Level 2
//30: Natural Audio Profile Level 1
//44: High Efficiency AAC Profile Level 2
//48: High Efficiency AAC v2 Profile Level 2
//55: Baseline MPEG Surround Profile (see ISO/IEC 23003-1) Level 3
//[RFC5619]
//a=fmtp:96 streamType=5; profile-level-id=44; mode=AAC-hbr; config=131
// 056E598; sizeLength=13; indexLength=3; indexDeltaLength=3; constant
// Duration=2048; MPS-profile-level-id=55; MPS-config=F1B4CF920442029B
// 501185B6DA00;
//低比特率用sizelength=6;indexlength=2;indexdeltalength=2
//[RFC3640]
//mode=AAC-hbr
fmtp := sdp.NewAttribute("fmtp:97 profile-level-id=1;mode=AAC-hbr;sizelength=13;indexlength=3;indexdeltalength=3;", "")
mediaDescription.Attributes = append(mediaDescription.Attributes, fmtp)
}
} else {
mediaDescription.MediaName.Media = "video"
}
description.MediaDescriptions = append(description.MediaDescriptions, &mediaDescription)
}
marshal, err := description.Marshal()
@@ -255,7 +246,6 @@ func (t *tranStream) WriteHeader() error {
return err
}
println(marshal)
t.sdp = string(marshal)
return nil
}