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

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

Issue 10790147: Fix file size in EncryptedPlayback test. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 "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 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
279 Play(); 279 Play();
280 280
281 ASSERT_TRUE(WaitUntilOnEnded()); 281 ASSERT_TRUE(WaitUntilOnEnded());
282 source.Abort(); 282 source.Abort();
283 Stop(); 283 Stop();
284 } 284 }
285 285
286 // TODO(fgalligan): Enable test when encrypted test data is updated and new 286 // TODO(fgalligan): Enable test when encrypted test data is updated and new
287 // decryption code is landed. http://crbug.com/132801 287 // decryption code is landed. http://crbug.com/132801
288 TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) { 288 TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) {
289 MockMediaSource source("bear-320x240-encrypted.webm", 219726, true, true); 289 MockMediaSource source("bear-320x240-encrypted.webm", 220730, true, true);
290 FakeDecryptorClient encrypted_media; 290 FakeDecryptorClient encrypted_media;
291 StartPipelineWithEncryptedMedia(&source, &encrypted_media); 291 StartPipelineWithEncryptedMedia(&source, &encrypted_media);
292 292
293 source.EndOfStream(); 293 source.EndOfStream();
294 ASSERT_EQ(PIPELINE_OK, pipeline_status_); 294 ASSERT_EQ(PIPELINE_OK, pipeline_status_);
295 295
296 Play(); 296 Play();
297 297
298 ASSERT_TRUE(WaitUntilOnEnded()); 298 ASSERT_TRUE(WaitUntilOnEnded());
299 source.Abort(); 299 source.Abort();
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 354
355 // Verify video decoder & renderer can handle aborted demuxer reads. 355 // Verify video decoder & renderer can handle aborted demuxer reads.
356 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { 356 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
357 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768, 357 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", 32768,
358 base::TimeDelta::FromMilliseconds(200), 358 base::TimeDelta::FromMilliseconds(200),
359 base::TimeDelta::FromMilliseconds(1668), 359 base::TimeDelta::FromMilliseconds(1668),
360 0x1C896, 65536, false, true)); 360 0x1C896, 65536, false, true));
361 } 361 }
362 362
363 } // namespace media 363 } // 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