Chromium Code Reviews| Index: content/common/gpu/media/video_encode_accelerator_unittest.cc |
| diff --git a/content/common/gpu/media/video_encode_accelerator_unittest.cc b/content/common/gpu/media/video_encode_accelerator_unittest.cc |
| index b50e902bc5744d635e233ee7b445f166883e9e5b..4552fd4bc541861637fba529198c9e6ea389b6bc 100644 |
| --- a/content/common/gpu/media/video_encode_accelerator_unittest.cc |
| +++ b/content/common/gpu/media/video_encode_accelerator_unittest.cc |
| @@ -533,7 +533,7 @@ VEAClient::VEAClient(const TestStream& test_stream, |
| // Calculate the number of frames in the input stream by dividing its length |
| // in bytes by frame size in bytes. |
| - CHECK_EQ(test_stream_.input_file.length() % input_buffer_size_, 0) |
| + CHECK_EQ(test_stream_.input_file.length() % input_buffer_size_, 0UL) |
| << "Stream byte size is not a product of calculated frame byte size"; |
| num_frames_in_stream_ = test_stream_.input_file.length() / input_buffer_size_; |
| CHECK_GT(num_frames_in_stream_, 0UL); |
| @@ -622,9 +622,10 @@ void VEAClient::RequireBitstreamBuffers(unsigned int input_count, |
| // performance testing. So just assert that the frame size is a multiple of |
| // 64 bytes. This ensures all frames start at 64-byte boundary, because |
| // MemoryMappedFile should be mmapp()ed at virtual page start as well. |
| - ASSERT_EQ(input_buffer_size_ & 63, 0u) |
| + ASSERT_EQ(input_buffer_size_ & 63, static_cast<size_t>(0)) |
|
xhwang
2014/06/05 00:26:28
Will 0u work?
|
| << "Frame size has to be a multiple of 64 bytes"; |
| - ASSERT_EQ(reinterpret_cast<off_t>(test_stream_.input_file.data()) & 63, 0) |
| + ASSERT_EQ(reinterpret_cast<off_t>(test_stream_.input_file.data()) & 63, |
| + static_cast<size_t>(0)) |
|
xhwang
2014/06/05 00:26:28
ditto
|
| << "Mapped file should be mapped at a 64 byte boundary"; |
| #endif |