diff options
author | Andreas Huber <andih@google.com> | 2009-11-06 10:07:53 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-06 10:07:53 -0800 |
commit | 84ec55b736ae2278d6abdc1c7a0312de46ef5f3d (patch) | |
tree | fddab69ca6235e219c7ebc7d8380be634a3eb936 /media/libstagefright/AudioPlayer.cpp | |
parent | 6fceb868bf79feac0498ca5db8694c92ef6b4fa5 (diff) | |
parent | dae04ca7c4b5590786ffc336721ee8714cc79fef (diff) | |
download | frameworks_av-84ec55b736ae2278d6abdc1c7a0312de46ef5f3d.zip frameworks_av-84ec55b736ae2278d6abdc1c7a0312de46ef5f3d.tar.gz frameworks_av-84ec55b736ae2278d6abdc1c7a0312de46ef5f3d.tar.bz2 |
am fde273ba: Merge change Ic997acac into eclair
Merge commit 'fde273baf6592a5fde15ee4dd4d798d90368e440' into eclair-mr2
* commit 'fde273baf6592a5fde15ee4dd4d798d90368e440':
Make AudioPlayer a little less verbose, defer starting audio playback until after the first video frame has been decoded (if there's video at all).
Diffstat (limited to 'media/libstagefright/AudioPlayer.cpp')
-rw-r--r-- | media/libstagefright/AudioPlayer.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/media/libstagefright/AudioPlayer.cpp b/media/libstagefright/AudioPlayer.cpp index 7b4d178..d7e3f66 100644 --- a/media/libstagefright/AudioPlayer.cpp +++ b/media/libstagefright/AudioPlayer.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 #define LOG_TAG "AudioPlayer" #include <utils/Log.h> @@ -136,7 +137,7 @@ void AudioPlayer::stop() { // Make sure to release any buffer we hold onto so that the // source is able to stop(). if (mInputBuffer != NULL) { - LOGI("AudioPlayer releasing input buffer."); + LOGV("AudioPlayer releasing input buffer."); mInputBuffer->release(); mInputBuffer = NULL; @@ -176,7 +177,7 @@ void AudioPlayer::AudioCallback(int event, void *info) { void AudioPlayer::fillBuffer(void *data, size_t size) { if (mNumFramesPlayed == 0) { - LOGI("AudioCallback"); + LOGV("AudioCallback"); } size_t size_done = 0; @@ -216,6 +217,11 @@ void AudioPlayer::fillBuffer(void *data, size_t size) { mPositionTimeRealUs = ((mNumFramesPlayed + size_done / mFrameSize) * 1000000) / mSampleRate; + + LOGV("buffer->size() = %d, " + "mPositionTimeMediaUs=%.2f mPositionTimeRealUs=%.2f", + mInputBuffer->range_length(), + mPositionTimeMediaUs / 1E6, mPositionTimeRealUs / 1E6); } if (mInputBuffer->range_length() == 0) { |