Commit 0a0c2930 authored by James Zern's avatar James Zern Committed by Gerrit Code Review
Browse files

Merge changes I9ebfeb49,I2e2f9bb6

* changes:
  resize_test: use const_iterator where appropriate
  resize_test: silence a warning
parents ac94505e bb061388
...@@ -146,16 +146,16 @@ TEST_P(ResizeTest, TestExternalResizeWorks) { ...@@ -146,16 +146,16 @@ TEST_P(ResizeTest, TestExternalResizeWorks) {
ResizingVideoSource video; ResizingVideoSource video;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
for (std::vector<FrameInfo>::iterator info = frame_info_list_.begin(); for (std::vector<FrameInfo>::const_iterator info = frame_info_list_.begin();
info != frame_info_list_.end(); ++info) { info != frame_info_list_.end(); ++info) {
const vpx_codec_pts_t pts = info->pts; const unsigned int frame = static_cast<unsigned>(info->pts);
const unsigned int expected_w = ScaleForFrameNumber(pts, kInitialWidth); const unsigned int expected_w = ScaleForFrameNumber(frame, kInitialWidth);
const unsigned int expected_h = ScaleForFrameNumber(pts, kInitialHeight); const unsigned int expected_h = ScaleForFrameNumber(frame, kInitialHeight);
EXPECT_EQ(expected_w, info->w) EXPECT_EQ(expected_w, info->w)
<< "Frame " << pts << "had unexpected width"; << "Frame " << frame << "had unexpected width";
EXPECT_EQ(expected_h, info->h) EXPECT_EQ(expected_h, info->h)
<< "Frame " << pts << "had unexpected height"; << "Frame " << frame << "had unexpected height";
} }
} }
...@@ -247,7 +247,7 @@ TEST_P(ResizeInternalTest, TestInternalResizeWorks) { ...@@ -247,7 +247,7 @@ TEST_P(ResizeInternalTest, TestInternalResizeWorks) {
cfg_.g_lag_in_frames = 0; cfg_.g_lag_in_frames = 0;
ASSERT_NO_FATAL_FAILURE(RunLoop(&video)); ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
for (std::vector<FrameInfo>::iterator info = frame_info_list_.begin(); for (std::vector<FrameInfo>::const_iterator info = frame_info_list_.begin();
info != frame_info_list_.end(); ++info) { info != frame_info_list_.end(); ++info) {
const vpx_codec_pts_t pts = info->pts; const vpx_codec_pts_t pts = info->pts;
if (pts >= kStepDownFrame && pts < kStepUpFrame) { if (pts >= kStepDownFrame && pts < kStepUpFrame) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment