external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Code Issues Releases Wiki Activity

Fix build warnings

Browse source
This commit is contained in:
winlin 2021-01-08 14:09:28 +08:00
parent 81d78310a0
commit b6843428c6
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -499,7 +499,7 @@ VOID TEST(KernelMp4Test, FullBoxDump)
SrsMp4FileTypeBox box;
box.major_brand = SrsMp4BoxBrandISO2;
box.compatible_brands.push_back(SrsMp4BoxBrandISOM);
EXPECT_EQ(20, box.update_size());
EXPECT_EQ(20, (int)box.update_size());
stringstream ss;
SrsMp4DumpContext dc;
@ -514,7 +514,7 @@ VOID TEST(KernelMp4Test, FullBoxDump)
box.type = SrsMp4BoxTypeFTYP;
box.version = 1;
box.flags = 0x02;
EXPECT_EQ(12, box.update_size());
EXPECT_EQ(12, (int)box.update_size());
stringstream ss;
SrsMp4DumpContext dc;
@ -528,7 +528,7 @@ VOID TEST(KernelMp4Test, FullBoxDump)
SrsMp4FullBox box;
box.type = SrsMp4BoxTypeFTYP;
box.version = 1;
EXPECT_EQ(12, box.update_size());
EXPECT_EQ(12, (int)box.update_size());
stringstream ss;
SrsMp4DumpContext dc;
@ -541,7 +541,7 @@ VOID TEST(KernelMp4Test, FullBoxDump)
if (true) {
SrsMp4FullBox box;
box.type = SrsMp4BoxTypeFTYP;
EXPECT_EQ(12, box.update_size());
EXPECT_EQ(12, (int)box.update_size());
stringstream ss;
SrsMp4DumpContext dc;
@ -570,7 +570,7 @@ VOID TEST(KernelMp4Test, MFHDBox)
if (true) {
SrsMp4MovieFragmentHeaderBox box;
box.sequence_number = 3;
EXPECT_EQ(16, box.update_size());
EXPECT_EQ(16, (int)box.update_size());
stringstream ss;
SrsMp4DumpContext dc;

12
trunk/src/utest/srs_utest_rtc.cpp
View file

@ -474,25 +474,25 @@ VOID TEST(KernelRTCTest, ConnectionManagerTest)
MockSrsConnection* conn = new MockSrsConnection();
conn->do_switch = true;
manager.add(conn);
EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size());
EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(0, (int)manager.zombies_.size());
manager.remove(conn); // Remove conn to zombies.
EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(1, manager.zombies_.size());
EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(1, (int)manager.zombies_.size());
srs_usleep(0); // Switch to manager coroutine to try to free zombies.
EXPECT_EQ(0, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size());
EXPECT_EQ(0, (int)manager.size()); EXPECT_EQ(0, (int)manager.zombies_.size());
}
if (true) { // Now the previous conn switch back to here, and lost the signal.
MockSrsConnection* conn = new MockSrsConnection();
manager.add(conn);
EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size());
EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(0, (int)manager.zombies_.size());
manager.remove(conn); // Remove conn to zombies, signal is lost.
EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(1, manager.zombies_.size());
EXPECT_EQ(1, (int)manager.size()); EXPECT_EQ(1, (int)manager.zombies_.size());
srs_usleep(0); // Switch to manager, but no signal is triggered before, so conn will be freed by loop.
EXPECT_EQ(0, (int)manager.size()); EXPECT_EQ(0, manager.zombies_.size());
EXPECT_EQ(0, (int)manager.size()); EXPECT_EQ(0, (int)manager.zombies_.size());
}
}
}