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

reuse write and read buffers when possible

Browse Source
This commit is contained in:
aler9
2020-01-26 16:06:32 +01:00
parent 9d2081e29c
commit 3e1082bc89
9 changed files with 56 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
connclient.go
View File

@@ -8,6 +8,7 @@ import (
type ConnClient struct { type ConnClient struct {
nconn net.Conn nconn net.Conn
br *bufio.Reader
bw *bufio.Writer bw *bufio.Writer
session string session string
cseqEnabled bool cseqEnabled bool
@@ -18,7 +19,8 @@ type ConnClient struct {
func NewConnClient(nconn net.Conn) *ConnClient { func NewConnClient(nconn net.Conn) *ConnClient {
return &ConnClient{ return &ConnClient{
nconn: nconn, nconn: nconn,
bw: bufio.NewWriterSize(nconn, _INTERLEAVED_FRAME_MAX_SIZE), br: bufio.NewReaderSize(nconn, 4096),
bw: bufio.NewWriterSize(nconn, 4096),
} }
} }
@@ -58,15 +60,15 @@ func (c *ConnClient) WriteRequest(req *Request) error {
} }
req.Header["Authorization"] = []string{c.authProv.generateHeader(req.Method, req.Url)} req.Header["Authorization"] = []string{c.authProv.generateHeader(req.Method, req.Url)}
} }
return req.write(c.nconn) return req.write(c.bw)
} }
func (c *ConnClient) ReadResponse() (*Response, error) { func (c *ConnClient) ReadResponse() (*Response, error) {
return readResponse(c.nconn) return readResponse(c.br)
} }
func (c *ConnClient) ReadInterleavedFrame() (*InterleavedFrame, error) { func (c *ConnClient) ReadInterleavedFrame() (*InterleavedFrame, error) {
return readInterleavedFrame(c.nconn) return readInterleavedFrame(c.br)
} }
func (c *ConnClient) WriteInterleavedFrame(frame *InterleavedFrame) error { func (c *ConnClient) WriteInterleavedFrame(frame *InterleavedFrame) error {

10
connserver.go
View File

@@ -7,13 +7,15 @@ import (
type ConnServer struct { type ConnServer struct {
nconn net.Conn nconn net.Conn
br *bufio.Reader
bw *bufio.Writer bw *bufio.Writer
} }
func NewConnServer(nconn net.Conn) *ConnServer { func NewConnServer(nconn net.Conn) *ConnServer {
return &ConnServer{ return &ConnServer{
nconn: nconn, nconn: nconn,
bw: bufio.NewWriterSize(nconn, _INTERLEAVED_FRAME_MAX_SIZE), br: bufio.NewReaderSize(nconn, 4096),
bw: bufio.NewWriterSize(nconn, 4096),
} }
} }
@@ -22,15 +24,15 @@ func (s *ConnServer) NetConn() net.Conn {
} }
func (s *ConnServer) ReadRequest() (*Request, error) { func (s *ConnServer) ReadRequest() (*Request, error) {
return readRequest(s.nconn) return readRequest(s.br)
} }
func (s *ConnServer) WriteResponse(res *Response) error { func (s *ConnServer) WriteResponse(res *Response) error {
return res.write(s.nconn) return res.write(s.bw)
} }
func (s *ConnServer) ReadInterleavedFrame() (*InterleavedFrame, error) { func (s *ConnServer) ReadInterleavedFrame() (*InterleavedFrame, error) {
return readInterleavedFrame(s.nconn) return readInterleavedFrame(s.br)
} }
func (s *ConnServer) WriteInterleavedFrame(frame *InterleavedFrame) error { func (s *ConnServer) WriteInterleavedFrame(frame *InterleavedFrame) error {

2
header_test.go
View File

@@ -53,8 +53,8 @@ func TestHeaderWrite(t *testing.T) {
var buf bytes.Buffer var buf bytes.Buffer
bw := bufio.NewWriter(&buf) bw := bufio.NewWriter(&buf)
err := c.header.write(bw) err := c.header.write(bw)
bw.Flush()
require.NoError(t, err) require.NoError(t, err)
bw.Flush()
require.Equal(t, c.byts, buf.Bytes()) require.Equal(t, c.byts, buf.Bytes())
}) })
} }

5
interleavedframe.go
View File

@@ -24,11 +24,6 @@ func readInterleavedFrame(r io.Reader) (*InterleavedFrame, error) {
return nil, err return nil, err
} }
// connection terminated
if header[0] == 0x54 {
return nil, io.EOF
}
if header[0] != 0x24 { if header[0] != 0x24 {
return nil, fmt.Errorf("wrong magic byte (0x%.2x)", header[0]) return nil, fmt.Errorf("wrong magic byte (0x%.2x)", header[0])
} }

29
request.go
View File

@@ -3,7 +3,6 @@ package gortsplib
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"io"
) )
type Request struct { type Request struct {
@@ -13,12 +12,10 @@ type Request struct {
Content []byte Content []byte
} }
func readRequest(r io.Reader) (*Request, error) { func readRequest(br *bufio.Reader) (*Request, error) {
rb := bufio.NewReader(r)
req := &Request{} req := &Request{}
byts, err := readBytesLimited(rb, ' ', 255) byts, err := readBytesLimited(br, ' ', 255)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -28,7 +25,7 @@ func readRequest(r io.Reader) (*Request, error) {
return nil, fmt.Errorf("empty method") return nil, fmt.Errorf("empty method")
} }
byts, err = readBytesLimited(rb, ' ', 255) byts, err = readBytesLimited(br, ' ', 255)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -38,7 +35,7 @@ func readRequest(r io.Reader) (*Request, error) {
return nil, fmt.Errorf("empty path") return nil, fmt.Errorf("empty path")
} }
byts, err = readBytesLimited(rb, '\r', 255) byts, err = readBytesLimited(br, '\r', 255)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -48,17 +45,17 @@ func readRequest(r io.Reader) (*Request, error) {
return nil, fmt.Errorf("expected '%s', got '%s'", _RTSP_PROTO, proto) return nil, fmt.Errorf("expected '%s', got '%s'", _RTSP_PROTO, proto)
} }
err = readByteEqual(rb, '\n') err = readByteEqual(br, '\n')
if err != nil { if err != nil {
return nil, err return nil, err
} }
req.Header, err = readHeader(rb) req.Header, err = readHeader(br)
if err != nil { if err != nil {
return nil, err return nil, err
} }
req.Content, err = readContent(rb, req.Header) req.Content, err = readContent(br, req.Header)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -66,23 +63,21 @@ func readRequest(r io.Reader) (*Request, error) {
return req, nil return req, nil
} }
func (req *Request) write(w io.Writer) error { func (req *Request) write(bw *bufio.Writer) error {
wb := bufio.NewWriter(w) _, err := bw.Write([]byte(req.Method + " " + req.Url + " " + _RTSP_PROTO + "\r\n"))
_, err := wb.Write([]byte(req.Method + " " + req.Url + " " + _RTSP_PROTO + "\r\n"))
if err != nil { if err != nil {
return err return err
} }
err = req.Header.write(wb) err = req.Header.write(bw)
if err != nil { if err != nil {
return err return err
} }
err = writeContent(wb, req.Content) err = writeContent(bw, req.Content)
if err != nil { if err != nil {
return err return err
} }
return wb.Flush() return bw.Flush()
} }

7
request_test.go
View File

@@ -1,6 +1,7 @@
package gortsplib package gortsplib
import ( import (
"bufio"
"bytes" "bytes"
"testing" "testing"
@@ -115,7 +116,7 @@ var casesRequest = []struct {
func TestRequestRead(t *testing.T) { func TestRequestRead(t *testing.T) {
for _, c := range casesRequest { for _, c := range casesRequest {
t.Run(c.name, func(t *testing.T) { t.Run(c.name, func(t *testing.T) {
req, err := readRequest(bytes.NewBuffer(c.byts)) req, err := readRequest(bufio.NewReader(bytes.NewBuffer(c.byts)))
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, c.req, req) require.Equal(t, c.req, req)
}) })
@@ -126,8 +127,10 @@ func TestRequestWrite(t *testing.T) {
for _, c := range casesRequest { for _, c := range casesRequest {
t.Run(c.name, func(t *testing.T) { t.Run(c.name, func(t *testing.T) {
var buf bytes.Buffer var buf bytes.Buffer
err := c.req.write(&buf) bw := bufio.NewWriter(&buf)
err := c.req.write(bw)
require.NoError(t, err) require.NoError(t, err)
bw.Flush()
require.Equal(t, c.byts, buf.Bytes()) require.Equal(t, c.byts, buf.Bytes())
}) })
} }

29
response.go
View File

@@ -3,7 +3,6 @@ package gortsplib
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"io"
"strconv" "strconv"
) )
@@ -14,12 +13,10 @@ type Response struct {
Content []byte Content []byte
} }
func readResponse(r io.Reader) (*Response, error) { func readResponse(br *bufio.Reader) (*Response, error) {
rb := bufio.NewReader(r)
res := &Response{} res := &Response{}
byts, err := readBytesLimited(rb, ' ', 255) byts, err := readBytesLimited(br, ' ', 255)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -29,7 +26,7 @@ func readResponse(r io.Reader) (*Response, error) {
return nil, fmt.Errorf("expected '%s', got '%s'", _RTSP_PROTO, proto) return nil, fmt.Errorf("expected '%s', got '%s'", _RTSP_PROTO, proto)
} }
byts, err = readBytesLimited(rb, ' ', 4) byts, err = readBytesLimited(br, ' ', 4)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -41,7 +38,7 @@ func readResponse(r io.Reader) (*Response, error) {
return nil, fmt.Errorf("unable to parse status code") return nil, fmt.Errorf("unable to parse status code")
} }
byts, err = readBytesLimited(rb, '\r', 255) byts, err = readBytesLimited(br, '\r', 255)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -51,17 +48,17 @@ func readResponse(r io.Reader) (*Response, error) {
return nil, fmt.Errorf("empty status") return nil, fmt.Errorf("empty status")
} }
err = readByteEqual(rb, '\n') err = readByteEqual(br, '\n')
if err != nil { if err != nil {
return nil, err return nil, err
} }
res.Header, err = readHeader(rb) res.Header, err = readHeader(br)
if err != nil { if err != nil {
return nil, err return nil, err
} }
res.Content, err = readContent(rb, res.Header) res.Content, err = readContent(br, res.Header)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -69,10 +66,8 @@ func readResponse(r io.Reader) (*Response, error) {
return res, nil return res, nil
} }
func (res *Response) write(w io.Writer) error { func (res *Response) write(bw *bufio.Writer) error {
wb := bufio.NewWriter(w) _, err := bw.Write([]byte(_RTSP_PROTO + " " + strconv.FormatInt(int64(res.StatusCode), 10) + " " + res.Status + "\r\n"))
_, err := wb.Write([]byte(_RTSP_PROTO + " " + strconv.FormatInt(int64(res.StatusCode), 10) + " " + res.Status + "\r\n"))
if err != nil { if err != nil {
return err return err
} }
@@ -81,15 +76,15 @@ func (res *Response) write(w io.Writer) error {
res.Header["Content-Length"] = []string{strconv.FormatInt(int64(len(res.Content)), 10)} res.Header["Content-Length"] = []string{strconv.FormatInt(int64(len(res.Content)), 10)}
} }
err = res.Header.write(wb) err = res.Header.write(bw)
if err != nil { if err != nil {
return err return err
} }
err = writeContent(wb, res.Content) err = writeContent(bw, res.Content)
if err != nil { if err != nil {
return err return err
} }
return wb.Flush() return bw.Flush()
} }

7
response_test.go
View File

@@ -1,6 +1,7 @@
package gortsplib package gortsplib
import ( import (
"bufio"
"bytes" "bytes"
"testing" "testing"
@@ -110,7 +111,7 @@ var casesResponse = []struct {
func TestResponseRead(t *testing.T) { func TestResponseRead(t *testing.T) {
for _, c := range casesResponse { for _, c := range casesResponse {
t.Run(c.name, func(t *testing.T) { t.Run(c.name, func(t *testing.T) {
res, err := readResponse(bytes.NewBuffer(c.byts)) res, err := readResponse(bufio.NewReader(bytes.NewBuffer(c.byts)))
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, c.res, res) require.Equal(t, c.res, res)
}) })
@@ -121,8 +122,10 @@ func TestResponseWrite(t *testing.T) {
for _, c := range casesResponse { for _, c := range casesResponse {
t.Run(c.name, func(t *testing.T) { t.Run(c.name, func(t *testing.T) {
var buf bytes.Buffer var buf bytes.Buffer
err := c.res.write(&buf) bw := bufio.NewWriter(&buf)
err := c.res.write(bw)
require.NoError(t, err) require.NoError(t, err)
bw.Flush()
require.Equal(t, c.byts, buf.Bytes()) require.Equal(t, c.byts, buf.Bytes())
}) })
} }

18
utils.go
View File

@@ -12,23 +12,23 @@ const (
_MAX_CONTENT_LENGTH = 4096 _MAX_CONTENT_LENGTH = 4096
) )
func readBytesLimited(rb *bufio.Reader, delim byte, n int) ([]byte, error) { func readBytesLimited(br *bufio.Reader, delim byte, n int) ([]byte, error) {
for i := 1; i <= n; i++ { for i := 1; i <= n; i++ {
byts, err := rb.Peek(i) byts, err := br.Peek(i)
if err != nil { if err != nil {
return nil, err return nil, err
} }
if byts[len(byts)-1] == delim { if byts[len(byts)-1] == delim {
rb.Discard(len(byts)) br.Discard(len(byts))
return byts, nil return byts, nil
} }
} }
return nil, fmt.Errorf("buffer length exceeds %d", n) return nil, fmt.Errorf("buffer length exceeds %d", n)
} }
func readByteEqual(rb *bufio.Reader, cmp byte) error { func readByteEqual(br *bufio.Reader, cmp byte) error {
byt, err := rb.ReadByte() byt, err := br.ReadByte()
if err != nil { if err != nil {
return err return err
} }
@@ -40,7 +40,7 @@ func readByteEqual(rb *bufio.Reader, cmp byte) error {
return nil return nil
} }
func readContent(rb *bufio.Reader, header Header) ([]byte, error) { func readContent(br *bufio.Reader, header Header) ([]byte, error) {
cls, ok := header["Content-Length"] cls, ok := header["Content-Length"]
if !ok || len(cls) != 1 { if !ok || len(cls) != 1 {
return nil, nil return nil, nil
@@ -56,7 +56,7 @@ func readContent(rb *bufio.Reader, header Header) ([]byte, error) {
} }
ret := make([]byte, cl) ret := make([]byte, cl)
n, err := io.ReadFull(rb, ret) n, err := io.ReadFull(br, ret)
if err != nil && n != len(ret) { if err != nil && n != len(ret) {
return nil, err return nil, err
} }
@@ -64,12 +64,12 @@ func readContent(rb *bufio.Reader, header Header) ([]byte, error) {
return ret, nil return ret, nil
} }
func writeContent(wb *bufio.Writer, content []byte) error { func writeContent(bw *bufio.Writer, content []byte) error {
if len(content) == 0 { if len(content) == 0 {
return nil return nil
} }
_, err := wb.Write(content) _, err := bw.Write(content)
if err != nil { if err != nil {
return err return err
} }