diff options
author | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 16:16:49 +0000 |
---|---|---|
committer | satish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 16:16:49 +0000 |
commit | 3af7229b4f97f17b4f2aee34bd3ef3af7fd16e50 (patch) | |
tree | 3b19af016ec61763cbe6e4f5c925a5fbd3ac0c64 /media/audio/linux | |
parent | 4f8452d18c71301f141795eb95a9c2e0a8358aaf (diff) | |
download | chromium_src-3af7229b4f97f17b4f2aee34bd3ef3af7fd16e50.zip chromium_src-3af7229b4f97f17b4f2aee34bd3ef3af7fd16e50.tar.gz chromium_src-3af7229b4f97f17b4f2aee34bd3ef3af7fd16e50.tar.bz2 |
This test now works for the mac audio capture code as well, and in a future CL I'll enable audio recording in linux and this test will suit that code too.
In the process I changed a uint32 in a function prototype to int because style guide recommends int for such cases. I also added parameter validation code to the mac audio manager to get it pass this new test.
BUG=none
TEST=media_unittests should succeed as before.
Review URL: http://codereview.chromium.org/3357004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58365 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/linux')
-rw-r--r-- | media/audio/linux/audio_manager_linux.cc | 2 | ||||
-rw-r--r-- | media/audio/linux/audio_manager_linux.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/audio/linux/audio_manager_linux.cc b/media/audio/linux/audio_manager_linux.cc index 00f23b1a..40a8783 100644 --- a/media/audio/linux/audio_manager_linux.cc +++ b/media/audio/linux/audio_manager_linux.cc @@ -50,7 +50,7 @@ AudioOutputStream* AudioManagerLinux::MakeAudioOutputStream( } AudioInputStream* AudioManagerLinux::MakeAudioInputStream( - AudioParameters params, uint32 samples_per_packet) { + AudioParameters params, int samples_per_packet) { if (params.format == AudioParameters::AUDIO_MOCK) { return FakeAudioInputStream::MakeFakeStream(params, samples_per_packet); } diff --git a/media/audio/linux/audio_manager_linux.h b/media/audio/linux/audio_manager_linux.h index f13e1a8..afa60af 100644 --- a/media/audio/linux/audio_manager_linux.h +++ b/media/audio/linux/audio_manager_linux.h @@ -28,7 +28,7 @@ class AudioManagerLinux : public AudioManagerBase { virtual bool HasAudioInputDevices(); virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params); virtual AudioInputStream* MakeAudioInputStream( - AudioParameters params, uint32 samples_per_packet); + AudioParameters params, int samples_per_packet); virtual void MuteAll(); virtual void UnMuteAll(); |