diff options
| author | James Dong <jdong@google.com> | 2010-09-02 18:51:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-02 18:51:05 -0700 |
| commit | 9f20d3328f84d8979652917e860bcc235bf5fb75 (patch) | |
| tree | e7d8f682ad7d5a17cc5338a0174e7339cacd97ad /include | |
| parent | f52faefce82ac4236f6a266fcfec0650c844421d (diff) | |
| parent | bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3 (diff) | |
| download | frameworks_base-9f20d3328f84d8979652917e860bcc235bf5fb75.zip frameworks_base-9f20d3328f84d8979652917e860bcc235bf5fb75.tar.gz frameworks_base-9f20d3328f84d8979652917e860bcc235bf5fb75.tar.bz2 | |
am bb64e554: am 7ed7668b: Merge "Calculate audio media drift time from AudioSource" into gingerbread
Merge commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3'
* commit 'bb64e554d9a28fcf8eebf579e91ff71b8ffef1e3':
Calculate audio media drift time from AudioSource
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/AudioSource.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MPEG4Writer.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h index 1af4254..a5cec78 100644 --- a/include/media/stagefright/AudioSource.h +++ b/include/media/stagefright/AudioSource.h @@ -72,6 +72,7 @@ private: int64_t mPrevSampleTimeUs; int64_t mTotalLostFrames; int64_t mPrevLostBytes; + int64_t mInitialReadTimeUs; MediaBufferGroup *mGroup; diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h index 2412f6a..9716e98 100644 --- a/include/media/stagefright/MPEG4Writer.h +++ b/include/media/stagefright/MPEG4Writer.h @@ -132,7 +132,7 @@ private: // Adjust other track media clock (presumably wall clock) // based on audio track media clock with the drift time. int64_t mDriftTimeUs; - void addDriftTimeUs(int64_t driftTimeUs); + void setDriftTimeUs(int64_t driftTimeUs); int64_t getDriftTimeUs(); void lock(); diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index 43354c2..3b31e68 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -48,6 +48,7 @@ enum { kKeyTime = 'time', // int64_t (usecs) kKeyNTPTime = 'ntpT', // uint64_t (ntp-timestamp) kKeyTargetTime = 'tarT', // int64_t (usecs) + kKeyDriftTime = 'dftT', // int64_t (usecs) kKeyDuration = 'dura', // int64_t (usecs) kKeyColorFormat = 'colf', kKeyPlatformPrivate = 'priv', // pointer |