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

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

Issue 252633002: Disable test so test data file can be updated. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | 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 637 matching lines...) Expand 10 before | Expand all | Expand 10 after
648 EXPECT_EQ(kVP8AWebMFileDurationMs, 648 EXPECT_EQ(kVP8AWebMFileDurationMs,
649 pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds()); 649 pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
650 650
651 Play(); 651 Play();
652 652
653 ASSERT_TRUE(WaitUntilOnEnded()); 653 ASSERT_TRUE(WaitUntilOnEnded());
654 source.Abort(); 654 source.Abort();
655 Stop(); 655 Stop();
656 } 656 }
657 657
658 TEST_P(PipelineIntegrationTest, BasicPlayback_MediaSource_Opus_WebM) { 658 // Disabled until the fix for http://crbug.com/366750 is landed.
659 TEST_P(PipelineIntegrationTest, DISABLED_BasicPlayback_MediaSource_Opus_WebM) {
659 MockMediaSource source("bear-opus-end-trimming.webm", kOpusAudioOnlyWebM, 660 MockMediaSource source("bear-opus-end-trimming.webm", kOpusAudioOnlyWebM,
660 kAppendWholeFile, GetParam()); 661 kAppendWholeFile, GetParam());
661 StartPipelineWithMediaSource(&source); 662 StartPipelineWithMediaSource(&source);
662 source.EndOfStream(); 663 source.EndOfStream();
663 664
664 EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size()); 665 EXPECT_EQ(1u, pipeline_->GetBufferedTimeRanges().size());
665 EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds()); 666 EXPECT_EQ(0, pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds());
666 EXPECT_EQ(kOpusEndTrimmingWebMFileDurationMs, 667 EXPECT_EQ(kOpusEndTrimmingWebMFileDurationMs,
667 pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds()); 668 pipeline_->GetBufferedTimeRanges().end(0).InMilliseconds());
668 Play(); 669 Play();
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 Play(); 1275 Play();
1275 ASSERT_TRUE(WaitUntilOnEnded()); 1276 ASSERT_TRUE(WaitUntilOnEnded());
1276 } 1277 }
1277 1278
1278 // TODO(wolenetz): Enable MSE testing of new frame processor based on this flag, 1279 // TODO(wolenetz): Enable MSE testing of new frame processor based on this flag,
1279 // once the new processor has landed. See http://crbug.com/249422. 1280 // once the new processor has landed. See http://crbug.com/249422.
1280 INSTANTIATE_TEST_CASE_P(LegacyFrameProcessor, PipelineIntegrationTest, 1281 INSTANTIATE_TEST_CASE_P(LegacyFrameProcessor, PipelineIntegrationTest,
1281 Values(true)); 1282 Values(true));
1282 1283
1283 } // namespace media 1284 } // namespace media
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698