Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

Unified Diff: webrtc/media/base/videoframe_unittest.h

Issue 2110043003: Workaround for clang bug http://llvm.org/PR28348. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/media/base/videoframe_unittest.h
diff --git a/webrtc/media/base/videoframe_unittest.h b/webrtc/media/base/videoframe_unittest.h
index f19d0325d6a103b5e2f87d68fbcc21ac1ab0b10f..06afd0eb4c707b672332282dac3f6f1d23434186 100644
--- a/webrtc/media/base/videoframe_unittest.h
+++ b/webrtc/media/base/videoframe_unittest.h
@@ -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,
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698