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

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

Issue 10824304: Upgrade AudioBus to support wrapping, interleaving. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments. Created 8 years, 4 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
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 "media/base/decoder_buffer.h" 8 #include "media/base/decoder_buffer.h"
9 #include "media/base/decryptor_client.h" 9 #include "media/base/decryptor_client.h"
10 #include "media/base/test_data_util.h" 10 #include "media/base/test_data_util.h"
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 } 250 }
251 251
252 TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) { 252 TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
253 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240.webm"), PIPELINE_OK, true)); 253 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240.webm"), PIPELINE_OK, true));
254 254
255 Play(); 255 Play();
256 256
257 ASSERT_TRUE(WaitUntilOnEnded()); 257 ASSERT_TRUE(WaitUntilOnEnded());
258 258
259 EXPECT_EQ(GetVideoHash(), "f0be120a90a811506777c99a2cdf7cc1"); 259 EXPECT_EQ(GetVideoHash(), "f0be120a90a811506777c99a2cdf7cc1");
260 EXPECT_EQ(GetAudioHash(), "6138555be3389e6aba4c8e6f70195d50"); 260 EXPECT_EQ(GetAudioHash(), "5699a4415b620e45b9d0aae531c9df76");
scherkus (not reviewing) 2012/08/16 18:58:19 ?
DaleCurtis 2012/08/16 19:50:33 The old interleave/deinterleave code had an off by
261 } 261 }
262 262
263 TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) { 263 TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
264 MockMediaSource source("bear-320x240.webm", 219229, true, true); 264 MockMediaSource source("bear-320x240.webm", 219229, true, true);
265 StartPipelineWithMediaSource(&source); 265 StartPipelineWithMediaSource(&source);
266 source.EndOfStream(); 266 source.EndOfStream();
267 ASSERT_EQ(pipeline_status_, PIPELINE_OK); 267 ASSERT_EQ(pipeline_status_, PIPELINE_OK);
268 268
269 EXPECT_EQ(pipeline_->GetBufferedTimeRanges().size(), 1u); 269 EXPECT_EQ(pipeline_->GetBufferedTimeRanges().size(), 1u);
270 EXPECT_EQ(pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds(), 0); 270 EXPECT_EQ(pipeline_->GetBufferedTimeRanges().start(0).InMilliseconds(), 0);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 353
354 // Verify video decoder & renderer can handle aborted demuxer reads. 354 // Verify video decoder & renderer can handle aborted demuxer reads.
355 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { 355 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
356 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768, 356 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768,
357 base::TimeDelta::FromMilliseconds(200), 357 base::TimeDelta::FromMilliseconds(200),
358 base::TimeDelta::FromMilliseconds(1668), 358 base::TimeDelta::FromMilliseconds(1668),
359 0x1C896, 65536, false, true)); 359 0x1C896, 65536, false, true));
360 } 360 }
361 361
362 } // namespace media 362 } // namespace media
OLDNEW
« media/base/audio_bus.cc ('K') | « media/filters/audio_renderer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698