media/cdm/aes_decryptor.cc - Issue 22362007: Relocate last remnants of webkit/renderer/media code.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: media/cdm/aes_decryptor.cc

Issue 22362007: Relocate last remnants of webkit/renderer/media code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Make chromeos crypto dep explicit. Created 7 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

OLD	NEW
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/crypto/aes_decryptor.h"	5 #include "media/cdm/aes_decryptor.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/stl_util.h"	10 #include "base/stl_util.h"

11 #include "base/strings/string_number_conversions.h"	11 #include "base/strings/string_number_conversions.h"

12 #include "crypto/encryptor.h"	12 #include "crypto/encryptor.h"

13 #include "crypto/symmetric_key.h"	13 #include "crypto/symmetric_key.h"

14 #include "media/base/audio_decoder_config.h"	14 #include "media/base/audio_decoder_config.h"

15 #include "media/base/decoder_buffer.h"	15 #include "media/base/decoder_buffer.h"

(...skipping 320 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
336 bool AesDecryptor::DecryptionKey::Init() {	336 bool AesDecryptor::DecryptionKey::Init() {

337 CHECK(!secret_.empty());	337 CHECK(!secret_.empty());

338 decryption_key_.reset(crypto::SymmetricKey::Import(	338 decryption_key_.reset(crypto::SymmetricKey::Import(

339 crypto::SymmetricKey::AES, secret_));	339 crypto::SymmetricKey::AES, secret_));

340 if (!decryption_key_)	340 if (!decryption_key_)

341 return false;	341 return false;

342 return true;	342 return true;

343 }	343 }

344	344

345 } // namespace media	345 } // namespace media

OLD	NEW

« no previous file with comments | « media/cdm/aes_decryptor.h ('k') | media/cdm/aes_decryptor_unittest.cc » ('j') | no next file with comments »