diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 21:15:36 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-03 21:15:36 +0000 |
| commit | 1e5f0256a2d63ada7268084ed35df3fc460b930e (patch) | |
| tree | cd284a4e0876834c2fb73c7da7a08ed0065698b2 /tools | |
| parent | 9395af55b075d0927f51762cb7c281ee2f44f703 (diff) | |
| download | chromium_src-1e5f0256a2d63ada7268084ed35df3fc460b930e.zip chromium_src-1e5f0256a2d63ada7268084ed35df3fc460b930e.tar.gz chromium_src-1e5f0256a2d63ada7268084ed35df3fc460b930e.tar.bz2 | |
Fix a few races due to lack of locking in AudioRendererImpl::FillBuffer().
Also switched to using kNoTimestamp() to represent uninitialized timestamps.
TBR=timurrrr
BUG=109875,112418,122447
TEST=tsan is happy, also run http://mastodon.sea/demos/crbug122447
Review URL: https://chromiumcodereview.appspot.com/10355006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
6 files changed, 2 insertions, 29 deletions
diff --git a/tools/valgrind/gtest_exclude/media_unittests.gtest-drmemory_win-xp.txt b/tools/valgrind/gtest_exclude/media_unittests.gtest-drmemory_win-xp.txt index 79bf1e4..d1a53cd 100644 --- a/tools/valgrind/gtest_exclude/media_unittests.gtest-drmemory_win-xp.txt +++ b/tools/valgrind/gtest_exclude/media_unittests.gtest-drmemory_win-xp.txt @@ -1,5 +1,4 @@ # http://code.google.com/p/drmemory/issues/detail?id=842 YUVConvertTest.RGB24ToYUV YUVConvertTest.SideBySideRGB -PipelineIntegrationTest.BasicPlayback SimpleSources.SineWaveAudio16MonoTest diff --git a/tools/valgrind/gtest_exclude/media_unittests.gtest-tsan_mac.txt b/tools/valgrind/gtest_exclude/media_unittests.gtest-tsan_mac.txt index 9185520..e69de29 100644 --- a/tools/valgrind/gtest_exclude/media_unittests.gtest-tsan_mac.txt +++ b/tools/valgrind/gtest_exclude/media_unittests.gtest-tsan_mac.txt @@ -1,3 +0,0 @@ -# This test fails reliably in tsan bots after r119048, exclude it for -# now. See http://crbug.com/109875 -PipelineIntegrationTest.SeekWhilePlaying diff --git a/tools/valgrind/gtest_exclude/media_unittests.gtest-tsan_win32.txt b/tools/valgrind/gtest_exclude/media_unittests.gtest-tsan_win32.txt index 2e06ebb..05d6076 100644 --- a/tools/valgrind/gtest_exclude/media_unittests.gtest-tsan_win32.txt +++ b/tools/valgrind/gtest_exclude/media_unittests.gtest-tsan_win32.txt @@ -1,8 +1,3 @@ -# This test fails reliably in tsan bots after r119048, exclude it for -# now. See http://crbug.com/109875 -PipelineIntegrationTest.SeekWhilePlaying # Win TSan disturbs ffmpeg's output, causing hash comparison assertion to fail. # http://crbug.com/120396 PipelineIntegrationTest.BasicPlayback -# Occasionally crashes, http://crbug.com/122447 -PipelineIntegrationTest.EncryptedPlayback diff --git a/tools/valgrind/gtest_exclude/media_unittests.gtest.txt b/tools/valgrind/gtest_exclude/media_unittests.gtest.txt index 1da6d96..7e22249 100644 --- a/tools/valgrind/gtest_exclude/media_unittests.gtest.txt +++ b/tools/valgrind/gtest_exclude/media_unittests.gtest.txt @@ -1,6 +1,3 @@ # This test tries to record fake audio in real-time. # This appears to be too sensitive to slowdown, see http://crbug.com/49497 FakeAudioInputTest.BasicCallbacks -# This test started timing out with chromium r120151 -# See http://crbug.com/112418 -PipelineIntegrationTest.ChunkDemuxerAbortRead_VideoOnly diff --git a/tools/valgrind/gtest_exclude/media_unittests.gtest_mac.txt b/tools/valgrind/gtest_exclude/media_unittests.gtest_mac.txt index a84b5de..e69de29 100644 --- a/tools/valgrind/gtest_exclude/media_unittests.gtest_mac.txt +++ b/tools/valgrind/gtest_exclude/media_unittests.gtest_mac.txt @@ -1,3 +0,0 @@ -# Occasionally crashes, http://crbug.com/122447 -PipelineIntegrationTest.BasicPlayback -PipelineIntegrationTest.EncryptedPlayback diff --git a/tools/valgrind/tsan/suppressions.txt b/tools/valgrind/tsan/suppressions.txt index 6aa307d..6c6c689 100644 --- a/tools/valgrind/tsan/suppressions.txt +++ b/tools/valgrind/tsan/suppressions.txt @@ -542,10 +542,10 @@ { bug_93932_f ThreadSanitizer:Race - fun:update_context_from_thread + ... fun:ff_thread_flush ... - fun:media::FFmpegVideoDecoder::Flush + fun:media::FFmpegVideoDecoder::Reset } { bug_93932_g @@ -790,18 +790,6 @@ fun:pa_rtpoll_run } { - bug_112200 - ThreadSanitizer:Race - ... - fun:ff_thread_flush - fun:avcodec_flush_buffers - fun:avcodec_flush_buffers - ... - fun:media::FFmpegVideoDecoder::Flush - fun:base::internal::RunnableAdapter::Run -} - -{ bug_112419 ThreadSanitizer:Race ... |