Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit beb55f57 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses... 

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

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

* commit '9f882c0b':
  Fix audio input sample timestamp when audio driver loses audio samples
parents 1e563f91 9f882c0b

media/libstagefright/AudioSource.cpp

+4 −1
Original line number Diff line number Diff line
@@ -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;