-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
move interleaved frames logic into rtsp.Conn
- Loading branch information
Showing
3 changed files
with
94 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,86 @@ | ||
| package rtsp | ||
|
|
||
| import ( | ||
| "encoding/binary" | ||
| "fmt" | ||
| "io" | ||
| "net" | ||
| ) | ||
|
|
||
| type Conn struct { | ||
| net.Conn | ||
| c net.Conn | ||
| writeBuf []byte | ||
| } | ||
|
|
||
| func NewConn(c net.Conn) *Conn { | ||
| return &Conn{ | ||
| c: c, | ||
| writeBuf: make([]byte, 2048), | ||
| } | ||
| } | ||
|
|
||
| func (c *Conn) Close() error { | ||
| return c.c.Close() | ||
| } | ||
|
|
||
| func (c *Conn) RemoteAddr() net.Addr { | ||
| return c.c.RemoteAddr() | ||
| } | ||
|
|
||
| func (c *Conn) ReadRequest() (*Request, error) { | ||
| return requestDecode(c) | ||
| return requestDecode(c.c) | ||
| } | ||
|
|
||
| func (c *Conn) WriteRequest(req *Request) error { | ||
| return requestEncode(c, req) | ||
| return requestEncode(c.c, req) | ||
| } | ||
|
|
||
| func (c *Conn) ReadResponse() (*Response, error) { | ||
| return responseDecode(c) | ||
| return responseDecode(c.c) | ||
| } | ||
|
|
||
| func (c *Conn) WriteResponse(res *Response) error { | ||
| return responseEncode(c, res) | ||
| return responseEncode(c.c, res) | ||
| } | ||
|
|
||
| func (c *Conn) ReadInterleavedFrame(frame []byte) (int, error) { | ||
| var header [4]byte | ||
| _, err := io.ReadFull(c.c, header[:]) | ||
| if err != nil { | ||
| return 0, err | ||
| } | ||
|
|
||
| // connection terminated | ||
| if header[0] == 0x54 { | ||
| return 0, io.EOF | ||
| } | ||
|
|
||
| if header[0] != 0x24 { | ||
| return 0, fmt.Errorf("wrong magic byte (0x%.2x)", header[0]) | ||
| } | ||
|
|
||
| framelen := binary.BigEndian.Uint16(header[2:]) | ||
| if framelen > 2048 { | ||
| return 0, fmt.Errorf("frame length greater than 2048") | ||
| } | ||
|
|
||
| _, err = io.ReadFull(c.c, frame[:framelen]) | ||
| if err != nil { | ||
| return 0, err | ||
| } | ||
|
|
||
| return int(framelen), nil | ||
| } | ||
|
|
||
| func (c *Conn) WriteInterleavedFrame(frame []byte) error { | ||
| c.writeBuf[0] = 0x24 | ||
| c.writeBuf[1] = 0x00 | ||
| binary.BigEndian.PutUint16(c.writeBuf[2:], uint16(len(frame))) | ||
| n := copy(c.writeBuf[4:], frame) | ||
|
|
||
| _, err := c.c.Write(c.writeBuf[:4+n]) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters