gilles/go2rtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code refactoring for source bubble

Browse Source
This commit is contained in:
Alexey Khit
2023-07-15 14:43:28 +03:00
parent 5c93dc62bd
commit facf18e0df
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/bubble/client.go
+14 -7
View File
@@ -61,17 +61,24 @@ func (c *Client) Dial() (err error) {
return return
} }
c.conn, err = net.DialTimeout("tcp4", u.Host, Timeout) if c.conn, err = net.DialTimeout("tcp4", u.Host, Timeout); err != nil {
return
}
if err = c.conn.SetDeadline(time.Now().Add(Timeout)); err != nil { if err = c.conn.SetDeadline(time.Now().Add(Timeout)); err != nil {
return err return
} }
req := &tcp.Request{Method: "GET", URL: &url.URL{Path: u.Path, RawQuery: u.RawQuery}, Proto: "HTTP/1.1"} req := &tcp.Request{Method: "GET", URL: &url.URL{Path: u.Path, RawQuery: u.RawQuery}, Proto: "HTTP/1.1"}
err = req.Write(c.conn) if err = req.Write(c.conn); err != nil {
return
}
c.r = bufio.NewReader(c.conn) c.r = bufio.NewReader(c.conn)
res, err := tcp.ReadResponse(c.r) res, err := tcp.ReadResponse(c.r)
if err != nil {
return
}
if res.StatusCode != http.StatusOK { if res.StatusCode != http.StatusOK {
return errors.New("wrong response: " + res.Status) return errors.New("wrong response: " + res.Status)
@@ -120,7 +127,7 @@ func (c *Client) Dial() (err error) {
} }
// 3. Read response // 3. Read response
cmd, b, err := c.Read() // don't know how to parse cmd, b, err := c.Read()
if err != nil { if err != nil {
return return
} }
@@ -137,7 +144,7 @@ func (c *Client) Write(command byte, timestamp uint32, payload []byte) error {
return err return err
} }
// 0xAA + size uint32 + cmd byte + ts uint32 + size2 uint32 + payload // 0xAA + size uint32 + cmd byte + ts uint32 + payload
b := make([]byte, 14+len(payload)) b := make([]byte, 14+len(payload))
b[0] = SyncByte b[0] = SyncByte
binary.BigEndian.PutUint32(b[1:], uint32(5+len(payload))) binary.BigEndian.PutUint32(b[1:], uint32(5+len(payload)))
@@ -154,7 +161,7 @@ func (c *Client) Read() (byte, []byte, error) {
return 0, nil, err return 0, nil, err
} }
// 0xAA + size uint32 + cmd byte + ts uint32 + size2 uint32 // 0xAA + size uint32 + cmd byte + ts uint32 + payload
b := make([]byte, 10) b := make([]byte, 10)
if _, err := io.ReadFull(c.r, b); err != nil { if _, err := io.ReadFull(c.r, b); err != nil {
return 0, nil, err return 0, nil, err
@@ -232,7 +239,7 @@ func (c *Client) Handle() error {
Version: 2, Version: 2,
Timestamp: audioTS, Timestamp: audioTS,
}, },
Payload: b[6+36:], // don't know what is in first 36 bytes Payload: b[6+36:],
} }
audioTS += uint32(len(pkt.Payload)) audioTS += uint32(len(pkt.Payload))
c.audioTrack.WriteRTP(pkt) c.audioTrack.WriteRTP(pkt)