| OLD | NEW |
| 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_BASE_AUDIO_BUFFER_H_ | 5 #ifndef MEDIA_BASE_AUDIO_BUFFER_H_ |
| 6 #define MEDIA_BASE_AUDIO_BUFFER_H_ | 6 #define MEDIA_BASE_AUDIO_BUFFER_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/macros.h" |
| 10 #include "base/memory/aligned_memory.h" | 11 #include "base/memory/aligned_memory.h" |
| 11 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
| 12 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/time/time.h" | 14 #include "base/time/time.h" |
| 14 #include "media/base/channel_layout.h" | 15 #include "media/base/channel_layout.h" |
| 15 #include "media/base/media_export.h" | 16 #include "media/base/media_export.h" |
| 16 #include "media/base/sample_format.h" | 17 #include "media/base/sample_format.h" |
| 17 | 18 |
| 18 namespace mojo { | 19 namespace mojo { |
| 19 template <typename T, typename U> | 20 template <typename T, typename U> |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 | 172 |
| 172 // For planar data, points to each channels data. | 173 // For planar data, points to each channels data. |
| 173 std::vector<uint8_t*> channel_data_; | 174 std::vector<uint8_t*> channel_data_; |
| 174 | 175 |
| 175 DISALLOW_IMPLICIT_CONSTRUCTORS(AudioBuffer); | 176 DISALLOW_IMPLICIT_CONSTRUCTORS(AudioBuffer); |
| 176 }; | 177 }; |
| 177 | 178 |
| 178 } // namespace media | 179 } // namespace media |
| 179 | 180 |
| 180 #endif // MEDIA_BASE_AUDIO_BUFFER_H_ | 181 #endif // MEDIA_BASE_AUDIO_BUFFER_H_ |
| OLD | NEW |