package/gortsplib
1
0
Fork 0
mirror of https://github.com/aler9/gortsplib synced 2025-10-10 01:20:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

reuse structs when reading Requests, Responses and Headers

Browse Source
This commit is contained in:
aler9
2020-10-06 10:07:57 +02:00
parent cbf56d59d9
commit eba2fb39d1
11 changed files with 135 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
base/interleavedframe.go
View File

@@ -11,8 +11,8 @@ const (
interleavedFrameMagicByte = 0x24
)
// ReadInterleavedFrameOrResponse reads an InterleavedFrame or a Response.
func ReadInterleavedFrameOrResponse(frame *InterleavedFrame, br *bufio.Reader) (interface{}, error) {
// ReadInterleavedFrameOrRequest reads an InterleavedFrame or a Response.
func ReadInterleavedFrameOrRequest(frame *InterleavedFrame, req *Request, br *bufio.Reader) (interface{}, error) {
b, err := br.ReadByte()
if err != nil {
return nil, err
@@ -27,11 +27,15 @@ func ReadInterleavedFrameOrResponse(frame *InterleavedFrame, br *bufio.Reader) (
return frame, err
}
return ReadResponse(br)
err = req.Read(br)
if err != nil {
return nil, err
}
return req, nil
}
// ReadInterleavedFrameOrRequest reads an InterleavedFrame or a Response.
func ReadInterleavedFrameOrRequest(frame *InterleavedFrame, br *bufio.Reader) (interface{}, error) {
// ReadInterleavedFrameOrResponse reads an InterleavedFrame or a Response.
func ReadInterleavedFrameOrResponse(frame *InterleavedFrame, res *Response, br *bufio.Reader) (interface{}, error) {
b, err := br.ReadByte()
if err != nil {
return nil, err
@@ -46,7 +50,11 @@ func ReadInterleavedFrameOrRequest(frame *InterleavedFrame, br *bufio.Reader) (i
return frame, err
}
return ReadRequest(br)
err = res.Read(br)
if err != nil {
return nil, err
}
return res, nil
}
// InterleavedFrame is an interleaved frame, and allows to transfer binary data