mirror of
https://github.com/aler9/gortsplib
synced 2025-10-07 08:01:14 +08:00
rename Read / Write into Unmarshal / Marshal when needed
Read() / Write() are used to read / write from streams, while Unmarshal() / Marshal() are used to decode / encode from / to bytes.
This commit is contained in:
@@ -77,7 +77,7 @@ type InterleavedFrame struct {
|
||||
Payload []byte
|
||||
}
|
||||
|
||||
// Read reads an interleaved frame.
|
||||
// Read decodes an interleaved frame.
|
||||
func (f *InterleavedFrame) Read(maxPayloadSize int, br *bufio.Reader) error {
|
||||
var header [4]byte
|
||||
_, err := io.ReadFull(br, header[:])
|
||||
@@ -105,13 +105,13 @@ func (f *InterleavedFrame) Read(maxPayloadSize int, br *bufio.Reader) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// WriteSize returns the size of an InterleavedFrame.
|
||||
func (f InterleavedFrame) WriteSize() int {
|
||||
// MarshalSize returns the size of an InterleavedFrame.
|
||||
func (f InterleavedFrame) MarshalSize() int {
|
||||
return 4 + len(f.Payload)
|
||||
}
|
||||
|
||||
// WriteTo writes an InterleavedFrame.
|
||||
func (f InterleavedFrame) WriteTo(buf []byte) (int, error) {
|
||||
// MarshalTo writes an InterleavedFrame.
|
||||
func (f InterleavedFrame) MarshalTo(buf []byte) (int, error) {
|
||||
pos := 0
|
||||
|
||||
pos += copy(buf[pos:], []byte{0x24, byte(f.Channel)})
|
||||
@@ -124,9 +124,9 @@ func (f InterleavedFrame) WriteTo(buf []byte) (int, error) {
|
||||
return pos, nil
|
||||
}
|
||||
|
||||
// Write writes an InterleavedFrame.
|
||||
func (f InterleavedFrame) Write() ([]byte, error) {
|
||||
buf := make([]byte, f.WriteSize())
|
||||
_, err := f.WriteTo(buf)
|
||||
// Marshal writes an InterleavedFrame.
|
||||
func (f InterleavedFrame) Marshal() ([]byte, error) {
|
||||
buf := make([]byte, f.MarshalSize())
|
||||
_, err := f.MarshalTo(buf)
|
||||
return buf, err
|
||||
}
|
||||
|
Reference in New Issue
Block a user