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

H264: Don't disable compiler warning by using NO_THREAD_SAFETY_ANALYSIS.

Browse Source 
The LockManagerOperation global function uses void** which does not work
well with the thread_annotations.h macros and produce compiler warnings
on clang (chromium default). Workarounds to this is hacky and unhelpful
so we disable the analysis for this function, which isn't helpful in
this case anyway.

webrtc_h264_config is no longer needed and is removed.

BUG=8090, 8119

Review-Url: https://codereview.webrtc.org/3000263002
Cr-Commit-Position: refs/heads/master@{#19425}
This commit is contained in:
hbos
2017-08-21 05:17:17 -07:00
committed by Commit Bot
parent ed0e436688
commit 228fb0e1ec
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/video_coding/codecs/h264/OWNERS Normal file
View File

@ -0,0 +1,2 @@
hbos@webrtc.org
sprang@webrtc.org

5
webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc
View File

@ -50,9 +50,10 @@ rtc::CriticalSection ffmpeg_init_lock;
bool ffmpeg_initialized = false;
// Called by FFmpeg to do mutex operations if initialized using
// |InitializeFFmpeg|.
// |InitializeFFmpeg|. Disabling thread safety analysis because void** does not
// play nicely with thread_annotations.h macros.
int LockManagerOperation(void** lock, AVLockOp op)
EXCLUSIVE_LOCK_FUNCTION() UNLOCK_FUNCTION() {
NO_THREAD_SAFETY_ANALYSIS {
switch (op) {
case AV_LOCK_CREATE:
*lock = new rtc::CriticalSection();