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

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

Issue 10917308: Remove the checksum/HMAC code from the decryptor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix proxy_decryptor_unittest. Created 8 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 | Annotate | Revision Log
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/mp4/mp4_stream_parser.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/string_util.h" 8 #include "base/string_util.h"
9 #include "media/base/decoder_buffer.h" 9 #include "media/base/decoder_buffer.h"
10 #include "media/base/decryptor_client.h" 10 #include "media/base/decryptor_client.h"
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 } 355 }
356 #endif 356 #endif
357 357
358 TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) { 358 TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) {
359 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240-16x9-aspect.webm"), 359 ASSERT_TRUE(Start(GetTestDataURL("bear-320x240-16x9-aspect.webm"),
360 PIPELINE_OK)); 360 PIPELINE_OK));
361 Play(); 361 Play();
362 ASSERT_TRUE(WaitUntilOnEnded()); 362 ASSERT_TRUE(WaitUntilOnEnded());
363 } 363 }
364 364
365 // TODO(fgalligan): Enable after HMAC has been removed. http://crbug.com/150014 365 TEST_F(PipelineIntegrationTest, EncryptedPlayback) {
366 TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) {
367 MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 219816); 366 MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 219816);
368 FakeDecryptorClient encrypted_media; 367 FakeDecryptorClient encrypted_media;
369 StartPipelineWithEncryptedMedia(&source, &encrypted_media); 368 StartPipelineWithEncryptedMedia(&source, &encrypted_media);
370 369
371 source.EndOfStream(); 370 source.EndOfStream();
372 ASSERT_EQ(PIPELINE_OK, pipeline_status_); 371 ASSERT_EQ(PIPELINE_OK, pipeline_status_);
373 372
374 Play(); 373 Play();
375 374
376 ASSERT_TRUE(WaitUntilOnEnded()); 375 ASSERT_TRUE(WaitUntilOnEnded());
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 // Verify video decoder & renderer can handle aborted demuxer reads. 433 // Verify video decoder & renderer can handle aborted demuxer reads.
435 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) { 434 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_VideoOnly) {
436 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM, 435 ASSERT_TRUE(TestSeekDuringRead("bear-320x240-video-only.webm", kVideoOnlyWebM,
437 32768, 436 32768,
438 base::TimeDelta::FromMilliseconds(200), 437 base::TimeDelta::FromMilliseconds(200),
439 base::TimeDelta::FromMilliseconds(1668), 438 base::TimeDelta::FromMilliseconds(1668),
440 0x1C896, 65536)); 439 0x1C896, 65536));
441 } 440 }
442 441
443 } // namespace media 442 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | media/mp4/mp4_stream_parser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698