summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-04-13 16:24:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-13 16:24:54 -0700
commit76531828c7244b22ab06cb9e1b6c2e44a6701942 (patch)
treea3f73c479fc2948387d8ec8308eb67c91cd258cd /media
parentc488e161b51ade107e420c14059c4b103541f7e4 (diff)
parent5ab60ba0c136c2eaeb52b4cf0b21f70f3371278c (diff)
downloadframeworks_base-76531828c7244b22ab06cb9e1b6c2e44a6701942.zip
frameworks_base-76531828c7244b22ab06cb9e1b6c2e44a6701942.tar.gz
frameworks_base-76531828c7244b22ab06cb9e1b6c2e44a6701942.tar.bz2
am 5ab60ba0: am d760afc3: am 30e9c2d4: am db281311: Merge "Better diagnostics in the stagefright commandline tool, support for playing sine-tones using a filename of "sine:[samplingrate]", i.e. sine:44100. Support for playing audio through to the speakers by using "-o
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/AudioPlayer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp
index 005c64a..bcf2463 100644
--- a/media/libstagefright/AudioPlayer.cpp
+++ b/media/libstagefright/AudioPlayer.cpp
@@ -102,7 +102,7 @@ status_t AudioPlayer::start(bool sourceAlreadyStarted) {
(numChannels == 2)
? AudioSystem::CHANNEL_OUT_STEREO
: AudioSystem::CHANNEL_OUT_MONO,
- 8192, 0, &AudioCallback, this, 0);
+ 0, 0, &AudioCallback, this, 0);
if ((err = mAudioTrack->initCheck()) != OK) {
delete mAudioTrack;