media/filters/pipeline_integration_test.cc - Issue 11139008: Change WebM parser to treat IVs from encrypted WebM as raw data.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/filters/pipeline_integration_test.cc

Issue 11139008: Change WebM parser to treat IVs from encrypted WebM as raw data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressing comments. Created 8 years, 2 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:

Index: media/filters/pipeline_integration_test.cc

diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc

index 77d3bf3a68fc65017f56dc0562b2219eb26f4b0f..ffafb0e181b979f4e9a2e2add946be9cb062352d 100644

--- a/media/filters/pipeline_integration_test.cc

+++ b/media/filters/pipeline_integration_test.cc

@@ -368,9 +368,7 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) {

ASSERT_TRUE(WaitUntilOnEnded());

}

-// TODO(fgalligan): Enable after WebM parser has been updated.

-// http://crbug.com/155641

-TEST_F(PipelineIntegrationTest, DISABLED_EncryptedPlayback) {

+TEST_F(PipelineIntegrationTest, EncryptedPlayback) {

MockMediaSource source("bear-320x240-encrypted.webm", kWebM, 219816);

FakeDecryptorClient encrypted_media;

StartPipelineWithEncryptedMedia(&source, &encrypted_media);