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

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

Issue 9805001: Move media/audio files into media namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix various compiler errors Created 8 years, 9 months 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 | Annotate | Revision Log
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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "media/base/channel_layout.h" 9 #include "media/base/channel_layout.h"
10 #include "media/base/media_export.h" 10 #include "media/base/media_export.h"
11 11
12 namespace media {
13
12 class MEDIA_EXPORT AudioParameters { 14 class MEDIA_EXPORT AudioParameters {
13 public: 15 public:
14 // Compare is useful when AudioParameters is used as a key in std::map. 16 // Compare is useful when AudioParameters is used as a key in std::map.
15 class MEDIA_EXPORT Compare { 17 class MEDIA_EXPORT Compare {
16 public: 18 public:
17 bool operator()(const AudioParameters& a, const AudioParameters& b) const; 19 bool operator()(const AudioParameters& a, const AudioParameters& b) const;
18 }; 20 };
19 21
20 enum Format { 22 enum Format {
21 AUDIO_PCM_LINEAR = 0, // PCM is 'raw' amplitude samples. 23 AUDIO_PCM_LINEAR = 0, // PCM is 'raw' amplitude samples.
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 Format format_; // Format of the stream. 65 Format format_; // Format of the stream.
64 ChannelLayout channel_layout_; // Order of surround sound channels. 66 ChannelLayout channel_layout_; // Order of surround sound channels.
65 int sample_rate_; // Sampling frequency/rate. 67 int sample_rate_; // Sampling frequency/rate.
66 int bits_per_sample_; // Number of bits per sample. 68 int bits_per_sample_; // Number of bits per sample.
67 int frames_per_buffer_; // Number of frames in a buffer. 69 int frames_per_buffer_; // Number of frames in a buffer.
68 70
69 int channels_; // Number of channels. Value set based on 71 int channels_; // Number of channels. Value set based on
70 // |channel_layout|. 72 // |channel_layout|.
71 }; 73 };
72 74
75 } // namespace media
76
73 #endif // MEDIA_AUDIO_AUDIO_PARAMETERS_H_ 77 #endif // MEDIA_AUDIO_AUDIO_PARAMETERS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698