Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: media/filters/pipeline_integration_test.cc

Issue 512973002: Avoid deadlock between Pipeline and RendererImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reenable tests Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/base/pipeline.cc ('k') | media/filters/renderer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/filters/pipeline_integration_test_base.h" 5 #include "media/filters/pipeline_integration_test_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 1407 matching lines...) Expand 10 before | Expand all | Expand 10 after
1418 1418
1419 // Verify audio decoder & renderer can handle aborted demuxer reads. 1419 // Verify audio decoder & renderer can handle aborted demuxer reads.
1420 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_AudioOnly) { 1420 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_AudioOnly) {
1421 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-audio-only.webm", kAudioOnlyWebM, 1421 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-audio-only.webm", kAudioOnlyWebM,
1422 8192, 1422 8192,
1423 base::TimeDelta::FromMilliseconds(464), 1423 base::TimeDelta::FromMilliseconds(464),
1424 base::TimeDelta::FromMilliseconds(617), 1424 base::TimeDelta::FromMilliseconds(617),
1425 0x10CA, 19730)); 1425 0x10CA, 19730));
1426 } 1426 }
1427 1427
1428 // http://crbug.com/407452
1429 #if !defined(THREAD_SANITIZER)
1430 // Verify video decoder & renderer can handle aborted demuxer reads. 1428 // Verify video decoder & renderer can handle aborted demuxer reads.
1431 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { 1429 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
1432 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM, 1430 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM,
1433 32768, 1431 32768,
1434 base::TimeDelta::FromMilliseconds(167), 1432 base::TimeDelta::FromMilliseconds(167),
1435 base::TimeDelta::FromMilliseconds(1668), 1433 base::TimeDelta::FromMilliseconds(1668),
1436 0x1C896, 65536)); 1434 0x1C896, 65536));
1437 } 1435 }
1438 #endif // !defined(THREAD_SANITIZER)
1439 1436
1440 // Verify that Opus audio in WebM containers can be played back. 1437 // Verify that Opus audio in WebM containers can be played back.
1441 TEST_F(PipelineIntegrationTest, BasicPlayback_AudioOnly_Opus_WebM) { 1438 TEST_F(PipelineIntegrationTest, BasicPlayback_AudioOnly_Opus_WebM) {
1442 ASSERT_TRUE(Start(GetTestDataFilePath("bear-opus-end-trimming.webm"), 1439 ASSERT_TRUE(Start(GetTestDataFilePath("bear-opus-end-trimming.webm"),
1443 PIPELINE_OK)); 1440 PIPELINE_OK));
1444 Play(); 1441 Play();
1445 ASSERT_TRUE(WaitUntilOnEnded()); 1442 ASSERT_TRUE(WaitUntilOnEnded());
1446 } 1443 }
1447 1444
1448 // Verify that VP9 video in WebM containers can be played back. 1445 // Verify that VP9 video in WebM containers can be played back.
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1552 1549
1553 // Ensures audio-video playback with missing or negative timestamps fails softly 1550 // Ensures audio-video playback with missing or negative timestamps fails softly
1554 // instead of crashing. See http://crbug.com/396864. 1551 // instead of crashing. See http://crbug.com/396864.
1555 TEST_F(PipelineIntegrationTest, BasicPlaybackChainedOggVideo) { 1552 TEST_F(PipelineIntegrationTest, BasicPlaybackChainedOggVideo) {
1556 ASSERT_TRUE(Start(GetTestDataFilePath("double-bear.ogv"), PIPELINE_OK)); 1553 ASSERT_TRUE(Start(GetTestDataFilePath("double-bear.ogv"), PIPELINE_OK));
1557 Play(); 1554 Play();
1558 EXPECT_EQ(PIPELINE_ERROR_DECODE, WaitUntilEndedOrError()); 1555 EXPECT_EQ(PIPELINE_ERROR_DECODE, WaitUntilEndedOrError());
1559 } 1556 }
1560 1557
1561 } // namespace media 1558 } // namespace media
OLDNEW
« no previous file with comments | « media/base/pipeline.cc ('k') | media/filters/renderer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698