diff options
| author | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-27 00:52:23 +0000 |
|---|---|---|
| committer | dalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-27 00:52:23 +0000 |
| commit | e438193010bfe544a23b002eb751fe28764c1411 (patch) | |
| tree | 67d8602468f86cae7d78c1a7a1ef0bfe65ccea48 /media | |
| parent | 97087f224723d0899f14601d32a67943c6d6f4c4 (diff) | |
| download | chromium_src-e438193010bfe544a23b002eb751fe28764c1411.zip chromium_src-e438193010bfe544a23b002eb751fe28764c1411.tar.gz chromium_src-e438193010bfe544a23b002eb751fe28764c1411.tar.bz2 | |
Renable hashing for the basic playback test.
Now that hashing is fixed, trial turning it on again for the basic
playback test. Tested as much as I can locally since there are no
win_tsan, win_valgrind try bots.
BUG=none
TEST=valgrind, tsan, win_drmemory trybot.
Review URL: http://codereview.chromium.org/9809031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129073 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/pipeline_integration_test.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc index c5d98fb..0a898f8 100644 --- a/media/filters/pipeline_integration_test.cc +++ b/media/filters/pipeline_integration_test.cc @@ -128,9 +128,7 @@ TEST_F(PipelineIntegrationTest, BasicPlayback) { ASSERT_TRUE(WaitUntilOnEnded()); - // TODO(dalecurtis): Due to threading issues in FFmpeg, frames are not always - // decoded exactly, see http://crbug.com/93932 and http://crbug.com/109875. - // ASSERT_EQ(GetVideoHash(), "f0be120a90a811506777c99a2cdf7cc1"); + ASSERT_EQ(GetVideoHash(), "f0be120a90a811506777c99a2cdf7cc1"); } // TODO(xhwang): Enable this test when AddKey is integrated into pipeline. |