Commit 9a49d977 authored by Ted Meyer's avatar Ted Meyer Committed by Commit Bot

Fix ifdef guards for base::SysInfo::KernelVersion

Use the same guards that base::SysInfo::KernelVersion is guarded by

Change-Id: I6ceb7a8ed371d5e9a1d661c340ab57ff7612054a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2441280
Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#813324}
parent ffec7f66
...@@ -236,7 +236,7 @@ std::unique_ptr<VideoFrameValidator::MismatchedFrameInfo> ...@@ -236,7 +236,7 @@ std::unique_ptr<VideoFrameValidator::MismatchedFrameInfo>
MD5VideoFrameValidator::Validate(scoped_refptr<const VideoFrame> frame, MD5VideoFrameValidator::Validate(scoped_refptr<const VideoFrame> frame,
size_t frame_index) { size_t frame_index) {
DCHECK_CALLED_ON_VALID_SEQUENCE(validator_thread_sequence_checker_); DCHECK_CALLED_ON_VALID_SEQUENCE(validator_thread_sequence_checker_);
#if BUILDFLAG(USE_VAAPI) #if defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS)
// b/149808895: There is a bug in the synchronization on mapped buffers, which // b/149808895: There is a bug in the synchronization on mapped buffers, which
// causes the frame validation failure. The bug is due to some missing i915 // causes the frame validation failure. The bug is due to some missing i915
// patches in kernel v3.18. The bug will be fixed if the kernel is upreved to // patches in kernel v3.18. The bug will be fixed if the kernel is upreved to
...@@ -256,7 +256,7 @@ MD5VideoFrameValidator::Validate(scoped_refptr<const VideoFrame> frame, ...@@ -256,7 +256,7 @@ MD5VideoFrameValidator::Validate(scoped_refptr<const VideoFrame> frame,
if (is_skylake) if (is_skylake)
usleep(10); usleep(10);
} }
#endif // BUILDFLAG(USE_VAAPI) #endif // defined(OS_CHROMEOS) || BUILDFLAG(IS_LACROS)
if (frame->format() != validation_format_) { if (frame->format() != validation_format_) {
frame = ConvertVideoFrame(frame.get(), validation_format_); frame = ConvertVideoFrame(frame.get(), validation_format_);
} }
......
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