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

Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread

Browse Source
This commit is contained in:
James Dong
2010-09-15 14:51:49 -07:00
committed by Android (Google) Code Review
parent 968735e580 7589ebfbfd
commit 9f882c0b10
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/libstagefright/AudioSource.cpp
View File

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