Merge "ratectrl_rtc_test.cc: fix signed/unsigned comparison"

James Zern committed 6 years ago

Commit d017a632 parents 037190e 3c31fb81 file · +2 −2Browse files

Unified · Split

test/ratectrl_rtc_test.cc+2−2

@@ -88,7 +88,7 @@ class RcInterfaceTest : public ::testing::Test { · 87 unmodified lines
88	std::ifstream one_layer_file;	88	std::ifstream one_layer_file;
89	one_layer_file.open(libvpx_test::GetDataPath() +	89	one_layer_file.open(libvpx_test::GetDataPath() +
90	"/rc_interface_test_one_layer");	90	"/rc_interface_test_one_layer");
91	ASSERT_EQ(one_layer_file.rdstate() & std::ifstream::failbit, 0);	91	ASSERT_TRUE(one_layer_file.good());
92	for (size_t i = 0; i < kNumFrame; i++) {	92	for (size_t i = 0; i < kNumFrame; i++) {
93	one_layer_file >> frame_info;	93	one_layer_file >> frame_info;
94	if (frame_info.frame_id > 0) frame_params.frame_type = INTER_FRAME;	94	if (frame_info.frame_id > 0) frame_params.frame_type = INTER_FRAME;
@@ -117,7 +117,7 @@ class RcInterfaceTest : public ::testing::Test { · 22 unmodified lines
117	std::ifstream svc_file;	117	std::ifstream svc_file;
118	svc_file.open(std::string(std::getenv("LIBVPX_TEST_DATA_PATH")) +	118	svc_file.open(std::string(std::getenv("LIBVPX_TEST_DATA_PATH")) +
119	"/rc_interface_test_svc");	119	"/rc_interface_test_svc");
120	ASSERT_EQ(svc_file.rdstate() & std::ifstream::failbit, 0);	120	ASSERT_TRUE(svc_file.good());
121	for (size_t i = 0; i < kNumFrame * rc_cfg_.ss_number_layers; i++) {	121	for (size_t i = 0; i < kNumFrame * rc_cfg_.ss_number_layers; i++) {
122	svc_file >> frame_info;	122	svc_file >> frame_info;
123	if (frame_info.frame_id > 0) frame_params.frame_type = INTER_FRAME;	123	if (frame_info.frame_id > 0) frame_params.frame_type = INTER_FRAME;