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

change OnFrame signature

Browse Source
This commit is contained in:
aler9
2020-11-19 11:57:23 +01:00
parent 8a8a8d9b5a
commit 5019561d3f
9 changed files with 81 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
dialer_test.go
View File

@@ -97,13 +97,7 @@ func TestDialReadParallel(t *testing.T) {
var firstFrame int32
frameRecv := make(chan struct{})
readerDone := make(chan struct{})
conn.OnFrame(func(id int, typ StreamType, content []byte, err error) {
if err != nil {
close(readerDone)
return
}
done := conn.OnFrame(func(id int, typ StreamType, content []byte) {
if atomic.SwapInt32(&firstFrame, 1) == 0 {
close(frameRecv)
}
@@ -111,14 +105,12 @@ func TestDialReadParallel(t *testing.T) {
<-frameRecv
conn.Close()
<-readerDone
<-done
readerDone = make(chan struct{})
conn.OnFrame(func(id int, typ StreamType, content []byte, err error) {
require.Error(t, err)
close(readerDone)
done = conn.OnFrame(func(id int, typ StreamType, content []byte) {
t.Error("should not happen")
})
<-readerDone
<-done
})
}
}
@@ -155,13 +147,7 @@ func TestDialReadRedirectParallel(t *testing.T) {
var firstFrame int32
frameRecv := make(chan struct{})
readerDone := make(chan struct{})
conn.OnFrame(func(id int, typ StreamType, content []byte, err error) {
if err != nil {
close(readerDone)
return
}
done := conn.OnFrame(func(id int, typ StreamType, content []byte) {
if atomic.SwapInt32(&firstFrame, 1) == 0 {
close(frameRecv)
}
@@ -169,7 +155,7 @@ func TestDialReadRedirectParallel(t *testing.T) {
<-frameRecv
conn.Close()
<-readerDone
<-done
}
func TestDialReadPauseParallel(t *testing.T) {
@@ -210,13 +196,7 @@ func TestDialReadPauseParallel(t *testing.T) {
firstFrame := int32(0)
frameRecv := make(chan struct{})
readerDone := make(chan struct{})
conn.OnFrame(func(id int, typ StreamType, content []byte, err error) {
if err != nil {
close(readerDone)
return
}
done := conn.OnFrame(func(id int, typ StreamType, content []byte) {
if atomic.SwapInt32(&firstFrame, 1) == 0 {
close(frameRecv)
}
@@ -225,20 +205,14 @@ func TestDialReadPauseParallel(t *testing.T) {
<-frameRecv
_, err = conn.Pause()
require.NoError(t, err)
<-readerDone
<-done
_, err = conn.Play()
require.NoError(t, err)
firstFrame = int32(0)
frameRecv = make(chan struct{})
readerDone = make(chan struct{})
conn.OnFrame(func(id int, typ StreamType, content []byte, err error) {
if err != nil {
close(readerDone)
return
}
done = conn.OnFrame(func(id int, typ StreamType, content []byte) {
if atomic.SwapInt32(&firstFrame, 1) == 0 {
close(frameRecv)
}
@@ -246,7 +220,7 @@ func TestDialReadPauseParallel(t *testing.T) {
<-frameRecv
conn.Close()
<-readerDone
<-done
})
}
}