Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SmartPtr: Support shared ptr for RTC source. v6.0.128 #4085

Merged
merged 7 commits into from
Jun 14, 2024
+120 −99
Merged

SmartPtr: Support shared ptr for RTC source. v6.0.128 #4085

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ca9b5de
SmartPtr: Support shared ptr for RTC source.
winlinvip Jun 13, 2024
e50eb14
Fix utest fail.
winlinvip Jun 13, 2024
6b242de
Fix utest fail.
winlinvip Jun 13, 2024
a3b74fb
Fix utest fail.
winlinvip Jun 13, 2024
3110747
Fix utest fail.
winlinvip Jun 13, 2024
588544c
Fix utest fail.
winlinvip Jun 13, 2024
0a619cf
Update release to v6.0.128
winlinvip Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Loading
Loading status checks…
Fix utest fail.
@winlinvip
winlinvip committed Jun 13, 2024

Verified

This commit was signed with the committer’s verified signature.
jrjohnson Jon Johnson
GPG key ID: 673E14A72062F1D0
Verified
Learn about vigilant mode
commit 31107478c5d36f63f835bf6adebe160061e3c1ce
30 changes: 0 additions & 30 deletions trunk/3rdparty/srs-bench/blackbox/hevc_test.go
View file
Original file line number Diff line number Diff line change
@@ -35,9 +35,6 @@ import (
)

func TestSlow_RtmpPublish_RtmpPlay_HEVC_Basic(t *testing.T) {
// This case is run in parallel.
t.Parallel()

// Setup the max timeout for this case.
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
defer cancel()
@@ -125,9 +122,6 @@ func TestSlow_RtmpPublish_RtmpPlay_HEVC_Basic(t *testing.T) {
}

func TestSlow_RtmpPublish_HttpFlvPlay_HEVC_Basic(t *testing.T) {
// This case is run in parallel.
t.Parallel()

// Setup the max timeout for this case.
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
defer cancel()
@@ -222,9 +216,6 @@ func TestSlow_RtmpPublish_HttpFlvPlay_HEVC_Basic(t *testing.T) {
}

func TestSlow_RtmpPublish_HttpTsPlay_HEVC_Basic(t *testing.T) {
// This case is run in parallel.
t.Parallel()

// Setup the max timeout for this case.
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
defer cancel()
@@ -318,9 +309,6 @@ func TestSlow_RtmpPublish_HttpTsPlay_HEVC_Basic(t *testing.T) {
}

func TestSlow_RtmpPublish_HlsPlay_HEVC_Basic(t *testing.T) {
// This case is run in parallel.
t.Parallel()

// Setup the max timeout for this case.
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
defer cancel()
@@ -414,9 +402,6 @@ func TestSlow_RtmpPublish_HlsPlay_HEVC_Basic(t *testing.T) {
}

func TestSlow_RtmpPublish_DvrFlv_HEVC_Basic(t *testing.T) {
// This case is run in parallel.
t.Parallel()

// Setup the max timeout for this case.
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
defer cancel()
@@ -530,9 +515,6 @@ func TestSlow_RtmpPublish_DvrFlv_HEVC_Basic(t *testing.T) {
}

func TestSlow_RtmpPublish_DvrMp4_HEVC_Basic(t *testing.T) {
// This case is run in parallel.
t.Parallel()

// Setup the max timeout for this case.
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
defer cancel()
@@ -646,9 +628,6 @@ func TestSlow_RtmpPublish_DvrMp4_HEVC_Basic(t *testing.T) {
}

func TestSlow_SrtPublish_RtmpPlay_HEVC_Basic(t *testing.T) {
// This case is run in parallel.
t.Parallel()

// Setup the max timeout for this case.
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
defer cancel()
@@ -742,9 +721,6 @@ func TestSlow_SrtPublish_RtmpPlay_HEVC_Basic(t *testing.T) {
}

func TestSlow_SrtPublish_HttpFlvPlay_HEVC_Basic(t *testing.T) {
// This case is run in parallel.
t.Parallel()

// Setup the max timeout for this case.
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
defer cancel()
@@ -840,9 +816,6 @@ func TestSlow_SrtPublish_HttpFlvPlay_HEVC_Basic(t *testing.T) {
}

func TestSlow_SrtPublish_HttpTsPlay_HEVC_Basic(t *testing.T) {
// This case is run in parallel.
t.Parallel()

// Setup the max timeout for this case.
ctx, cancel := context.WithTimeout(logger.WithContext(context.Background()), time.Duration(*srsTimeout)*time.Millisecond)
defer cancel()
@@ -943,9 +916,6 @@ func TestSlow_SrtPublish_HttpTsPlay_HEVC_Basic(t *testing.T) {
}

func TestSlow_SrtPublish_HlsPlay_HEVC_Basic(t *testing.T) {
// This case is run in parallel.
t.Parallel()

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