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

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

Issue 257563007: Don't double correct for discarded codec delay frames. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Style cleanup. Fix rendundant Initialize(). Created 6 years, 7 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 | « media/filters/opus_audio_decoder_unittest.cc ('k') | media/media.gyp » ('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 510 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 }; 521 };
522 522
523 TEST_F(PipelineIntegrationTest, BasicPlayback) { 523 TEST_F(PipelineIntegrationTest, BasicPlayback) {
524 ASSERT_TRUE(Start(GetTestDataFilePath("bear-320x240.webm"), PIPELINE_OK)); 524 ASSERT_TRUE(Start(GetTestDataFilePath("bear-320x240.webm"), PIPELINE_OK));
525 525
526 Play(); 526 Play();
527 527
528 ASSERT_TRUE(WaitUntilOnEnded()); 528 ASSERT_TRUE(WaitUntilOnEnded());
529 } 529 }
530 530
531 TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOgg) {
532 ASSERT_TRUE(Start(GetTestDataFilePath("bear-opus.ogg"), PIPELINE_OK));
533
534 Play();
535
536 ASSERT_TRUE(WaitUntilOnEnded());
537 }
538
531 TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) { 539 TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
532 ASSERT_TRUE(Start( 540 ASSERT_TRUE(Start(
533 GetTestDataFilePath("bear-320x240.webm"), PIPELINE_OK, kHashed)); 541 GetTestDataFilePath("bear-320x240.webm"), PIPELINE_OK, kHashed));
534 542
535 Play(); 543 Play();
536 544
537 ASSERT_TRUE(WaitUntilOnEnded()); 545 ASSERT_TRUE(WaitUntilOnEnded());
538 546
539 EXPECT_EQ("f0be120a90a811506777c99a2cdf7cc1", GetVideoHash()); 547 EXPECT_EQ("f0be120a90a811506777c99a2cdf7cc1", GetVideoHash());
540 EXPECT_EQ("-3.59,-2.06,-0.43,2.15,0.77,-0.95,", GetAudioHash()); 548 EXPECT_EQ("-3.59,-2.06,-0.43,2.15,0.77,-0.95,", GetAudioHash());
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
1274 Play(); 1282 Play();
1275 ASSERT_TRUE(WaitUntilOnEnded()); 1283 ASSERT_TRUE(WaitUntilOnEnded());
1276 } 1284 }
1277 1285
1278 // TODO(wolenetz): Enable MSE testing of new frame processor based on this flag, 1286 // 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. 1287 // once the new processor has landed. See http://crbug.com/249422.
1280 INSTANTIATE_TEST_CASE_P(LegacyFrameProcessor, PipelineIntegrationTest, 1288 INSTANTIATE_TEST_CASE_P(LegacyFrameProcessor, PipelineIntegrationTest,
1281 Values(true)); 1289 Values(true));
1282 1290
1283 } // namespace media 1291 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/opus_audio_decoder_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698