zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround for clang bug http://llvm.org/PR28348.

Browse Source 
Permits rolling chromium further.

BUG=
TBR=tommi@webrtc.org

Review URL: https://codereview.webrtc.org/2110043003 .

Cr-Commit-Position: refs/heads/master@{#13330}
This commit is contained in:
Peter Boström
2016-06-29 20:25:24 +02:00
parent bf2f569b22
commit f516585e10
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/media/base/videoframe_unittest.h
View File

@ -1216,7 +1216,10 @@ class VideoFrameTest : public testing::Test {
EXPECT_FALSE(expected_result); // NULL is okay if failure was expected.
return;
}
data_ptr += kPadToHeapSized + (-(static_cast<int>(data_size)) & 4095);
// TODO(pbos): Remove kPad once http://llvm.org/PR28348 is fixed and the fix
// is rolled in.
volatile const int kPad = 4095;
data_ptr += kPadToHeapSized + (-(static_cast<int>(data_size)) & kPad);
memcpy(data_ptr, sample, std::min(data_size, sample_size));
for (int i = 0; i < repeat_; ++i) {
EXPECT_EQ(expected_result, frame.Validate(fourcc, kWidth, kHeight,