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 | 21006fa5fa180d1eb1513a5ae297211a24312021 (patch) | |
| tree | bfaf80f87ad9cb950d52c32715f6901ae9b2dfbb /media | |
| parent | b96c4b4ce8eb90a6bdb162681affe1e50fe6aafc (diff) | |
| parent | 5865ddf769d368d714af630aba18392ea1387bc7 (diff) | |
| download | frameworks_av-21006fa5fa180d1eb1513a5ae297211a24312021.zip frameworks_av-21006fa5fa180d1eb1513a5ae297211a24312021.tar.gz frameworks_av-21006fa5fa180d1eb1513a5ae297211a24312021.tar.bz2 | |
am 5865ddf7: Merge "AudioTrack::dump null mCblk check test"
* commit '5865ddf769d368d714af630aba18392ea1387bc7':
AudioTrack::dump null mCblk check test
Diffstat (limited to 'media')
| -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); |