diff options
| author | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 16:16:55 +0000 |
|---|---|---|
| committer | xians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-22 16:16:55 +0000 |
| commit | a46b2aa7704dd60fa13907c2e2d852b1a18aa29c (patch) | |
| tree | c5af494ffca5495bb394c03c4148d8f9cc55f3cc /media/audio/audio_util.cc | |
| parent | 0fe580458513163affb70b2461386de5153129a2 (diff) | |
| download | chromium_src-a46b2aa7704dd60fa13907c2e2d852b1a18aa29c.zip chromium_src-a46b2aa7704dd60fa13907c2e2d852b1a18aa29c.tar.gz chromium_src-a46b2aa7704dd60fa13907c2e2d852b1a18aa29c.tar.bz2 | |
Adding pulseaudio input support to chrome.
This input implementation also support device enumeration and volume APIs.
BUG=172259,169075,175393,164361
TEST=content_unittests and media_unittests, manual test with https://webrtc-demos.appspot.com/html/pc1.html
Review URL: https://chromiumcodereview.appspot.com/10952024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_util.cc')
| -rw-r--r-- | media/audio/audio_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/audio/audio_util.cc b/media/audio/audio_util.cc index 33739bb..0c8b96c 100644 --- a/media/audio/audio_util.cc +++ b/media/audio/audio_util.cc @@ -138,8 +138,6 @@ int GetAudioHardwareSampleRate() { // TODO(leozwang): return native sampling rate on Android. return 16000; #else - // Hardware for Linux is nearly always 48KHz. - // TODO(crogers) : return correct value in rare non-48KHz cases. return 48000; #endif } @@ -157,6 +155,8 @@ int GetAudioInputHardwareSampleRate(const std::string& device_id) { #elif defined(OS_ANDROID) return 16000; #else + // Hardware for Linux is nearly always 48KHz. + // TODO(crogers) : return correct value in rare non-48KHz cases. return 48000; #endif } |