summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioTrackShared.cpp
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2014-12-30 08:18:15 -0800
committerGlenn Kasten <gkasten@google.com>2014-12-30 08:18:15 -0800
commitb187de1ada34a9023c05d020a4592686ba761278 (patch)
tree31dea84d078f6198ce17ca856fcbb76c402f37b6 /media/libmedia/AudioTrackShared.cpp
parent64cbdee08a18b25448a5fb0b058d3b83d5630d7f (diff)
downloadframeworks_av-b187de1ada34a9023c05d020a4592686ba761278.zip
frameworks_av-b187de1ada34a9023c05d020a4592686ba761278.tar.gz
frameworks_av-b187de1ada34a9023c05d020a4592686ba761278.tar.bz2
Line length 100
Change-Id: I6c8fe626a3825fa9e139319656d682a57b887c97
Diffstat (limited to 'media/libmedia/AudioTrackShared.cpp')
-rw-r--r--media/libmedia/AudioTrackShared.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libmedia/AudioTrackShared.cpp b/media/libmedia/AudioTrackShared.cpp
index 168e591..ee02710 100644
--- a/media/libmedia/AudioTrackShared.cpp
+++ b/media/libmedia/AudioTrackShared.cpp
@@ -560,7 +560,8 @@ status_t ServerProxy::obtainBuffer(Buffer* buffer, bool ackFlush)
ssize_t filled = rear - newFront;
// Rather than shutting down on a corrupt flush, just treat it as a full flush
if (!(0 <= filled && (size_t) filled <= mFrameCount)) {
- ALOGE("mFlush %#x -> %#x, front %#x, rear %#x, mask %#x, newFront %#x, filled %d=%#x",
+ ALOGE("mFlush %#x -> %#x, front %#x, rear %#x, mask %#x, newFront %#x, "
+ "filled %d=%#x",
mFlush, flush, front, rear, mask, newFront, filled, filled);
newFront = rear;
}
@@ -872,7 +873,8 @@ void StaticAudioTrackServerProxy::releaseBuffer(Buffer* buffer)
size_t newPosition = position + stepCount;
int32_t setFlags = 0;
if (!(position <= newPosition && newPosition <= mFrameCount)) {
- ALOGW("%s newPosition %zu outside [%zu, %zu]", __func__, newPosition, position, mFrameCount);
+ ALOGW("%s newPosition %zu outside [%zu, %zu]", __func__, newPosition, position,
+ mFrameCount);
newPosition = mFrameCount;
} else if (mState.mLoopCount != 0 && newPosition == mState.mLoopEnd) {
newPosition = mState.mLoopStart;