generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Workaround Mac align bug for observer_ and crit_.

Browse Source 
Unblocks rolling WebRTC into Chromium so we can debug what's actually
going on.

BUG=
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/39329004

Cr-Commit-Position: refs/heads/master@{#8528}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8528 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2015-02-27 14:28:15 +00:00
parent 3985f0151a
commit 6c2e506cf4
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/video_engine/vie_capturer.cc
View File

@ -53,8 +53,11 @@ class RegistrableCpuOveruseMetricsObserver : public CpuOveruseMetricsObserver {
} }
private: private:
mutable rtc::CriticalSection crit_; // TODO(pbos): Figure out why observer_ needs to be declared above crit_ on
// Mac. tommi@ also ran into this while debugging weird critical-section
// related alignment issues. Pushing this as a workaround to unblock rolling.
CpuOveruseMetricsObserver* observer_ GUARDED_BY(crit_) = nullptr; CpuOveruseMetricsObserver* observer_ GUARDED_BY(crit_) = nullptr;
mutable rtc::CriticalSection crit_;
CpuOveruseMetrics metrics_ GUARDED_BY(crit_); CpuOveruseMetrics metrics_ GUARDED_BY(crit_);
}; };