diff options
| author | Andreas Huber <andih@google.com> | 2012-10-01 17:23:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-01 17:23:14 -0700 |
| commit | b74a900427c18f295c585cb647f78873618ddda2 (patch) | |
| tree | 3add7b5cd4f5c5aa7758e731b51c15d6ef685d7b /include | |
| parent | d05ed53bbfe3a4a67544d60f5349327793444842 (diff) | |
| parent | 4cb8a16365e2342e1ee99906d406de939023f389 (diff) | |
| download | frameworks_av-b74a900427c18f295c585cb647f78873618ddda2.zip frameworks_av-b74a900427c18f295c585cb647f78873618ddda2.tar.gz frameworks_av-b74a900427c18f295c585cb647f78873618ddda2.tar.bz2 | |
am 4cb8a163: am 1c730d33: Merge "ALooper::GetNowUs() now relies on systemTime instead of gettimeofday." into jb-mr1-dev
* commit '4cb8a16365e2342e1ee99906d406de939023f389':
ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/stagefright/AudioSource.h | 8 | ||||
| -rw-r--r-- | include/media/stagefright/TimeSource.h | 2 |
2 files changed, 0 insertions, 10 deletions
diff --git a/include/media/stagefright/AudioSource.h b/include/media/stagefright/AudioSource.h index de7edf3..99f3c3b 100644 --- a/include/media/stagefright/AudioSource.h +++ b/include/media/stagefright/AudioSource.h @@ -53,12 +53,6 @@ struct AudioSource : public MediaSource, public MediaBufferObserver { status_t dataCallback(const AudioRecord::Buffer& buffer); virtual void signalBufferReturned(MediaBuffer *buffer); - // If useLooperTime == true, buffers will carry absolute timestamps - // as returned by ALooper::GetNowUs(), otherwise systemTime() is used - // and buffers contain timestamps relative to start time. - // The default is to _not_ use looper time. - void setUseLooperTime(bool useLooperTime); - protected: virtual ~AudioSource(); @@ -94,8 +88,6 @@ private: List<MediaBuffer * > mBuffersReceived; - bool mUseLooperTime; - void trackMaxAmplitude(int16_t *data, int nSamples); // This is used to raise the volume from mute to the diff --git a/include/media/stagefright/TimeSource.h b/include/media/stagefright/TimeSource.h index 443673d..8f11e14 100644 --- a/include/media/stagefright/TimeSource.h +++ b/include/media/stagefright/TimeSource.h @@ -41,8 +41,6 @@ public: virtual int64_t getRealTimeUs(); private: - static int64_t GetSystemTimeUs(); - int64_t mStartTimeUs; }; |
