Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: media/audio/audio_parameters.h

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « media/audio/audio_output_stream_sink.h ('k') | media/audio/audio_parameters_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_AUDIO_AUDIO_PARAMETERS_H_ 5 #ifndef MEDIA_AUDIO_AUDIO_PARAMETERS_H_
6 #define MEDIA_AUDIO_AUDIO_PARAMETERS_H_ 6 #define MEDIA_AUDIO_AUDIO_PARAMETERS_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <string> 9 #include <string>
10 10
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "build/build_config.h"
13 #include "media/audio/point.h" 14 #include "media/audio/point.h"
14 #include "media/base/audio_bus.h" 15 #include "media/base/audio_bus.h"
15 #include "media/base/channel_layout.h" 16 #include "media/base/channel_layout.h"
16 #include "media/base/media_export.h" 17 #include "media/base/media_export.h"
17 18
18 namespace media { 19 namespace media {
19 20
20 // Use a struct-in-struct approach to ensure that we can calculate the required 21 // Use a struct-in-struct approach to ensure that we can calculate the required
21 // size as sizeof(Audio{Input,Output}BufferParameters) + #(bytes in audio 22 // size as sizeof(Audio{Input,Output}BufferParameters) + #(bytes in audio
22 // buffer) without using packing. Also align Audio{Input,Output}BufferParameters 23 // buffer) without using packing. Also align Audio{Input,Output}BufferParameters
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 if (a.sample_rate() != b.sample_rate()) 204 if (a.sample_rate() != b.sample_rate())
204 return a.sample_rate() < b.sample_rate(); 205 return a.sample_rate() < b.sample_rate();
205 if (a.bits_per_sample() != b.bits_per_sample()) 206 if (a.bits_per_sample() != b.bits_per_sample())
206 return a.bits_per_sample() < b.bits_per_sample(); 207 return a.bits_per_sample() < b.bits_per_sample();
207 return a.frames_per_buffer() < b.frames_per_buffer(); 208 return a.frames_per_buffer() < b.frames_per_buffer();
208 } 209 }
209 210
210 } // namespace media 211 } // namespace media
211 212
212 #endif // MEDIA_AUDIO_AUDIO_PARAMETERS_H_ 213 #endif // MEDIA_AUDIO_AUDIO_PARAMETERS_H_
OLDNEW
« no previous file with comments | « media/audio/audio_output_stream_sink.h ('k') | media/audio/audio_parameters_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698