diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e7a9d2875..a7d69825d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -81,8 +81,10 @@ jobs: run: | WORKDIR=$(cygpath -u $SRS_WORKSPACE) && export PATH=/usr/bin:/usr/local/bin && cd ${WORKDIR} && pwd && rm -rf /usr/local/srs-cache && mkdir -p /usr/local/srs-cache/srs/trunk && ls -lh && - tar xf objs.tar.bz2 -C /usr/local/srs-cache/srs/trunk/ && du -sh /usr/local/srs-cache/srs/trunk/* && - cd ${WORKDIR}/trunk && ./configure --h265=on --gb28181=on --utest=on && ls -lh && du -sh * && du -sh objs/* && + tar xf objs.tar.bz2 -C /usr/local/srs-cache/srs/trunk/ && + du -sh /usr/local/srs-cache/srs/trunk/* && du -sh /usr/local/srs-cache/srs/trunk/objs/* && + cd ${WORKDIR}/trunk && ./configure --h265=on --gb28181=on --utest=on && + ls -lh && du -sh * && du -sh objs/* && cd ${WORKDIR}/trunk && make utest && ./objs/srs_utest runs-on: windows-latest diff --git a/.vscode/README.md b/.vscode/README.md index 97862e63b..ccf9b4d6a 100644 --- a/.vscode/README.md +++ b/.vscode/README.md @@ -67,6 +67,20 @@ Then you will discover all the unit testcases from the `View > Testing` panel. Y open utest source file like `trunk/src/utest/srs_utest.cpp`, then click the `Run Test` or `Debug Test` on each testcase such as `FastSampleInt64Test`. +## macOS: SRS Regression Test + +Follow the [srs-bench](../trunk/3rdparty/srs-bench/README.md) to setup the environment. + +Open the test panel by clicking `View > Testing`, run the regression tests under: + +``` ++ Go + + github.com/ossrs/srs-bench + + blackbox + + gb28181 + + srs +``` + ## macOS: Proxy Install the following extensions: diff --git a/README.md b/README.md index 2ebe47cad..c742f1c37 100755 --- a/README.md +++ b/README.md @@ -66,6 +66,10 @@ To learn more about RTMP, HLS, HTTP-FLV, SRT, MPEG-DASH, WebRTC protocols, clust HTTP API, DVR, and transcoding, please check the documents in [English](https://ossrs.io) or [Chinese](https://ossrs.net). +If you want to use an IDE, VSCode is recommanded. VSCode supports macOS, Linux, and Windows +platforms. The settings are ready. All you need to do is open the folder with VSCode and +enjoy the efficiency brought by the IDE. See [VSCode README](.vscode/README.md) for details. + ## Sponsor Would you like additional assistance from us? By becoming a sponsor or backer of SRS, we can provide you diff --git a/trunk/3rdparty/srs-bench/README.md b/trunk/3rdparty/srs-bench/README.md index 21b8939b1..3ce475f91 100644 --- a/trunk/3rdparty/srs-bench/README.md +++ b/trunk/3rdparty/srs-bench/README.md @@ -14,7 +14,7 @@ git clone -b feature/rtc https://github.com/ossrs/srs-bench.git && cd srs-bench && make ``` -> Note: 依赖Go编译工具，建议使用 Go 1.17 及以上的版本。 +> Note: 依赖Go编译工具，建议使用 Go 1.21 及以上的版本。 编译会生成下面的工具： diff --git a/trunk/3rdparty/srs-bench/srs/rtc_test.go b/trunk/3rdparty/srs-bench/srs/rtc_test.go index ce8d63010..36fc56946 100644 --- a/trunk/3rdparty/srs-bench/srs/rtc_test.go +++ b/trunk/3rdparty/srs-bench/srs/rtc_test.go @@ -2418,7 +2418,7 @@ func TestRtcPublish_HttpFlvPlay(t *testing.T) { } logger.Tf(ctx, "got %v tag, %v %vms %vB", nnVideo+nnAudio, tagType, timestamp, len(tag)) - if audioPacketsOK, videoPacketsOK := !hasAudio || nnAudio >= 10, !hasVideo || nnVideo >= 10; audioPacketsOK && videoPacketsOK { + if audioPacketsOK, videoPacketsOK := hasAudio && nnAudio >= 10, hasVideo && nnVideo >= 10; audioPacketsOK && videoPacketsOK { logger.Tf(ctx, "Flv recv %v/%v audio, %v/%v video", hasAudio, nnAudio, hasVideo, nnVideo) cancel() } diff --git a/trunk/conf/regression-test-for-clion.conf b/trunk/conf/regression-test-for-clion.conf index 59b19ef21..953fe5f83 100644 --- a/trunk/conf/regression-test-for-clion.conf +++ b/trunk/conf/regression-test-for-clion.conf @@ -50,6 +50,8 @@ vhost __defaultVhost__ { } http_remux { enabled on; + # Disabling 'guess_has_av' as it is not required for the current test setup. + guess_has_av off; mount [vhost]/[app]/[stream].flv; drop_if_not_match on; } diff --git a/trunk/conf/regression-test.conf b/trunk/conf/regression-test.conf index cac048be6..87dac9255 100644 --- a/trunk/conf/regression-test.conf +++ b/trunk/conf/regression-test.conf @@ -50,8 +50,10 @@ vhost __defaultVhost__ { atc on; } http_remux { - enabled on; - mount [vhost]/[app]/[stream].flv; + enabled on; + # Disabling 'guess_has_av' as it is not required for the current test setup. + guess_has_av off; + mount [vhost]/[app]/[stream].flv; } ingest livestream { enabled on; diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 7f5240b79..6fa125e5d 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 7.0 Changelog +* v7.0, 2025-05-29, Merge [#4363](https://github.com/ossrs/srs/pull/4363): Fix error about TestRtcPublish_HttpFlvPlay. v7.0.36 (#4363) * v7.0, 2025-05-29, Merge [#4362](https://github.com/ossrs/srs/pull/4362): Update VSCode launch configuration to support GDB on Linux and LLDB on macOS. v7.0.35 (#4362) * v7.0, 2025-05-26, Merge [#4359](https://github.com/ossrs/srs/pull/4359): update pion/webrtc to v4. v7.0.34 (#4359) * v7.0, 2025-05-13, Merge [#4289](https://github.com/ossrs/srs/pull/4289): rtmp2rtc: Support RTMP-to-WebRTC conversion with HEVC. v7.0.33 (#4289) diff --git a/trunk/src/core/srs_core_version7.hpp b/trunk/src/core/srs_core_version7.hpp index fae79f416..922f9586e 100644 --- a/trunk/src/core/srs_core_version7.hpp +++ b/trunk/src/core/srs_core_version7.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 7 #define VERSION_MINOR 0 -#define VERSION_REVISION 35 +#define VERSION_REVISION 36 #endif \ No newline at end of file