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 #ifndef MEDIA_BASE_DECODER_BUFFER_H_ | 5 #ifndef MEDIA_BASE_DECODER_BUFFER_H_ |
6 #define MEDIA_BASE_DECODER_BUFFER_H_ | 6 #define MEDIA_BASE_DECODER_BUFFER_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/macros.h" |
12 #include "base/memory/aligned_memory.h" | 13 #include "base/memory/aligned_memory.h" |
13 #include "base/memory/ref_counted.h" | 14 #include "base/memory/ref_counted.h" |
14 #include "base/memory/scoped_ptr.h" | 15 #include "base/memory/scoped_ptr.h" |
15 #include "base/time/time.h" | 16 #include "base/time/time.h" |
16 #include "build/build_config.h" | 17 #include "build/build_config.h" |
17 #include "media/base/decrypt_config.h" | 18 #include "media/base/decrypt_config.h" |
18 #include "media/base/media_export.h" | 19 #include "media/base/media_export.h" |
19 #include "media/base/timestamp_constants.h" | 20 #include "media/base/timestamp_constants.h" |
20 | 21 |
21 namespace media { | 22 namespace media { |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
204 | 205 |
205 // Constructor helper method for memory allocations. | 206 // Constructor helper method for memory allocations. |
206 void Initialize(); | 207 void Initialize(); |
207 | 208 |
208 DISALLOW_COPY_AND_ASSIGN(DecoderBuffer); | 209 DISALLOW_COPY_AND_ASSIGN(DecoderBuffer); |
209 }; | 210 }; |
210 | 211 |
211 } // namespace media | 212 } // namespace media |
212 | 213 |
213 #endif // MEDIA_BASE_DECODER_BUFFER_H_ | 214 #endif // MEDIA_BASE_DECODER_BUFFER_H_ |
OLD | NEW |