diff options
| author | Eric Laurent <elaurent@google.com> | 2014-08-07 15:54:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-06 23:49:20 +0000 |
| commit | 7f04ec2a4ec94ada7ef89db8c50fd1e5c3a93a3b (patch) | |
| tree | 42d4ba5895c3943fd7d8e61cd75a9590a09c6f93 /services/audioflinger | |
| parent | a9522673f3076ea937eb2912945d7ed646ca05df (diff) | |
| parent | c2730ba7c5e9559b7499ef5e0d7742deb18c5110 (diff) | |
| download | frameworks_av-7f04ec2a4ec94ada7ef89db8c50fd1e5c3a93a3b.zip frameworks_av-7f04ec2a4ec94ada7ef89db8c50fd1e5c3a93a3b.tar.gz frameworks_av-7f04ec2a4ec94ada7ef89db8c50fd1e5c3a93a3b.tar.bz2 | |
Merge "audio policy: add support for USB devices for voice call" into lmp-dev
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/Tracks.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/Tracks.cpp b/services/audioflinger/Tracks.cpp index 48093da..c5ab832 100644 --- a/services/audioflinger/Tracks.cpp +++ b/services/audioflinger/Tracks.cpp @@ -1885,10 +1885,10 @@ status_t AudioFlinger::PlaybackThread::PatchTrack::getNextBuffer( buf.mFrameCount = buffer->frameCount; status_t status = mPeerProxy->obtainBuffer(&buf, &mPeerTimeout); ALOGV_IF(status != NO_ERROR, "PatchTrack() %p getNextBuffer status %d", this, status); + buffer->frameCount = buf.mFrameCount; if (buf.mFrameCount == 0) { return WOULD_BLOCK; } - buffer->frameCount = buf.mFrameCount; status = Track::getNextBuffer(buffer, pts); return status; } @@ -2166,10 +2166,10 @@ status_t AudioFlinger::RecordThread::PatchRecord::getNextBuffer( status_t status = mPeerProxy->obtainBuffer(&buf, &mPeerTimeout); ALOGV_IF(status != NO_ERROR, "PatchRecord() %p mPeerProxy->obtainBuffer status %d", this, status); + buffer->frameCount = buf.mFrameCount; if (buf.mFrameCount == 0) { return WOULD_BLOCK; } - buffer->frameCount = buf.mFrameCount; status = RecordTrack::getNextBuffer(buffer, pts); return status; } |