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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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
« no previous file with comments | « media/cdm/aes_decryptor.h ('k') | media/cdm/aes_decryptor_unittest.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/cdm/aes_decryptor.h" 5 #include "media/cdm/aes_decryptor.h"
6 6
7 #include <stddef.h>
8
7 #include <list> 9 #include <list>
8 #include <vector> 10 #include <vector>
9 11
10 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h"
11 #include "base/stl_util.h" 14 #include "base/stl_util.h"
12 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
13 #include "crypto/encryptor.h" 16 #include "crypto/encryptor.h"
14 #include "crypto/symmetric_key.h" 17 #include "crypto/symmetric_key.h"
15 #include "media/base/audio_decoder_config.h" 18 #include "media/base/audio_decoder_config.h"
16 #include "media/base/cdm_key_information.h" 19 #include "media/base/cdm_key_information.h"
17 #include "media/base/cdm_promise.h" 20 #include "media/base/cdm_promise.h"
18 #include "media/base/decoder_buffer.h" 21 #include "media/base/decoder_buffer.h"
19 #include "media/base/decrypt_config.h" 22 #include "media/base/decrypt_config.h"
20 #include "media/base/video_decoder_config.h" 23 #include "media/base/video_decoder_config.h"
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
604 bool AesDecryptor::DecryptionKey::Init() { 607 bool AesDecryptor::DecryptionKey::Init() {
605 CHECK(!secret_.empty()); 608 CHECK(!secret_.empty());
606 decryption_key_.reset(crypto::SymmetricKey::Import( 609 decryption_key_.reset(crypto::SymmetricKey::Import(
607 crypto::SymmetricKey::AES, secret_)); 610 crypto::SymmetricKey::AES, secret_));
608 if (!decryption_key_) 611 if (!decryption_key_)
609 return false; 612 return false;
610 return true; 613 return true;
611 } 614 }
612 615
613 } // namespace media 616 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/aes_decryptor.h ('k') | media/cdm/aes_decryptor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698