| 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_AUDIO_PARAMETERS_H_ | 5 #ifndef MEDIA_BASE_AUDIO_PARAMETERS_H_ |
| 6 #define MEDIA_BASE_AUDIO_PARAMETERS_H_ | 6 #define MEDIA_BASE_AUDIO_PARAMETERS_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 double volume; | 36 double volume; |
| 37 uint32_t size; | 37 uint32_t size; |
| 38 uint32_t hardware_delay_bytes; | 38 uint32_t hardware_delay_bytes; |
| 39 uint32_t id; | 39 uint32_t id; |
| 40 bool key_pressed; | 40 bool key_pressed; |
| 41 }; | 41 }; |
| 42 struct MEDIA_EXPORT ALIGNAS(PARAMETERS_ALIGNMENT) AudioOutputBufferParameters { | 42 struct MEDIA_EXPORT ALIGNAS(PARAMETERS_ALIGNMENT) AudioOutputBufferParameters { |
| 43 uint32_t frames_skipped; | 43 uint32_t frames_skipped; |
| 44 int64_t delay; | 44 int64_t delay; |
| 45 int64_t delay_timestamp; | 45 int64_t delay_timestamp; |
| 46 uint32_t frames; |
| 47 uint32_t data_size; |
| 46 }; | 48 }; |
| 47 #undef PARAMETERS_ALIGNMENT | 49 #undef PARAMETERS_ALIGNMENT |
| 48 #if defined(OS_WIN) | 50 #if defined(OS_WIN) |
| 49 #pragma warning(pop) | 51 #pragma warning(pop) |
| 50 #endif | 52 #endif |
| 51 | 53 |
| 52 static_assert(sizeof(AudioInputBufferParameters) % | 54 static_assert(sizeof(AudioInputBufferParameters) % |
| 53 AudioBus::kChannelAlignment == | 55 AudioBus::kChannelAlignment == |
| 54 0, | 56 0, |
| 55 "AudioInputBufferParameters not aligned"); | 57 "AudioInputBufferParameters not aligned"); |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 if (a.sample_rate() != b.sample_rate()) | 232 if (a.sample_rate() != b.sample_rate()) |
| 231 return a.sample_rate() < b.sample_rate(); | 233 return a.sample_rate() < b.sample_rate(); |
| 232 if (a.bits_per_sample() != b.bits_per_sample()) | 234 if (a.bits_per_sample() != b.bits_per_sample()) |
| 233 return a.bits_per_sample() < b.bits_per_sample(); | 235 return a.bits_per_sample() < b.bits_per_sample(); |
| 234 return a.frames_per_buffer() < b.frames_per_buffer(); | 236 return a.frames_per_buffer() < b.frames_per_buffer(); |
| 235 } | 237 } |
| 236 | 238 |
| 237 } // namespace media | 239 } // namespace media |
| 238 | 240 |
| 239 #endif // MEDIA_BASE_AUDIO_PARAMETERS_H_ | 241 #endif // MEDIA_BASE_AUDIO_PARAMETERS_H_ |
| OLD | NEW |