| Index: webrtc/modules/audio_device/android/audio_common.h
|
| diff --git a/webrtc/modules/audio_device/android/audio_common.h b/webrtc/modules/audio_device/android/audio_common.h
|
| index cb259830b99345940ab51eb1979a4d41efde1f06..4eecae4b70622f8979a8777fa8b16818a218dc0f 100644
|
| --- a/webrtc/modules/audio_device/android/audio_common.h
|
| +++ b/webrtc/modules/audio_device/android/audio_common.h
|
| @@ -13,22 +13,19 @@
|
|
|
| namespace webrtc {
|
|
|
| -enum {
|
| - kDefaultSampleRate = 44100,
|
| - kNumChannels = 1,
|
| - // Number of bytes per audio frame.
|
| - // Example: 16-bit PCM in mono => 1*(16/8)=2 [bytes/frame]
|
| - kBytesPerFrame = kNumChannels * (16 / 8),
|
| - // Delay estimates for the two different supported modes. These values
|
| - // are based on real-time round-trip delay estimates on a large set of
|
| - // devices and they are lower bounds since the filter length is 128 ms,
|
| - // so the AEC works for delays in the range [50, ~170] ms and [150, ~270] ms.
|
| - // Note that, in most cases, the lowest delay estimate will not be utilized
|
| - // since devices that support low-latency output audio often supports
|
| - // HW AEC as well.
|
| - kLowLatencyModeDelayEstimateInMilliseconds = 50,
|
| - kHighLatencyModeDelayEstimateInMilliseconds = 150,
|
| -};
|
| +const int kDefaultSampleRate = 44100;
|
| +const int kNumChannels = 1;
|
| +// Number of bytes per audio frame.
|
| +// Example: 16-bit PCM in mono => 1*(16/8)=2 [bytes/frame]
|
| +const size_t kBytesPerFrame = kNumChannels * (16 / 8);
|
| +// Delay estimates for the two different supported modes. These values are based
|
| +// on real-time round-trip delay estimates on a large set of devices and they
|
| +// are lower bounds since the filter length is 128 ms, so the AEC works for
|
| +// delays in the range [50, ~170] ms and [150, ~270] ms. Note that, in most
|
| +// cases, the lowest delay estimate will not be utilized since devices that
|
| +// support low-latency output audio often supports HW AEC as well.
|
| +const int kLowLatencyModeDelayEstimateInMilliseconds = 50;
|
| +const int kHighLatencyModeDelayEstimateInMilliseconds = 150;
|
|
|
| } // namespace webrtc
|
|
|
|
|