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

Side by Side Diff: media/cdm/ppapi/ppapi_cdm_buffer.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_PPAPI_CDM_BUFFER_H_ 5 #ifndef MEDIA_CDM_PPAPI_PPAPI_CDM_BUFFER_H_
6 #define MEDIA_CDM_PPAPI_PPAPI_CDM_BUFFER_H_ 6 #define MEDIA_CDM_PPAPI_PPAPI_CDM_BUFFER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/macros.h"
13 #include "build/build_config.h" 13 #include "build/build_config.h"
14 #include "media/cdm/api/content_decryption_module.h" 14 #include "media/cdm/api/content_decryption_module.h"
15 #include "ppapi/c/pp_errors.h" 15 #include "ppapi/c/pp_errors.h"
16 #include "ppapi/c/pp_stdint.h" 16 #include "ppapi/c/pp_stdint.h"
17 #include "ppapi/cpp/dev/buffer_dev.h" 17 #include "ppapi/cpp/dev/buffer_dev.h"
18 #include "ppapi/cpp/instance.h" 18 #include "ppapi/cpp/instance.h"
19 #include "ppapi/cpp/logging.h" 19 #include "ppapi/cpp/logging.h"
20 20
21 namespace media { 21 namespace media {
22 22
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 uint32_t next_buffer_id_; 88 uint32_t next_buffer_id_;
89 AllocatedBufferMap allocated_buffers_; 89 AllocatedBufferMap allocated_buffers_;
90 FreeBufferMap free_buffers_; 90 FreeBufferMap free_buffers_;
91 91
92 DISALLOW_COPY_AND_ASSIGN(PpbBufferAllocator); 92 DISALLOW_COPY_AND_ASSIGN(PpbBufferAllocator);
93 }; 93 };
94 94
95 } // namespace media 95 } // namespace media
96 96
97 #endif // MEDIA_CDM_PPAPI_PPAPI_CDM_BUFFER_H_ 97 #endif // MEDIA_CDM_PPAPI_PPAPI_CDM_BUFFER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698