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

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

Issue 115413002: Enable platform echo cancellation through the AudioRecord path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 7 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/android/audio_record_input.cc ('k') | media/audio/audio_parameters.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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/time/time.h" 9 #include "base/time/time.h"
10 #include "media/base/channel_layout.h" 10 #include "media/base/channel_layout.h"
(...skipping 26 matching lines...) Expand all
37 AUDIO_LAST_FORMAT // Only used for validation of format. 37 AUDIO_LAST_FORMAT // Only used for validation of format.
38 }; 38 };
39 39
40 enum { 40 enum {
41 // Telephone quality sample rate, mostly for speech-only audio. 41 // Telephone quality sample rate, mostly for speech-only audio.
42 kTelephoneSampleRate = 8000, 42 kTelephoneSampleRate = 8000,
43 // CD sampling rate is 44.1 KHz or conveniently 2x2x3x3x5x5x7x7. 43 // CD sampling rate is 44.1 KHz or conveniently 2x2x3x3x5x5x7x7.
44 kAudioCDSampleRate = 44100, 44 kAudioCDSampleRate = 44100,
45 }; 45 };
46 46
47 // Bitmasks to determine whether certain platform (typically hardware) audio
48 // effects should be enabled.
49 enum PlatformEffectsMask {
50 NO_EFFECTS = 0x0,
51 ECHO_CANCELLER = 0x1
52 };
53
47 AudioParameters(); 54 AudioParameters();
48 AudioParameters(Format format, ChannelLayout channel_layout, 55 AudioParameters(Format format, ChannelLayout channel_layout,
49 int sample_rate, int bits_per_sample, 56 int sample_rate, int bits_per_sample,
50 int frames_per_buffer); 57 int frames_per_buffer);
51 AudioParameters(Format format, ChannelLayout channel_layout, 58 AudioParameters(Format format, ChannelLayout channel_layout,
52 int input_channels, 59 int input_channels,
53 int sample_rate, int bits_per_sample, 60 int sample_rate, int bits_per_sample,
54 int frames_per_buffer); 61 int frames_per_buffer, int effects);
62 AudioParameters(Format format, ChannelLayout channel_layout,
63 int channels, int input_channels,
64 int sample_rate, int bits_per_sample,
65 int frames_per_buffer, int effects);
66
55 void Reset(Format format, ChannelLayout channel_layout, 67 void Reset(Format format, ChannelLayout channel_layout,
56 int channels, int input_channels, 68 int channels, int input_channels,
57 int sample_rate, int bits_per_sample, 69 int sample_rate, int bits_per_sample,
58 int frames_per_buffer); 70 int frames_per_buffer);
59 71
60 // Checks that all values are in the expected range. All limits are specified 72 // Checks that all values are in the expected range. All limits are specified
61 // in media::Limits. 73 // in media::Limits.
62 bool IsValid() const; 74 bool IsValid() const;
63 75
64 // Returns size of audio buffer in bytes. 76 // Returns size of audio buffer in bytes.
65 int GetBytesPerBuffer() const; 77 int GetBytesPerBuffer() const;
66 78
67 // Returns the number of bytes representing one second of audio. 79 // Returns the number of bytes representing one second of audio.
68 int GetBytesPerSecond() const; 80 int GetBytesPerSecond() const;
69 81
70 // Returns the number of bytes representing a frame of audio. 82 // Returns the number of bytes representing a frame of audio.
71 int GetBytesPerFrame() const; 83 int GetBytesPerFrame() const;
72 84
73 // Returns the duration of this buffer as calculated from frames_per_buffer() 85 // Returns the duration of this buffer as calculated from frames_per_buffer()
74 // and sample_rate(). 86 // and sample_rate().
75 base::TimeDelta GetBufferDuration() const; 87 base::TimeDelta GetBufferDuration() const;
76 88
77 Format format() const { return format_; } 89 Format format() const { return format_; }
78 ChannelLayout channel_layout() const { return channel_layout_; } 90 ChannelLayout channel_layout() const { return channel_layout_; }
79 int sample_rate() const { return sample_rate_; } 91 int sample_rate() const { return sample_rate_; }
80 int bits_per_sample() const { return bits_per_sample_; } 92 int bits_per_sample() const { return bits_per_sample_; }
81 int frames_per_buffer() const { return frames_per_buffer_; } 93 int frames_per_buffer() const { return frames_per_buffer_; }
82 int channels() const { return channels_; } 94 int channels() const { return channels_; }
83 int input_channels() const { return input_channels_; } 95 int input_channels() const { return input_channels_; }
84 96 int effects() const { return effects_; }
85 // Set to CHANNEL_LAYOUT_DISCRETE with given number of channels.
86 void SetDiscreteChannels(int channels);
87 97
88 // Comparison with other AudioParams. 98 // Comparison with other AudioParams.
89 bool operator==(const AudioParameters& other) const { 99 bool operator==(const AudioParameters& other) const {
90 return format_ == other.format() && 100 return format_ == other.format() &&
91 sample_rate_ == other.sample_rate() && 101 sample_rate_ == other.sample_rate() &&
92 channel_layout_ == other.channel_layout() && 102 channel_layout_ == other.channel_layout() &&
93 channels_ == other.channels() && 103 channels_ == other.channels() &&
94 input_channels_ == other.input_channels() && 104 input_channels_ == other.input_channels() &&
95 bits_per_sample_ == other.bits_per_sample() && 105 bits_per_sample_ == other.bits_per_sample() &&
96 frames_per_buffer_ == other.frames_per_buffer(); 106 frames_per_buffer_ == other.frames_per_buffer() &&
107 effects_ == other.effects();
97 } 108 }
98 109
99 private: 110 private:
111 // These members are mutable to support entire struct assignment. They should
112 // not be mutated individually.
100 Format format_; // Format of the stream. 113 Format format_; // Format of the stream.
101 ChannelLayout channel_layout_; // Order of surround sound channels. 114 ChannelLayout channel_layout_; // Order of surround sound channels.
102 int sample_rate_; // Sampling frequency/rate. 115 int sample_rate_; // Sampling frequency/rate.
103 int bits_per_sample_; // Number of bits per sample. 116 int bits_per_sample_; // Number of bits per sample.
104 int frames_per_buffer_; // Number of frames in a buffer. 117 int frames_per_buffer_; // Number of frames in a buffer.
105 118
106 int channels_; // Number of channels. Value set based on 119 int channels_; // Number of channels. Value set based on
107 // |channel_layout|. 120 // |channel_layout|.
108 int input_channels_; // Optional number of input channels. 121 int input_channels_; // Optional number of input channels.
109 // Normally 0, but can be set to specify 122 // Normally 0, but can be set to specify
110 // synchronized I/O. 123 // synchronized I/O.
124 int effects_; // Bitmask using PlatformEffectsMask.
111 }; 125 };
112 126
113 // Comparison is useful when AudioParameters is used with std structures. 127 // Comparison is useful when AudioParameters is used with std structures.
114 inline bool operator<(const AudioParameters& a, const AudioParameters& b) { 128 inline bool operator<(const AudioParameters& a, const AudioParameters& b) {
115 if (a.format() != b.format()) 129 if (a.format() != b.format())
116 return a.format() < b.format(); 130 return a.format() < b.format();
117 if (a.channels() != b.channels()) 131 if (a.channels() != b.channels())
118 return a.channels() < b.channels(); 132 return a.channels() < b.channels();
119 if (a.input_channels() != b.input_channels()) 133 if (a.input_channels() != b.input_channels())
120 return a.input_channels() < b.input_channels(); 134 return a.input_channels() < b.input_channels();
121 if (a.sample_rate() != b.sample_rate()) 135 if (a.sample_rate() != b.sample_rate())
122 return a.sample_rate() < b.sample_rate(); 136 return a.sample_rate() < b.sample_rate();
123 if (a.bits_per_sample() != b.bits_per_sample()) 137 if (a.bits_per_sample() != b.bits_per_sample())
124 return a.bits_per_sample() < b.bits_per_sample(); 138 return a.bits_per_sample() < b.bits_per_sample();
125 return a.frames_per_buffer() < b.frames_per_buffer(); 139 return a.frames_per_buffer() < b.frames_per_buffer();
126 } 140 }
127 141
128 } // namespace media 142 } // namespace media
129 143
130 #endif // MEDIA_AUDIO_AUDIO_PARAMETERS_H_ 144 #endif // MEDIA_AUDIO_AUDIO_PARAMETERS_H_
OLDNEW
« no previous file with comments | « media/audio/android/audio_record_input.cc ('k') | media/audio/audio_parameters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698