mirror of
https://gitlab.crans.org/nounous/ghostream.git
synced 2024-12-23 00:22:19 +00:00
Simplify SRT handling
This commit is contained in:
parent
0adecb07cd
commit
ad26242d4a
@ -36,37 +36,25 @@ func Serve(cfg *Options) {
|
|||||||
options := make(map[string]string)
|
options := make(map[string]string)
|
||||||
options["transtype"] = "live"
|
options["transtype"] = "live"
|
||||||
|
|
||||||
|
// Start SRT in listen mode
|
||||||
log.Printf("SRT server listening on %s", cfg.ListenAddress)
|
log.Printf("SRT server listening on %s", cfg.ListenAddress)
|
||||||
host, port := splitHostPort(cfg.ListenAddress)
|
host, port := splitHostPort(cfg.ListenAddress)
|
||||||
sck := srtgo.NewSrtSocket(host, uint16(port), options)
|
sck := srtgo.NewSrtSocket(host, uint16(port), options)
|
||||||
sck.Listen(cfg.MaxClients)
|
sck.Listen(cfg.MaxClients)
|
||||||
|
|
||||||
|
// FIXME: See srtgo.SocketOptions and value, err := s.GetSockOptString to get parameters
|
||||||
|
// http://ffmpeg.org/ffmpeg-protocols.html#srt
|
||||||
|
|
||||||
for {
|
for {
|
||||||
|
// Wait for new connection
|
||||||
s, err := sck.Accept()
|
s, err := sck.Accept()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Println("Error occurred while accepting request:", err)
|
log.Println("Error occurred while accepting request:", err)
|
||||||
continue
|
break // FIXME: should not break here
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Create a new buffer
|
||||||
buff := make([]byte, 2048)
|
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
|
// Read RTP packets forever and send them to the WebRTC Client
|
||||||
for {
|
for {
|
||||||
@ -76,15 +64,24 @@ func Serve(cfg *Options) {
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if n == 0 {
|
||||||
|
// End of stream
|
||||||
|
log.Printf("Received no bytes, stopping stream.")
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
log.Printf("Received %d bytes", n)
|
log.Printf("Received %d bytes", n)
|
||||||
|
|
||||||
|
// Unmarshal incoming packet
|
||||||
packet := &rtp.Packet{}
|
packet := &rtp.Packet{}
|
||||||
if err := packet.Unmarshal(buff[:n]); err != nil {
|
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)
|
//err := videoTrack.WriteRTP(packet)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user