| 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 17 matching lines...) Expand all Loading... |
| 28 #if defined(OS_WIN) | 28 #if defined(OS_WIN) |
| 29 #pragma warning(push) | 29 #pragma warning(push) |
| 30 #pragma warning(disable : 4324) // Disable warning for added padding. | 30 #pragma warning(disable : 4324) // Disable warning for added padding. |
| 31 #endif | 31 #endif |
| 32 #define PARAMETERS_ALIGNMENT 16 | 32 #define PARAMETERS_ALIGNMENT 16 |
| 33 static_assert(AudioBus::kChannelAlignment == PARAMETERS_ALIGNMENT, | 33 static_assert(AudioBus::kChannelAlignment == PARAMETERS_ALIGNMENT, |
| 34 "Audio buffer parameters struct alignment not same as AudioBus"); | 34 "Audio buffer parameters struct alignment not same as AudioBus"); |
| 35 struct MEDIA_EXPORT ALIGNAS(PARAMETERS_ALIGNMENT) AudioInputBufferParameters { | 35 struct MEDIA_EXPORT ALIGNAS(PARAMETERS_ALIGNMENT) AudioInputBufferParameters { |
| 36 double volume; | 36 double volume; |
| 37 uint32_t size; | 37 uint32_t size; |
| 38 uint32_t hardware_delay_bytes; | 38 int64_t delay; // delay in microseconds |
| 39 int64_t delay_timestamp; // base::TimeTicks in microseconds. |
| 39 uint32_t id; | 40 uint32_t id; |
| 40 bool key_pressed; | 41 bool key_pressed; |
| 41 }; | 42 }; |
| 42 struct MEDIA_EXPORT ALIGNAS(PARAMETERS_ALIGNMENT) AudioOutputBufferParameters { | 43 struct MEDIA_EXPORT ALIGNAS(PARAMETERS_ALIGNMENT) AudioOutputBufferParameters { |
| 43 uint32_t frames_skipped; | 44 uint32_t frames_skipped; |
| 44 int64_t delay; | 45 int64_t delay; // delay in microseconds. |
| 45 int64_t delay_timestamp; | 46 int64_t delay_timestamp; // base::TimeTicks in microseconds. |
| 46 }; | 47 }; |
| 47 #undef PARAMETERS_ALIGNMENT | 48 #undef PARAMETERS_ALIGNMENT |
| 48 #if defined(OS_WIN) | 49 #if defined(OS_WIN) |
| 49 #pragma warning(pop) | 50 #pragma warning(pop) |
| 50 #endif | 51 #endif |
| 51 | 52 |
| 52 static_assert(sizeof(AudioInputBufferParameters) % | 53 static_assert(sizeof(AudioInputBufferParameters) % |
| 53 AudioBus::kChannelAlignment == | 54 AudioBus::kChannelAlignment == |
| 54 0, | 55 0, |
| 55 "AudioInputBufferParameters not aligned"); | 56 "AudioInputBufferParameters not aligned"); |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 if (a.sample_rate() != b.sample_rate()) | 231 if (a.sample_rate() != b.sample_rate()) |
| 231 return a.sample_rate() < b.sample_rate(); | 232 return a.sample_rate() < b.sample_rate(); |
| 232 if (a.bits_per_sample() != b.bits_per_sample()) | 233 if (a.bits_per_sample() != b.bits_per_sample()) |
| 233 return a.bits_per_sample() < b.bits_per_sample(); | 234 return a.bits_per_sample() < b.bits_per_sample(); |
| 234 return a.frames_per_buffer() < b.frames_per_buffer(); | 235 return a.frames_per_buffer() < b.frames_per_buffer(); |
| 235 } | 236 } |
| 236 | 237 |
| 237 } // namespace media | 238 } // namespace media |
| 238 | 239 |
| 239 #endif // MEDIA_BASE_AUDIO_PARAMETERS_H_ | 240 #endif // MEDIA_BASE_AUDIO_PARAMETERS_H_ |
| OLD | NEW |