diff --git a/trunk/src/utest/srs_utest_avc.cpp b/trunk/src/utest/srs_utest_avc.cpp index 7f7898cb6..15b34f590 100644 --- a/trunk/src/utest/srs_utest_avc.cpp +++ b/trunk/src/utest/srs_utest_avc.cpp @@ -247,7 +247,8 @@ VOID TEST(SrsAVCTest, H264IPBFrame) SrsRawH264Stream h; string frame; HELPER_ASSERT_SUCCESS(h.mux_ipb_frame((char*)"Hello", 5, frame)); EXPECT_EQ(4+5, frame.length()); - EXPECT_EQ(0, frame.at(0)); EXPECT_EQ(0, frame.at(1)); EXPECT_EQ(0, frame.at(2)); EXPECT_EQ(5, frame.at(3)); + EXPECT_EQ(0, (uint8_t)frame.at(0)); EXPECT_EQ(0, (uint8_t)frame.at(1)); + EXPECT_EQ(0, (uint8_t)frame.at(2)); EXPECT_EQ(5, (uint8_t)frame.at(3)); EXPECT_STREQ("Hello", frame.substr(4).c_str()); } } diff --git a/trunk/src/utest/srs_utest_config.cpp b/trunk/src/utest/srs_utest_config.cpp index e1d44ac8e..2b8d90e75 100644 --- a/trunk/src/utest/srs_utest_config.cpp +++ b/trunk/src/utest/srs_utest_config.cpp @@ -2681,7 +2681,7 @@ VOID TEST(ConfigMainTest, CheckGlobalConfig) if (true) { MockSrsConfig conf; HELPER_ASSERT_SUCCESS(conf.parse("listen 1935 1936;")); - EXPECT_EQ(2, conf.get_listens().size()); + EXPECT_EQ(2, (int)conf.get_listens().size()); } if (true) { diff --git a/trunk/src/utest/srs_utest_mp4.cpp b/trunk/src/utest/srs_utest_mp4.cpp index 76e6fc4b3..c5e4d8d43 100644 --- a/trunk/src/utest/srs_utest_mp4.cpp +++ b/trunk/src/utest/srs_utest_mp4.cpp @@ -564,7 +564,7 @@ VOID TEST(KernelMp4Test, MFHDBox) SrsMp4MovieFragmentHeaderBox box; HELPER_ASSERT_SUCCESS(box.decode(&b)); - EXPECT_EQ(3, box.sequence_number); + EXPECT_EQ(3, (int)box.sequence_number); } if (true) { @@ -596,7 +596,7 @@ VOID TEST(KernelMp4Test, TFHDBox) if (true) { SrsMp4TrackFragmentHeaderBox box; box.track_id = 100; - EXPECT_EQ((int)sizeof(buf), (int)box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -631,7 +631,7 @@ VOID TEST(KernelMp4Test, TFHDBox) box.default_sample_duration = 12; box.default_sample_size = 13; box.default_sample_flags = 14; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -646,12 +646,12 @@ VOID TEST(KernelMp4Test, TFHDBox) b.skip(-1 * b.pos()); SrsMp4TrackFragmentHeaderBox box; HELPER_EXPECT_SUCCESS(box.decode(&b)); - EXPECT_EQ(100, box.track_id); - EXPECT_EQ(box.base_data_offset, 10); - EXPECT_EQ(box.sample_description_index, 11); - EXPECT_EQ(box.default_sample_duration, 12); - EXPECT_EQ(box.default_sample_size, 13); - EXPECT_EQ(box.default_sample_flags, 14); + EXPECT_EQ((int)box.track_id, 100); + EXPECT_EQ((int)box.base_data_offset, 10); + EXPECT_EQ((int)box.sample_description_index, 11); + EXPECT_EQ((int)box.default_sample_duration, 12); + EXPECT_EQ((int)box.default_sample_size, 13); + EXPECT_EQ((int)box.default_sample_flags, 14); } } } @@ -667,7 +667,7 @@ VOID TEST(KernelMp4Test, TFDTBox) if (true) { SrsMp4TrackFragmentDecodeTimeBox box; box.base_media_decode_time = 100; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -694,7 +694,7 @@ VOID TEST(KernelMp4Test, TFDTBox) SrsMp4TrackFragmentDecodeTimeBox box; box.version = 1; box.base_media_decode_time = 100; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -709,7 +709,7 @@ VOID TEST(KernelMp4Test, TFDTBox) b.skip(-1 * b.pos()); SrsMp4TrackFragmentDecodeTimeBox box; HELPER_EXPECT_SUCCESS(box.decode(&b)); - EXPECT_EQ(100, box.base_media_decode_time); + EXPECT_EQ(100, (int)box.base_media_decode_time); } } } @@ -724,7 +724,7 @@ VOID TEST(KernelMp4Test, TRUNBox) if (true) { SrsMp4TrackFragmentRunBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -754,7 +754,7 @@ VOID TEST(KernelMp4Test, TRUNBox) entry->sample_duration = 1000; box.entries.push_back(entry); - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -788,7 +788,7 @@ VOID TEST(KernelMp4Test, FreeBox) if (true) { SrsMp4FreeSpaceBox box(SrsMp4BoxTypeFREE); box.data.resize(4); - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -818,7 +818,7 @@ VOID TEST(KernelMp4Test, MOOVBox) if (true) { SrsMp4MovieBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -891,7 +891,7 @@ VOID TEST(KernelMp4Test, TREXBox) SrsMp4TrackExtendsBox box; box.track_ID = 1; box.default_sample_description_index = 2; box.default_sample_size = 3; box.default_sample_duration = 4; box.default_sample_flags = 5; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -933,7 +933,7 @@ VOID TEST(KernelMp4Test, TKHDBox) if (true) { SrsMp4TrackHeaderBox box; box.track_ID = 1; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -960,7 +960,7 @@ VOID TEST(KernelMp4Test, TKHDBox) SrsMp4TrackHeaderBox box; box.version = 1; box.track_ID = 1; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -990,7 +990,7 @@ VOID TEST(KernelMp4Test, ELSTBox) if (true) { SrsMp4EditListBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1018,7 +1018,7 @@ VOID TEST(KernelMp4Test, ELSTBox) SrsMp4ElstEntry entry; box.entries.push_back(entry); } - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1054,7 +1054,7 @@ VOID TEST(KernelMp4Test, MDHDBox) if (true) { SrsMp4MediaHeaderBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1081,7 +1081,7 @@ VOID TEST(KernelMp4Test, MDHDBox) box.set_language0('C'); box.set_language1('N'); box.set_language2('E'); - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1136,7 +1136,7 @@ VOID TEST(KernelMp4Test, HDLRBox) if (true) { SrsMp4HandlerReferenceBox box; box.handler_type = SrsMp4HandlerTypeSOUN; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1162,7 +1162,7 @@ VOID TEST(KernelMp4Test, HDLRBox) if (true) { SrsMp4HandlerReferenceBox box; box.handler_type = SrsMp4HandlerTypeVIDE; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1189,7 +1189,7 @@ VOID TEST(KernelMp4Test, HDLRBox) SrsMp4HandlerReferenceBox box; box.handler_type = SrsMp4HandlerTypeVIDE; box.name = "srs"; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1247,7 +1247,7 @@ VOID TEST(KernelMp4Test, URLBox) if (true) { SrsMp4DataEntryUrlBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1271,7 +1271,7 @@ VOID TEST(KernelMp4Test, URLBox) if (true) { SrsMp4DataEntryUrnBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1304,7 +1304,7 @@ VOID TEST(KernelMp4Test, URLBox) SrsMp4DataReferenceBox box; SrsMp4DataEntryUrnBox* urn = new SrsMp4DataEntryUrnBox(); box.append(urn); - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1341,7 +1341,7 @@ VOID TEST(KernelMp4Test, SampleDescBox) if (true) { SrsMp4VisualSampleEntry box; box.data_reference_index = 1; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1365,7 +1365,7 @@ VOID TEST(KernelMp4Test, SampleDescBox) if (true) { SrsMp4AvccBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1390,7 +1390,7 @@ VOID TEST(KernelMp4Test, SampleDescBox) if (true) { SrsMp4AudioSampleEntry box; box.data_reference_index = 1; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1420,7 +1420,7 @@ VOID TEST(KernelMp4Test, SpecificInfoBox) if (true) { SrsMp4DecoderSpecificInfo box; box.asc.resize(2); - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1444,7 +1444,7 @@ VOID TEST(KernelMp4Test, SpecificInfoBox) if (true) { SrsMp4DecoderConfigDescriptor box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1468,7 +1468,7 @@ VOID TEST(KernelMp4Test, SpecificInfoBox) if (true) { SrsMp4ES_Descriptor box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1498,7 +1498,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4SampleDescriptionBox box; box.entries.push_back(new SrsMp4SampleEntry()); - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1523,7 +1523,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4DecodingTime2SampleBox box; box.entries.push_back(SrsMp4SttsEntry()); - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1548,7 +1548,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4CompositionTime2SampleBox box; box.entries.push_back(SrsMp4CttsEntry()); - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1572,7 +1572,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4SyncSampleBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1596,7 +1596,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4Sample2ChunkBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1620,7 +1620,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4ChunkOffsetBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1644,7 +1644,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4ChunkLargeOffsetBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1668,7 +1668,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4SampleSizeBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1693,7 +1693,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4UserDataBox box; box.data.resize(2); - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1717,7 +1717,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4SegmentIndexBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1741,7 +1741,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4MovieHeaderBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; @@ -1772,7 +1772,7 @@ VOID TEST(KernelMp4Test, STSDBox) if (true) { SrsMp4CompositionTime2SampleBox box; - EXPECT_EQ(sizeof(buf), box.nb_bytes()); + EXPECT_EQ((int)sizeof(buf), box.nb_bytes()); HELPER_EXPECT_SUCCESS(box.encode(&b)); stringstream ss; diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp index 0a1a612b7..0e952cf68 100644 --- a/trunk/src/utest/srs_utest_protocol.cpp +++ b/trunk/src/utest/srs_utest_protocol.cpp @@ -5804,7 +5804,7 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 70, nparsed = 70, nread = 0 HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\n")); - EXPECT_EQ(70, parser.parsed); + EXPECT_EQ(70, (int)parser.parsed); EXPECT_EQ(0, (int)parser.parser->nread); EXPECT_TRUE(!parser.body); EXPECT_TRUE(parser.headers_complete); @@ -5815,7 +5815,7 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 75, nparsed = 75, nread = 0 HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\nHello")); - EXPECT_EQ(75, parser.parsed); + EXPECT_EQ(75, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); EXPECT_TRUE(parser.body && 5 == parser.body->length); EXPECT_TRUE(parser.headers_complete); @@ -5826,7 +5826,7 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 150, nparsed = 150, nread = 0 HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\nHelloGET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\nWorld")); - EXPECT_EQ(150, parser.parsed); + EXPECT_EQ(150, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); } @@ -5834,13 +5834,13 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 70, nparsed = 70, nread = 0, content_length = 5, Header("Content-Length", 5) HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\n")); - EXPECT_EQ(70, parser.parsed); + EXPECT_EQ(70, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); EXPECT_EQ(5, parser.parser->content_length); // size = 79, nparsed = 5, nread = 1, content_length = -1, Header("Content-Length", 5) HELPER_EXPECT_FAILED(parser.parse("elloGET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\nHello")); - EXPECT_EQ(5, parser.parsed); + EXPECT_EQ(5, (int)parser.parsed); EXPECT_EQ(1, parser.parser->nread); EXPECT_EQ(-1, (int64_t)parser.parser->content_length); } @@ -5849,13 +5849,13 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 70, nparsed = 70, nread = 0, content_length = 5, Header("Content-Length", 5) HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\n")); - EXPECT_EQ(70, parser.parsed); + EXPECT_EQ(70, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); EXPECT_EQ(5, parser.parser->content_length); // size = 80, nparsed = 70, nread = 0, content_length = 0, Header("Content-Length", 5) HELPER_EXPECT_SUCCESS(parser.parse("HelloGET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\nWorld")); - EXPECT_EQ(80, parser.parsed); + EXPECT_EQ(80, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); EXPECT_EQ(0, parser.parser->content_length); } @@ -5864,7 +5864,7 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 73, nparsed = 73, nread = 0, content_length = 2, Header("Content-Length", 5) HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\nHel")); - EXPECT_EQ(73, parser.parsed); + EXPECT_EQ(73, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); EXPECT_EQ(2, parser.parser->content_length); } @@ -5873,7 +5873,7 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 82, nparsed = 75, nread = 1, content_length = -1, Header("Content-Length", 5) HELPER_EXPECT_FAILED(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\nHello World!")); - EXPECT_EQ(75, parser.parsed); + EXPECT_EQ(75, (int)parser.parsed); EXPECT_EQ(1, parser.parser->nread); EXPECT_EQ(-1, (int64_t)parser.parser->content_length); } @@ -5882,12 +5882,12 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 34, nparsed = 34, nread = 34 HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHo")); - EXPECT_EQ(34, parser.parsed); + EXPECT_EQ(34, (int)parser.parsed); EXPECT_EQ(34, parser.parser->nread); // size = 41, nparsed = 41, nread = 0 HELPER_EXPECT_SUCCESS(parser.parse("st: ossrs.net\r\nContent-Length: 5\r\n\r\nHello")); - EXPECT_EQ(41, parser.parsed); + EXPECT_EQ(41, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); } @@ -5895,12 +5895,12 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 41, nparsed = 41, nread = 41 HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: oss")); - EXPECT_EQ(41, parser.parsed); + EXPECT_EQ(41, (int)parser.parsed); EXPECT_EQ(41, parser.parser->nread); // size = 34, nparsed = 34, nread = 0 HELPER_EXPECT_SUCCESS(parser.parse("rs.net\r\nContent-Length: 5\r\n\r\nHello")); - EXPECT_EQ(34, parser.parsed); + EXPECT_EQ(34, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); } @@ -5908,12 +5908,12 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 48, nparsed = 48, nread = 48 HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r")); - EXPECT_EQ(48, parser.parsed); + EXPECT_EQ(48, (int)parser.parsed); EXPECT_EQ(48, parser.parser->nread); // size = 27, nparsed = 27, nread = 0 HELPER_EXPECT_SUCCESS(parser.parse("\nContent-Length: 5\r\n\r\nHello")); - EXPECT_EQ(27, parser.parsed); + EXPECT_EQ(27, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); } @@ -5921,12 +5921,12 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 68, nparsed = 68, nread = 68 HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n")); - EXPECT_EQ(68, parser.parsed); + EXPECT_EQ(68, (int)parser.parsed); EXPECT_EQ(68, parser.parser->nread); // size = 7, nparsed = 7, nread = 0 HELPER_EXPECT_SUCCESS(parser.parse("\r\nHello")); - EXPECT_EQ(7, parser.parsed); + EXPECT_EQ(7, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); } @@ -5934,12 +5934,12 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 69, nparsed = 69, nread = 69 HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r")); - EXPECT_EQ(69, parser.parsed); + EXPECT_EQ(69, (int)parser.parsed); EXPECT_EQ(69, parser.parser->nread); // size = 6, nparsed = 6, nread = 0 HELPER_EXPECT_SUCCESS(parser.parse("\nHello")); - EXPECT_EQ(6, parser.parsed); + EXPECT_EQ(6, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); } @@ -5947,7 +5947,7 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 75, nparsed = 75, nread = 0 HELPER_EXPECT_SUCCESS(parser.parse("GET /gslb/v1/versions HTTP/1.1\r\nHost: ossrs.net\r\nContent-Length: 5\r\n\r\nHello")); - EXPECT_EQ(75, parser.parsed); + EXPECT_EQ(75, (int)parser.parsed); EXPECT_EQ(0, parser.parser->nread); } @@ -5955,12 +5955,12 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // nparsed = 2, size = 2, nread = 2 HELPER_EXPECT_SUCCESS(parser.parse("GE")); - EXPECT_EQ(2, parser.parsed); + EXPECT_EQ(2, (int)parser.parsed); EXPECT_EQ(2, parser.parser->nread); // size = 0, nparsed = 1, nread=2 HELPER_EXPECT_FAILED(parser.parse("")); - EXPECT_EQ(1, parser.parsed); + EXPECT_EQ(1, (int)parser.parsed); EXPECT_EQ(2, parser.parser->nread); } @@ -5968,12 +5968,12 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 2, nparsed = 2, nread = 2 HELPER_EXPECT_SUCCESS(parser.parse("GE")); - EXPECT_EQ(2, parser.parsed); + EXPECT_EQ(2, (int)parser.parsed); EXPECT_EQ(2, parser.parser->nread); // size = 1, nparsed = 0, nread = 3 HELPER_EXPECT_FAILED(parser.parse("X")); - EXPECT_EQ(0, parser.parsed); + EXPECT_EQ(0, (int)parser.parsed); EXPECT_EQ(3, parser.parser->nread); } @@ -5981,12 +5981,12 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 2, nparsed = 2, nread = 2 HELPER_EXPECT_SUCCESS(parser.parse("GE")); - EXPECT_EQ(2, parser.parsed); + EXPECT_EQ(2, (int)parser.parsed); EXPECT_EQ(2, parser.parser->nread); // size = 1, nparsed = 1, nread = 3 HELPER_EXPECT_SUCCESS(parser.parse("T")); - EXPECT_EQ(1, parser.parsed); + EXPECT_EQ(1, (int)parser.parsed); EXPECT_EQ(3, parser.parser->nread); } @@ -5994,7 +5994,7 @@ VOID TEST(ProtocolHTTPTest, HTTPParser) MockParser parser; // size = 3, nparsed = 3, nread = 3 HELPER_EXPECT_SUCCESS(parser.parse("GET")); - EXPECT_EQ(3, parser.parsed); + EXPECT_EQ(3, (int)parser.parsed); EXPECT_EQ(3, parser.parser->nread); } } diff --git a/trunk/src/utest/srs_utest_rtmp.cpp b/trunk/src/utest/srs_utest_rtmp.cpp index 544d85126..47ec84aa6 100644 --- a/trunk/src/utest/srs_utest_rtmp.cpp +++ b/trunk/src/utest/srs_utest_rtmp.cpp @@ -1330,7 +1330,7 @@ VOID TEST(ProtocolRTMPTest, HandshakeC0C1) SrsRtmpServer r(&io); HELPER_EXPECT_SUCCESS(r.hs_bytes->read_c0c1(&io)); - EXPECT_EQ(0x01020304, r.proxy_real_ip()); + EXPECT_EQ((uint32_t)0x01020304, (uint32_t)r.proxy_real_ip()); } // It seems a normal c0c1, but it's extended, so it fail.