ynerant/ghostream
1
0
Fork 0
mirror of https://gitlab.crans.org/nounous/ghostream.git synced 2024-12-22 13:52:19 +00:00
Code Issues Releases Wiki Activity

Simplify SRT handling

Browse Source
This commit is contained in:
Alexandre Iooss 2020-09-29 20:58:55 +02:00
parent 0adecb07cd
commit ad26242d4a
No known key found for this signature in database
GPG Key ID: 6C79278F3FCDCC02
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
stream/srt/srt.go
View File

@ -36,37 +36,25 @@ func Serve(cfg *Options) {
options := make(map[string]string)
options["transtype"] = "live"
// Start SRT in listen mode
log.Printf("SRT server listening on %s", cfg.ListenAddress)
host, port := splitHostPort(cfg.ListenAddress)
sck := srtgo.NewSrtSocket(host, uint16(port), options)
sck.Listen(cfg.MaxClients)
// FIXME: See srtgo.SocketOptions and value, err := s.GetSockOptString to get parameters
// http://ffmpeg.org/ffmpeg-protocols.html#srt
for {
// Wait for new connection
s, err := sck.Accept()
if err != nil {
log.Println("Error occurred while accepting request:", err)
continue
break // FIXME: should not break here
}
// Create a new buffer
buff := make([]byte, 2048)
n, err := s.Read(buff, 10000)
if err != nil {
log.Println("Error occurred while reading SRT socket:", err)
break
}
if n == 0 {
// End of stream
break
}
// Unmarshal the incoming packet
packet := &rtp.Packet{}
if err = packet.Unmarshal(buff[:n]); err != nil {
log.Println("Error occured while unmarshaling SRT:", err)
break
}
// videoTrack, err := peerConnection.NewTrack(payloadType, packet.SSRC, "video", "pion")
// Read RTP packets forever and send them to the WebRTC Client
for {
@ -76,15 +64,24 @@ func Serve(cfg *Options) {
break
}
if n == 0 {
// End of stream
log.Printf("Received no bytes, stopping stream.")
break
}
log.Printf("Received %d bytes", n)
// Unmarshal incoming packet
packet := &rtp.Packet{}
if err := packet.Unmarshal(buff[:n]); err != nil {
panic(err)
log.Println("Error occured while unmarshaling SRT:", err)
break
}
payloadType := uint8(22) // FIXME put vp8 payload
packet.Header.PayloadType = payloadType
// TODO: Send to WebRTC
//payloadType := uint8(22) // FIXME put vp8 payload
//packet.Header.PayloadType = payloadType
//err := videoTrack.WriteRTP(packet)
}
}