diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:00 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:44:00 -0800 |
| commit | 5e07b5774c8b376776caa4f5b0a193767697e97e (patch) | |
| tree | 3260f49c6f0c5b4699ac6b80b4dc505566af17e8 /media/libmedia/ToneGenerator.cpp | |
| parent | e5198b620a9a208ec59ea8457282404725f8ff6e (diff) | |
| download | frameworks_av-5e07b5774c8b376776caa4f5b0a193767697e97e.zip frameworks_av-5e07b5774c8b376776caa4f5b0a193767697e97e.tar.gz frameworks_av-5e07b5774c8b376776caa4f5b0a193767697e97e.tar.bz2 | |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'media/libmedia/ToneGenerator.cpp')
| -rw-r--r-- | media/libmedia/ToneGenerator.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index 584d135..fa36460 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -97,10 +97,6 @@ ToneGenerator::ToneGenerator(int streamType, float volume) { LOGE("Unable to marshal AudioFlinger"); return; } - if (AudioSystem::getOutputFrameCount(&mBufferSize) != NO_ERROR) { - LOGE("Unable to marshal AudioFlinger"); - return; - } mStreamType = streamType; mVolume = volume; mpAudioTrack = 0; @@ -275,9 +271,9 @@ bool ToneGenerator::initAudioTrack() { mpAudioTrack = 0; } - // Open audio track in mono, PCM 16bit, default sampling rate, 2 buffers of + // Open audio track in mono, PCM 16bit, default sampling rate, default buffer size mpAudioTrack - = new AudioTrack(mStreamType, 0, AudioSystem::PCM_16_BIT, 1, NUM_PCM_BUFFERS*mBufferSize, 0, audioCallback, this, mBufferSize); + = new AudioTrack(mStreamType, 0, AudioSystem::PCM_16_BIT, 1, 0, 0, audioCallback, this, 0); if (mpAudioTrack == 0) { LOGE("AudioTrack allocation failed"); |