gugelfrei
/
android_frameworks_av
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AudioTrackShared: Fix wrap condition for stop limit

Browse Source 
Test: Photos video playback and repeat accessing info
Bug: 68747620
Change-Id: I8c4afa44c0a0a7f689fbc8797ee815e8ae960979
gugelfrei
Andy Hung 6 years ago
parent 6b6f4313aa
commit 5427403590
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File

9
media/libaudioclient/AudioTrackShared.cpp
Unescape View File

@ -725,12 +725,13 @@ int32_t AudioTrackServerProxy::getRear() const
const size_t mask = overflowBit - 1; const size_t mask = overflowBit - 1;
int32_t newRear = (rear & ~mask) | (stop & mask); int32_t newRear = (rear & ~mask) | (stop & mask);
ssize_t filled = newRear - front; ssize_t filled = newRear - front;
if (filled < 0) { // overflowBit is unsigned, so cast to signed for comparison.
if (filled >= (ssize_t)overflowBit) {
// front and rear offsets span the overflow bit of the p2 mask // front and rear offsets span the overflow bit of the p2 mask
// so rebasing newrear. // so rebasing newRear on the rear offset is off by the overflow bit.
ALOGV("stop wrap: filled %zx >= overflowBit %zx", filled, overflowBit); ALOGV("stop wrap: filled %zx >= overflowBit %zx", filled, overflowBit);
newRear += overflowBit; newRear -= overflowBit;
filled += overflowBit; filled -= overflowBit;
} }
if (0 <= filled && (size_t) filled <= mFrameCount) { if (0 <= filled && (size_t) filled <= mFrameCount) {
// we're stopped, return the stop level as newRear // we're stopped, return the stop level as newRear

Write Preview
Loading…
Cancel
Save