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

rename ClientConn.OnFrame into ReadFrames

Browse Source
This commit is contained in:
aler9
2020-12-08 21:18:52 +01:00
parent c7f6d77392
commit 081e28ee38
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
clientconf_test.go
View File

@@ -101,7 +101,7 @@ func TestDialRead(t *testing.T) {
var firstFrame int32
frameRecv := make(chan struct{})
done := conn.OnFrame(func(id int, typ StreamType, content []byte) {
done := conn.ReadFrames(func(id int, typ StreamType, content []byte) {
if atomic.SwapInt32(&firstFrame, 1) == 0 {
close(frameRecv)
}
@@ -111,7 +111,7 @@ func TestDialRead(t *testing.T) {
conn.Close()
<-done
done = conn.OnFrame(func(id int, typ StreamType, content []byte) {
done = conn.ReadFrames(func(id int, typ StreamType, content []byte) {
t.Error("should not happen")
})
<-done
@@ -149,7 +149,7 @@ func TestDialReadAutomaticProtocol(t *testing.T) {
var firstFrame int32
frameRecv := make(chan struct{})
done := conn.OnFrame(func(id int, typ StreamType, content []byte) {
done := conn.ReadFrames(func(id int, typ StreamType, content []byte) {
if atomic.SwapInt32(&firstFrame, 1) == 0 {
close(frameRecv)
}
@@ -192,7 +192,7 @@ func TestDialReadRedirect(t *testing.T) {
var firstFrame int32
frameRecv := make(chan struct{})
done := conn.OnFrame(func(id int, typ StreamType, content []byte) {
done := conn.ReadFrames(func(id int, typ StreamType, content []byte) {
if atomic.SwapInt32(&firstFrame, 1) == 0 {
close(frameRecv)
}
@@ -245,7 +245,7 @@ func TestDialReadPause(t *testing.T) {
firstFrame := int32(0)
frameRecv := make(chan struct{})
done := conn.OnFrame(func(id int, typ StreamType, content []byte) {
done := conn.ReadFrames(func(id int, typ StreamType, content []byte) {
if atomic.SwapInt32(&firstFrame, 1) == 0 {
close(frameRecv)
}
@@ -261,7 +261,7 @@ func TestDialReadPause(t *testing.T) {
firstFrame = int32(0)
frameRecv = make(chan struct{})
done = conn.OnFrame(func(id int, typ StreamType, content []byte) {
done = conn.ReadFrames(func(id int, typ StreamType, content []byte) {
if atomic.SwapInt32(&firstFrame, 1) == 0 {
close(frameRecv)
}

4
clientconnread.go
View File

@@ -208,10 +208,10 @@ func (c *ClientConn) backgroundPlayTCP(done chan error) {
}
}
// OnFrame sets a callback that is called when a frame is received.
// ReadFrames starts reading frames.
// it returns a channel that is written when the reading stops.
// This can be called only after Play().
func (c *ClientConn) OnFrame(onFrame func(int, StreamType, []byte)) chan error {
func (c *ClientConn) ReadFrames(onFrame func(int, StreamType, []byte)) chan error {
// channel is buffered, since listening to it is not mandatory
done := make(chan error, 1)

4
examples/client-read-options.go
View File

@@ -33,11 +33,11 @@ func main() {
defer conn.Close()
// read track frames
readerDone := conn.OnFrame(func(id int, typ gortsplib.StreamType, buf []byte) {
done := conn.ReadFrames(func(id int, typ gortsplib.StreamType, buf []byte) {
fmt.Printf("frame from track %d, type %v: %v\n", id, typ, buf)
})
// catch any error
err = <-readerDone
err = <-done
panic(err)
}

4
examples/client-read-partial.go
View File

@@ -53,11 +53,11 @@ func main() {
}
// read track frames
readerDone := conn.OnFrame(func(id int, typ gortsplib.StreamType, buf []byte) {
done := conn.ReadFrames(func(id int, typ gortsplib.StreamType, buf []byte) {
fmt.Printf("frame from track %d, type %v: %v\n", id, typ, buf)
})
// catch any error
err = <-readerDone
err = <-done
panic(err)
}

4
examples/client-read-pause.go
View File

@@ -25,7 +25,7 @@ func main() {
for {
// read track frames
readerDone := conn.OnFrame(func(id int, typ gortsplib.StreamType, buf []byte) {
done := conn.ReadFrames(func(id int, typ gortsplib.StreamType, buf []byte) {
fmt.Printf("frame from track %d, type %v: %v\n", id, typ, buf)
})
@@ -39,7 +39,7 @@ func main() {
}
// join reader
<-readerDone
<-done
// wait
time.Sleep(5 * time.Second)

4
examples/client-read.go
View File

@@ -21,11 +21,11 @@ func main() {
defer conn.Close()
// read track frames
readerDone := conn.OnFrame(func(id int, typ gortsplib.StreamType, buf []byte) {
done := conn.ReadFrames(func(id int, typ gortsplib.StreamType, buf []byte) {
fmt.Printf("frame from track %d, type %v: %v\n", id, typ, buf)
})
// catch any error
err = <-readerDone
err = <-done
panic(err)
}

2
serverconn.go
View File

@@ -130,7 +130,7 @@ outer:
done <- errRet
}
// Read starts reading requests and frames from the connection.
// Read starts reading requests and frames.
// it returns a channel that is written when the reading stops.
func (sc *ServerConn) Read(
onRequest func(req *base.Request) (*base.Response, error),