| 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_DATA_BUFFER_H_ | 5 #ifndef MEDIA_BASE_DATA_BUFFER_H_ |
| 6 #define MEDIA_BASE_DATA_BUFFER_H_ | 6 #define MEDIA_BASE_DATA_BUFFER_H_ |
| 7 | 7 |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/macros.h" |
| 9 #include "base/memory/ref_counted.h" | 10 #include "base/memory/ref_counted.h" |
| 10 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 11 #include "base/time/time.h" | 12 #include "base/time/time.h" |
| 12 #include "media/base/media_export.h" | 13 #include "media/base/media_export.h" |
| 13 | 14 |
| 14 namespace media { | 15 namespace media { |
| 15 | 16 |
| 16 // A simple buffer that takes ownership of the given data pointer or allocates | 17 // A simple buffer that takes ownership of the given data pointer or allocates |
| 17 // as necessary. | 18 // as necessary. |
| 18 // | 19 // |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 scoped_ptr<uint8_t[]> data_; | 105 scoped_ptr<uint8_t[]> data_; |
| 105 int buffer_size_; | 106 int buffer_size_; |
| 106 int data_size_; | 107 int data_size_; |
| 107 | 108 |
| 108 DISALLOW_COPY_AND_ASSIGN(DataBuffer); | 109 DISALLOW_COPY_AND_ASSIGN(DataBuffer); |
| 109 }; | 110 }; |
| 110 | 111 |
| 111 } // namespace media | 112 } // namespace media |
| 112 | 113 |
| 113 #endif // MEDIA_BASE_DATA_BUFFER_H_ | 114 #endif // MEDIA_BASE_DATA_BUFFER_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1535193003:
Add missing macros includes in media/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master