diff options
| author | Marco Nelissen <marcone@google.com> | 2012-11-26 10:00:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-26 10:00:09 -0800 |
| commit | 8bcbabbfb8603875fb7e9eb0c6ea3cc3a5a06f00 (patch) | |
| tree | 8ccab4ae195ca5c6c0b2a4dad0cf87e0cf0cf005 | |
| parent | 2cfd3b7d85917666f80826bdb5b85f209b22c528 (diff) | |
| parent | d338dcea8a9b87fbf63a87b0ccadb74c88d619d2 (diff) | |
| download | frameworks_av-8bcbabbfb8603875fb7e9eb0c6ea3cc3a5a06f00.zip frameworks_av-8bcbabbfb8603875fb7e9eb0c6ea3cc3a5a06f00.tar.gz frameworks_av-8bcbabbfb8603875fb7e9eb0c6ea3cc3a5a06f00.tar.bz2 | |
am 5865ddf7: Merge "AudioTrack::dump null mCblk check test"
* commit '5865ddf769d368d714af630aba18392ea1387bc7':
AudioTrack::dump null mCblk check test
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 362d022..aec8c4a 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -1441,7 +1441,7 @@ status_t AudioTrack::dump(int fd, const Vector<String16>& args) const result.append(" AudioTrack::dump\n"); snprintf(buffer, 255, " stream type(%d), left - right volume(%f, %f)\n", mStreamType, mVolume[0], mVolume[1]); result.append(buffer); - snprintf(buffer, 255, " format(%d), channel count(%d), frame count(%d)\n", mFormat, mChannelCount, mCblk->frameCount); + snprintf(buffer, 255, " format(%d), channel count(%d), frame count(%d)\n", mFormat, mChannelCount, (mCblk == 0) ? 0 : mCblk->frameCount); result.append(buffer); snprintf(buffer, 255, " sample rate(%d), status(%d), muted(%d)\n", (mCblk == 0) ? 0 : mCblk->sampleRate, mStatus, mMuted); result.append(buffer); |