Chromium Code Reviews| 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 14 matching lines...) Expand all Loading... | |
| 25 // instead of in Audio{Input,Output}Buffer to be able to calculate size like so. | 25 // instead of in Audio{Input,Output}Buffer to be able to calculate size like so. |
| 26 // Use a macro for the alignment value that's the same as | 26 // Use a macro for the alignment value that's the same as |
| 27 // AudioBus::kChannelAlignment, since MSVC doesn't accept the latter to be used. | 27 // AudioBus::kChannelAlignment, since MSVC doesn't accept the latter to be used. |
| 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 alignas(PARAMETERS_ALIGNMENT) AudioInputBufferParameters { |
|
liberato (no reviews please)
2017/02/14 20:02:17
MEDIA_EXPORT is missing, here and @42.
dcheng
2017/02/14 20:06:53
The export aren't needed (see the green build), si
| |
| 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 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 }; | 46 }; |
| 47 #undef PARAMETERS_ALIGNMENT | 47 #undef PARAMETERS_ALIGNMENT |
| 48 #if defined(OS_WIN) | 48 #if defined(OS_WIN) |
| 49 #pragma warning(pop) | 49 #pragma warning(pop) |
| 50 #endif | 50 #endif |
| 51 | 51 |
| 52 static_assert(sizeof(AudioInputBufferParameters) % | 52 static_assert(sizeof(AudioInputBufferParameters) % |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 230 if (a.sample_rate() != b.sample_rate()) | 230 if (a.sample_rate() != b.sample_rate()) |
| 231 return a.sample_rate() < b.sample_rate(); | 231 return a.sample_rate() < b.sample_rate(); |
| 232 if (a.bits_per_sample() != b.bits_per_sample()) | 232 if (a.bits_per_sample() != b.bits_per_sample()) |
| 233 return a.bits_per_sample() < b.bits_per_sample(); | 233 return a.bits_per_sample() < b.bits_per_sample(); |
| 234 return a.frames_per_buffer() < b.frames_per_buffer(); | 234 return a.frames_per_buffer() < b.frames_per_buffer(); |
| 235 } | 235 } |
| 236 | 236 |
| 237 } // namespace media | 237 } // namespace media |
| 238 | 238 |
| 239 #endif // MEDIA_BASE_AUDIO_PARAMETERS_H_ | 239 #endif // MEDIA_BASE_AUDIO_PARAMETERS_H_ |
| OLD | NEW |