external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge from SRS3

Browse source
This commit is contained in:
winlin 2020-04-07 20:18:31 +08:00
commit 61c7443c4b
12 changed files with 53 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

10
trunk/src/utest/srs_utest_kernel.cpp
View file

@ -4823,7 +4823,7 @@ VOID TEST(KernelMP4Test, CoverMP4CodecSingleFrame)
HELPER_EXPECT_SUCCESS(enc.write_sample(
&fmt, SrsMp4HandlerTypeVIDE, fmt.video->frame_type, fmt.video->avc_packet_type, 0, 0, (uint8_t*)fmt.raw, fmt.nb_raw
));
EXPECT_EQ(768, enc.width); EXPECT_EQ(320, enc.height);
EXPECT_EQ(768, (int)enc.width); EXPECT_EQ(320, (int)enc.height);
}
if (true) {
@ -4936,7 +4936,7 @@ VOID TEST(KernelMP4Test, CoverMP4MultipleVideos)
HELPER_EXPECT_SUCCESS(enc.write_sample(
&fmt, SrsMp4HandlerTypeVIDE, fmt.video->frame_type, fmt.video->avc_packet_type, 0, 0, (uint8_t*)fmt.raw, fmt.nb_raw
));
EXPECT_EQ(768, enc.width); EXPECT_EQ(320, enc.height);
EXPECT_EQ(768, (int)enc.width); EXPECT_EQ(320, (int)enc.height);
}
if (true) {
@ -5024,7 +5024,7 @@ VOID TEST(KernelMP4Test, CoverMP4MultipleCTTs)
HELPER_EXPECT_SUCCESS(enc.write_sample(
&fmt, SrsMp4HandlerTypeVIDE, fmt.video->frame_type, fmt.video->avc_packet_type, 0, 0, (uint8_t*)fmt.raw, fmt.nb_raw
));
EXPECT_EQ(768, enc.width); EXPECT_EQ(320, enc.height);
EXPECT_EQ(768, (int)enc.width); EXPECT_EQ(320, (int)enc.height);
}
if (true) {
@ -5126,7 +5126,7 @@ VOID TEST(KernelMP4Test, CoverMP4MultipleAVs)
HELPER_EXPECT_SUCCESS(enc.write_sample(
&fmt, SrsMp4HandlerTypeVIDE, fmt.video->frame_type, fmt.video->avc_packet_type, 0, 0, (uint8_t*)fmt.raw, fmt.nb_raw
));
EXPECT_EQ(768, enc.width); EXPECT_EQ(320, enc.height);
EXPECT_EQ(768, (int)enc.width); EXPECT_EQ(320, (int)enc.height);
}
if (true) {
@ -5240,7 +5240,7 @@ VOID TEST(KernelMP4Test, CoverMP4CodecErrorNoFrames)
HELPER_EXPECT_SUCCESS(enc.write_sample(
&fmt, SrsMp4HandlerTypeVIDE, fmt.video->frame_type, fmt.video->avc_packet_type, 0, 0, (uint8_t*)fmt.raw, fmt.nb_raw
));
EXPECT_EQ(768, enc.width); EXPECT_EQ(320, enc.height);
EXPECT_EQ(768, (int)enc.width); EXPECT_EQ(320, (int)enc.height);
}
if (true) {