From ca155a5b585961e777551546848fe8aa4c072e05 Mon Sep 17 00:00:00 2001 From: Haibo Chen <495810242@qq.com> Date: Tue, 26 Sep 2023 20:28:44 +0800 Subject: [PATCH] Turn off the related utests H265 option. v6.0.85 (#3811) Turn off related unit tests when the H265 option is also turned off. --------- Co-authored-by: john --- trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version6.hpp | 2 +- trunk/src/utest/srs_utest_kernel2.cpp | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 2caff2524f..133fec3a23 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -7,6 +7,7 @@ The changelog for SRS. ## SRS 6.0 Changelog +* v6.0, 2023-09-26, Merge [#3811](https://github.com/ossrs/srs/pull/3811): Turn off the related utests H265 option. v6.0.85 (#3811) * v6.0, 2023-09-25, Merge [#3810](https://github.com/ossrs/srs/pull/3810): Change dev code for John. v6.0.84 (#3810) * v6.0, 2023-09-22, Merge [#3777](https://github.com/ossrs/srs/pull/3777): Compile: Add a __GLIBC__ definition for the pthread_setname_np. v6.0.83 (#3777) * v6.0, 2023-09-21, Merge [#3806](https://github.com/ossrs/srs/pull/3806): Build: Support sys-ssl for srt. v6.0.82 (#3806) diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp index 501634974b..26c4bafc19 100644 --- a/trunk/src/core/srs_core_version6.hpp +++ b/trunk/src/core/srs_core_version6.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 6 #define VERSION_MINOR 0 -#define VERSION_REVISION 84 +#define VERSION_REVISION 85 #endif diff --git a/trunk/src/utest/srs_utest_kernel2.cpp b/trunk/src/utest/srs_utest_kernel2.cpp index 42ed42a50f..d7b838abd6 100644 --- a/trunk/src/utest/srs_utest_kernel2.cpp +++ b/trunk/src/utest/srs_utest_kernel2.cpp @@ -426,7 +426,8 @@ VOID TEST(KernelRTMPExtTest, ExtRTMPTest) EXPECT_EQ(SrsVideoAvcFrameTraitNALU, f.video->avc_packet_type); EXPECT_EQ(0x12, f.video->cts); } - + +#ifdef SRS_H265 // For new RTMP enhanced specification, with ext tag header. if (true) { SrsFormat f; @@ -480,6 +481,7 @@ VOID TEST(KernelRTMPExtTest, ExtRTMPTest) HELPER_ASSERT_SUCCESS(f.initialize()); HELPER_EXPECT_FAILED(f.on_video(0, (char*) "\x93mvc1", 5)); } +#endif } VOID TEST(KernelCodecTest, VideoFormatSepcialMProtect_DJI_M30)