external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Turn off the related utests H265 option. v6.0.85 (#3811)

Browse source 
Turn off related unit tests when the H265 option is also turned off.

---------

Co-authored-by: john <hondaxiao@tencent.com>
This commit is contained in:
Haibo Chen 2023-09-26 20:28:44 +08:00 committed by GitHub
parent 42bd4a9fb8
commit ca155a5b58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
trunk/doc/CHANGELOG.md
View file

@ -7,6 +7,7 @@ The changelog for SRS.
<a name="v6-changes"></a>
## 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)

2
trunk/src/core/srs_core_version6.hpp
View file

@ -9,6 +9,6 @@
#define VERSION_MAJOR 6
#define VERSION_MINOR 0
#define VERSION_REVISION 84
#define VERSION_REVISION 85
#endif

4
trunk/src/utest/srs_utest_kernel2.cpp
View file

@ -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)