Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unnecessary this->"

Browse Source
This commit is contained in:
Glenn Kasten
2011-12-14 15:40:43 -08:00
committed by Android (Google) Code Review
parent 3e62a5bd8c db298a4c66
commit ad2ac95d06
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
media/libmedia/AudioTrack.cpp
View File

@@ -1320,7 +1320,7 @@ audio_track_cblk_t::audio_track_cblk_t()
uint32_t audio_track_cblk_t::stepUser(uint32_t frameCount)
{
uint32_t u = this->user;
uint32_t u = user;
u += frameCount;
// Ensure that user is never ahead of server for AudioRecord
@@ -1329,16 +1329,16 @@ uint32_t audio_track_cblk_t::stepUser(uint32_t frameCount)
if (bufferTimeoutMs == MAX_STARTUP_TIMEOUT_MS-1) {
bufferTimeoutMs = MAX_RUN_TIMEOUT_MS;
}
} else if (u > this->server) {
LOGW("stepServer occured after track reset");
u = this->server;
} else if (u > server) {
LOGW("stepServer occurred after track reset");
u = server;
}
if (u >= userBase + this->frameCount) {
userBase += this->frameCount;
}
this->user = u;
user = u;
// Clear flow control error condition as new data has been written/read to/from buffer.
if (flags & CBLK_UNDERRUN_MSK) {
@@ -1355,7 +1355,7 @@ bool audio_track_cblk_t::stepServer(uint32_t frameCount)
return false;
}
uint32_t s = this->server;
uint32_t s = server;
s += frameCount;
if (flags & CBLK_DIRECTION_MSK) {
@@ -1368,9 +1368,9 @@ bool audio_track_cblk_t::stepServer(uint32_t frameCount)
// while the mixer is processing a block: in this case,
// stepServer() is called After the flush() has reset u & s and
// we have s > u
if (s > this->user) {
LOGW("stepServer occured after track reset");
s = this->user;
if (s > user) {
LOGW("stepServer occurred after track reset");
s = user;
}
}
@@ -1386,7 +1386,7 @@ bool audio_track_cblk_t::stepServer(uint32_t frameCount)
serverBase += this->frameCount;
}
this->server = s;
server = s;
if (!(flags & CBLK_INVALID_MSK)) {
cv.signal();
@@ -1397,7 +1397,7 @@ bool audio_track_cblk_t::stepServer(uint32_t frameCount)
void* audio_track_cblk_t::buffer(uint32_t offset) const
{
return (int8_t *)this->buffers + (offset - userBase) * this->frameSize;
return (int8_t *)buffers + (offset - userBase) * frameSize;
}
uint32_t audio_track_cblk_t::framesAvailable()
@@ -1408,8 +1408,8 @@ uint32_t audio_track_cblk_t::framesAvailable()
uint32_t audio_track_cblk_t::framesAvailable_l()
{
uint32_t u = this->user;
uint32_t s = this->server;
uint32_t u = user;
uint32_t s = server;
if (flags & CBLK_DIRECTION_MSK) {
uint32_t limit = (s < loopStart) ? s : loopStart;
@@ -1421,8 +1421,8 @@ uint32_t audio_track_cblk_t::framesAvailable_l()
uint32_t audio_track_cblk_t::framesReady()
{
uint32_t u = this->user;
uint32_t s = this->server;
uint32_t u = user;
uint32_t s = server;
if (flags & CBLK_DIRECTION_MSK) {
if (u < loopEnd) {