am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread

Merge commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24' into gingerbread-plus-aosp

* commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24':
  Fix audio input sample timestamp when audio driver loses audio samples
This commit is contained in:
James Dong
2010-09-15 14:55:38 -07:00
committed by Android Git Automerger

View File

@@ -256,6 +256,8 @@ status_t AudioSource::read(
if (numLostBytes > kMaxBufferSize) {
mPrevLostBytes = numLostBytes - kMaxBufferSize;
numLostBytes = kMaxBufferSize;
} else {
mPrevLostBytes = 0;
}
CHECK_EQ(numLostBytes & 1, 0);
@@ -275,8 +277,9 @@ status_t AudioSource::read(
memset(buffer->data(), 0, numLostBytes);
buffer->set_range(0, numLostBytes);
if (numFramesRecorded == 0) {
buffer->meta_data()->setInt64(kKeyTime, mStartTimeUs);
buffer->meta_data()->setInt64(kKeyAnchorTime, mStartTimeUs);
}
buffer->meta_data()->setInt64(kKeyTime, mStartTimeUs + mPrevSampleTimeUs);
buffer->meta_data()->setInt64(kKeyDriftTime, readTimeUs - mInitialReadTimeUs);
mPrevSampleTimeUs = timestampUs;
*out = buffer;