Skip to content

Commit df85433

Browse files
winlinvipchundonglinlin
winlinvip
and
chundonglinlin
authored
TEST: Upgrade pion to v3.2.9. (#3567)
------ Co-authored-by: chundonglinlin <[email protected]>
1 parent 104cf14 commit df85433

File tree

1,383 files changed

+118424
-41376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,383 files changed

+118424
-41376
lines changed

‎trunk/3rdparty/srs-bench/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ clean:
77

88
#########################################################################################################
99
# SRS benchmark tool for SRS, janus, GB28181.
10-
./objs/.format.bench.txt: *.go srs/*.go vnet/*.go janus/*.go gb28181/*.go
11-
gofmt -w .
10+
./objs/.format.bench.txt: *.go janus/*.go ./objs/.format.srs.txt ./objs/.format.gb28181.txt
11+
gofmt -w *.go janus
1212
mkdir -p objs && echo "done" > ./objs/.format.bench.txt
1313

1414
bench: ./objs/srs_bench
1515

16-
./objs/srs_bench: ./objs/.format.bench.txt *.go srs/*.go vnet/*.go janus/*.go gb28181/*.go Makefile
16+
./objs/srs_bench: ./objs/.format.bench.txt *.go janus/*.go srs/*.go vnet/*.go gb28181/*.go Makefile
1717
go build -mod=vendor -o objs/srs_bench .
1818

1919
#########################################################################################################

‎trunk/3rdparty/srs-bench/blackbox/http_api_test.go

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -21,73 +21,73 @@
2121
package blackbox
2222

2323
import (
24-
"context"
25-
"fmt"
26-
"github.com/ossrs/go-oryx-lib/errors"
27-
"github.com/ossrs/go-oryx-lib/logger"
28-
"net/http"
29-
"sync"
30-
"testing"
31-
"time"
24+
"context"
25+
"fmt"
26+
"github.com/ossrs/go-oryx-lib/errors"
27+
"github.com/ossrs/go-oryx-lib/logger"
28+
"net/http"
29+
"sync"
30+
"testing"
31+
"time"
3232
)
3333

3434
func TestFast_Http_Api_Basic_Auth(t *testing.T) {
35-
// This case is run in parallel.
36-
t.Parallel()
35+
// This case is run in parallel.
36+
t.Parallel()
3737

38-
// Setup the max timeout for this case.
39-
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
40-
defer cancel()
38+
// Setup the max timeout for this case.
39+
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
40+
defer cancel()
4141

42-
// Check a set of errors.
43-
var r0, r1, r2, r3, r4, r5, r6 error
44-
defer func(ctx context.Context) {
45-
if err := filterTestError(ctx.Err(), r0, r1, r2, r3, r4, r5, r6); err != nil {
46-
t.Errorf("Fail for err %+v", err)
47-
} else {
48-
logger.Tf(ctx, "test done with err %+v", err)
49-
}
50-
}(ctx)
42+
// Check a set of errors.
43+
var r0, r1, r2, r3, r4, r5, r6 error
44+
defer func(ctx context.Context) {
45+
if err := filterTestError(ctx.Err(), r0, r1, r2, r3, r4, r5, r6); err != nil {
46+
t.Errorf("Fail for err %+v", err)
47+
} else {
48+
logger.Tf(ctx, "test done with err %+v", err)
49+
}
50+
}(ctx)
5151

52-
var wg sync.WaitGroup
53-
defer wg.Wait()
52+
var wg sync.WaitGroup
53+
defer wg.Wait()
5454

55-
// Start SRS server and wait for it to be ready.
56-
svr := NewSRSServer(func(v *srsServer) {
57-
v.envs = []string{
58-
"SRS_HTTP_API_AUTH_ENABLED=on",
59-
"SRS_HTTP_API_AUTH_USERNAME=admin",
60-
"SRS_HTTP_API_AUTH_PASSWORD=admin",
61-
}
62-
})
63-
wg.Add(1)
64-
go func() {
65-
defer wg.Done()
66-
r0 = svr.Run(ctx, cancel)
67-
}()
55+
// Start SRS server and wait for it to be ready.
56+
svr := NewSRSServer(func(v *srsServer) {
57+
v.envs = []string{
58+
"SRS_HTTP_API_AUTH_ENABLED=on",
59+
"SRS_HTTP_API_AUTH_USERNAME=admin",
60+
"SRS_HTTP_API_AUTH_PASSWORD=admin",
61+
}
62+
})
63+
wg.Add(1)
64+
go func() {
65+
defer wg.Done()
66+
r0 = svr.Run(ctx, cancel)
67+
}()
6868

69-
<-svr.ReadyCtx().Done()
69+
<-svr.ReadyCtx().Done()
7070

71-
if true {
72-
defer cancel()
71+
if true {
72+
defer cancel()
7373

74-
var res *http.Response
75-
url := fmt.Sprintf("http://admin:admin@localhost:%v/api/v1/versions", svr.APIPort())
76-
res, r1 = http.Get(url)
77-
if r1 == nil && res.StatusCode != 200 {
78-
r2 = errors.Errorf("get status code=%v, expect=200", res.StatusCode)
79-
}
74+
var res *http.Response
75+
url := fmt.Sprintf("http://admin:admin@localhost:%v/api/v1/versions", svr.APIPort())
76+
res, r1 = http.Get(url)
77+
if r1 == nil && res.StatusCode != 200 {
78+
r2 = errors.Errorf("get status code=%v, expect=200", res.StatusCode)
79+
}
8080

81-
url = fmt.Sprintf("http://admin:123456@localhost:%v/api/v1/versions", svr.APIPort())
82-
res, r3 = http.Get(url)
83-
if r3 == nil && res.StatusCode != 401 {
84-
r4 = errors.Errorf("get status code=%v, expect=401", res.StatusCode)
85-
}
81+
url = fmt.Sprintf("http://admin:123456@localhost:%v/api/v1/versions", svr.APIPort())
82+
res, r3 = http.Get(url)
83+
if r3 == nil && res.StatusCode != 401 {
84+
r4 = errors.Errorf("get status code=%v, expect=401", res.StatusCode)
85+
}
8686

87-
url = fmt.Sprintf("http://localhost:%v/api/v1/versions", svr.APIPort())
88-
res, r5 = http.Get(url)
89-
if r5 == nil && res.StatusCode != 401 {
90-
r6 = errors.Errorf("get status code=%v, expect=401", res.StatusCode)
91-
}
92-
}
87+
url = fmt.Sprintf("http://localhost:%v/api/v1/versions", svr.APIPort())
88+
res, r5 = http.Get(url)
89+
if r5 == nil && res.StatusCode != 401 {
90+
r6 = errors.Errorf("get status code=%v, expect=401", res.StatusCode)
91+
}
92+
}
9393
}

‎trunk/3rdparty/srs-bench/gb28181/gb28181.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// Copyright (c) 2022 Winlin
3+
// # Copyright (c) 2022 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

‎trunk/3rdparty/srs-bench/gb28181/gb28181_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// Copyright (c) 2022 Winlin
3+
// # Copyright (c) 2022 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

‎trunk/3rdparty/srs-bench/gb28181/sip.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// Copyright (c) 2022 Winlin
3+
// # Copyright (c) 2022 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

‎trunk/3rdparty/srs-bench/go.mod

Lines changed: 39 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,50 @@
11
module github.com/ossrs/srs-bench
22

3-
go 1.15
3+
go 1.17
44

55
require (
66
github.com/ghettovoice/gosip v0.0.0-20220929080231-de8ba881be83
77
github.com/ossrs/go-oryx-lib v0.0.9
8-
github.com/pion/interceptor v0.0.10
8+
github.com/pion/ice/v2 v2.3.6
9+
github.com/pion/interceptor v0.1.17
910
github.com/pion/logging v0.2.2
10-
github.com/pion/rtcp v1.2.6
11-
github.com/pion/rtp v1.6.2
12-
github.com/pion/sdp/v3 v3.0.4
13-
github.com/pion/transport v0.12.2
14-
github.com/pion/webrtc/v3 v3.0.13
11+
github.com/pion/rtcp v1.2.10
12+
github.com/pion/rtp v1.7.13
13+
github.com/pion/sdp/v3 v3.0.6
14+
github.com/pion/transport/v2 v2.2.1
15+
github.com/pion/webrtc/v3 v3.2.9
1516
github.com/pkg/errors v0.9.1
1617
github.com/yapingcat/gomedia/codec v0.0.0-20220617074658-94762898dc25
1718
github.com/yapingcat/gomedia/mpeg2 v0.0.0-20220617074658-94762898dc25
1819
)
20+
21+
require (
22+
github.com/davecgh/go-spew v1.1.1 // indirect
23+
github.com/gobwas/httphead v0.1.0 // indirect
24+
github.com/gobwas/pool v0.2.1 // indirect
25+
github.com/gobwas/ws v1.1.0-rc.1 // indirect
26+
github.com/google/uuid v1.3.0 // indirect
27+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
28+
github.com/mattn/go-colorable v0.1.4 // indirect
29+
github.com/mattn/go-isatty v0.0.8 // indirect
30+
github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
31+
github.com/pion/datachannel v1.5.5 // indirect
32+
github.com/pion/dtls/v2 v2.2.7 // indirect
33+
github.com/pion/mdns v0.0.7 // indirect
34+
github.com/pion/randutil v0.1.0 // indirect
35+
github.com/pion/sctp v1.8.7 // indirect
36+
github.com/pion/srtp/v2 v2.0.15 // indirect
37+
github.com/pion/stun v0.6.0 // indirect
38+
github.com/pion/turn/v2 v2.1.0 // indirect
39+
github.com/pmezard/go-difflib v1.0.0 // indirect
40+
github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b // indirect
41+
github.com/sirupsen/logrus v1.4.2 // indirect
42+
github.com/stretchr/testify v1.8.4 // indirect
43+
github.com/tevino/abool v0.0.0-20170917061928-9b9efcf221b5 // indirect
44+
github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
45+
golang.org/x/crypto v0.9.0 // indirect
46+
golang.org/x/net v0.10.0 // indirect
47+
golang.org/x/sys v0.8.0 // indirect
48+
golang.org/x/term v0.8.0 // indirect
49+
gopkg.in/yaml.v3 v3.0.1 // indirect
50+
)

0 commit comments

Comments
 (0)