media/filters/pipeline_integration_test_base.cc - Issue 10535029: Add support for encrypted WebM files as defined in the RFC.

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_base.cc

Issue 10535029: Add support for encrypted WebM files as defined in the RFC. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Addressing comments in the CL. Created 8 years, 6 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_base.cc

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

index 565d3b76f74dd1a3c9d61e6a551cf34d73015907..bc1413056fc5ae9913d76189d0680113952d38cc 100644

--- a/media/filters/pipeline_integration_test_base.cc

+++ b/media/filters/pipeline_integration_test_base.cc

@@ -186,7 +186,7 @@ PipelineIntegrationTestBase::CreateFilterCollection(

const scoped_refptr<Demuxer>& demuxer) {

scoped_ptr<FilterCollection> collection(new FilterCollection());

collection->SetDemuxer(demuxer);

- decryptor_.reset(new AesDecryptor());

+ decryptor_.reset(new HmacAesDecryptor());

collection->AddAudioDecoder(new FFmpegAudioDecoder(

base::Bind(&MessageLoopFactory::GetMessageLoop,

base::Unretained(message_loop_factory_.get()),