diff options
| author | Marco Nelissen <marcone@google.com> | 2012-11-26 08:59:50 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-11-26 08:59:51 -0800 |
| commit | 5865ddf769d368d714af630aba18392ea1387bc7 (patch) | |
| tree | ea173ef34abc47bb5c3a8d1ec5729bea87478262 | |
| parent | 2da6e4ae488896df10b22166b0aa0b2cc15492f1 (diff) | |
| parent | 2b691b90507ec45a98636a855c46de5dbe27c84a (diff) | |
| download | frameworks_av-5865ddf769d368d714af630aba18392ea1387bc7.zip frameworks_av-5865ddf769d368d714af630aba18392ea1387bc7.tar.gz frameworks_av-5865ddf769d368d714af630aba18392ea1387bc7.tar.bz2 | |
Merge "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); |