diff options
author | James Dong <jdong@google.com> | 2010-09-03 12:01:55 -0700 |
---|---|---|
committer | James Dong <jdong@google.com> | 2010-09-03 12:01:55 -0700 |
commit | caa68a57f0b358b8fbe17447ffa453b9120a8610 (patch) | |
tree | 845d7aadda6f7912d6b8a056933cea59164c3041 /media/libstagefright/codecs/amrwbenc | |
parent | b4d5320bda29cd9694461c9b61d0211f801ff0af (diff) | |
download | frameworks_av-caa68a57f0b358b8fbe17447ffa453b9120a8610.zip frameworks_av-caa68a57f0b358b8fbe17447ffa453b9120a8610.tar.gz frameworks_av-caa68a57f0b358b8fbe17447ffa453b9120a8610.tar.bz2 |
Not all audio source has the drift time information
Change-Id: I74e502376348ca4a6ffaa7492bed35c1355e7e62
Diffstat (limited to 'media/libstagefright/codecs/amrwbenc')
-rw-r--r-- | media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp b/media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp index b62eb5b..cd28413 100644 --- a/media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp +++ b/media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp @@ -199,7 +199,7 @@ status_t AMRWBEncoder::read( ReadOptions::SeekMode mode; CHECK(options == NULL || !options->getSeekTo(&seekTimeUs, &mode)); bool readFromSource = false; - int64_t wallClockTimeUs = 0; + int64_t wallClockTimeUs = -1; while (mNumInputSamples < kNumSamplesPerFrame) { if (mInputBuffer == NULL) { @@ -221,8 +221,9 @@ status_t AMRWBEncoder::read( CHECK_EQ(align, 0); int64_t timeUs; - CHECK(mInputBuffer->meta_data()->findInt64(kKeyDriftTime, &timeUs)); - wallClockTimeUs = timeUs; + if (mInputBuffer->meta_data()->findInt64(kKeyDriftTime, &timeUs)) { + wallClockTimeUs = timeUs; + } if (mInputBuffer->meta_data()->findInt64(kKeyTime, &timeUs)) { mAnchorTimeUs = timeUs; } @@ -285,7 +286,7 @@ status_t AMRWBEncoder::read( int64_t mediaTimeUs = mNumFramesOutput * 20000LL; buffer->meta_data()->setInt64(kKeyTime, mAnchorTimeUs + mediaTimeUs); - if (readFromSource) { + if (readFromSource && wallClockTimeUs != -1) { buffer->meta_data()->setInt64(kKeyDriftTime, mediaTimeUs - wallClockTimeUs); } |