Fix deadlock in RegisterPreDecodeImageCallback.

Fixes lock-order inversion between ViEChannel::callback_cs_ and
VideoReceiver::_receiveCritSect detected on DrMemory Full which
exhibited different timing behavior.

Also removes most of the suppressions on DrMemory Full as they're able
to run again without deadlocking.

BUG=3336,3375
TEST=Run DrMemory Full trybots.
R=mflodman@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6228 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2014-05-23 09:41:07 +00:00
parent bc524ae41a
commit 6e98ef4b35
3 changed files with 55 additions and 53 deletions

View File

@@ -1,5 +1,8 @@
# Fails on Dr Memory Full.
# https://code.google.com/p/webrtc/issues/detail?id=3336
WebRtcVideoChannel2BaseTest.*
# Times out before finishing on DrMemory Full
# https://code.google.com/p/webrtc/issues/detail?id=3375
WebRtcVideoChannel2BaseTest.SimulateConference
WebRtcVideoChannel2BaseTest.TwoStreamsSendAndReceive
WebRtcVideoChannel2BaseTest.TwoStreamsReUseFirstStream
# https://code.google.com/p/webrtc/issues/detail?id=3158
WebRtcVideoMediaChannelTest.SendVp8HdAndReceiveAdaptedVp8Vga