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

Side by Side Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.h

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more 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
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 #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 5 #ifndef MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
6 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 6 #define MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/basictypes.h"
14 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
15 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
16 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
17 #include "base/synchronization/lock.h" 16 #include "base/synchronization/lock.h"
18 #include "media/cdm/aes_decryptor.h" 17 #include "media/cdm/aes_decryptor.h"
19 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h" 18 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm_common.h"
20 19
21 // Enable this to use the fake decoder for testing. 20 // Enable this to use the fake decoder for testing.
22 // TODO(tomfinegan): Move fake audio decoder into a separate class. 21 // TODO(tomfinegan): Move fake audio decoder into a separate class.
23 #if 0 22 #if 0
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 scoped_ptr<CdmVideoDecoder> video_decoder_; 206 scoped_ptr<CdmVideoDecoder> video_decoder_;
208 207
209 scoped_ptr<FileIOTestRunner> file_io_test_runner_; 208 scoped_ptr<FileIOTestRunner> file_io_test_runner_;
210 209
211 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm); 210 DISALLOW_COPY_AND_ASSIGN(ClearKeyCdm);
212 }; 211 };
213 212
214 } // namespace media 213 } // namespace media
215 214
216 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_ 215 #endif // MEDIA_CDM_PPAPI_EXTERNAL_CLEAR_KEY_CLEAR_KEY_CDM_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698