summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-10-01 16:45:06 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-01 16:45:06 -0700
commit4cb8a16365e2342e1ee99906d406de939023f389 (patch)
treecc1d9f881cdd21344de7ae6e386d6e6f169c0706 /include
parent5db05850d02939e63800ae5b1fcf53a767f2e895 (diff)
parent1c730d33da2fa861000b3990b5e6c9ff69291387 (diff)
downloadframeworks_av-4cb8a16365e2342e1ee99906d406de939023f389.zip
frameworks_av-4cb8a16365e2342e1ee99906d406de939023f389.tar.gz
frameworks_av-4cb8a16365e2342e1ee99906d406de939023f389.tar.bz2
am 1c730d33: Merge "ALooper::GetNowUs() now relies on systemTime instead of gettimeofday." into jb-mr1-dev
* commit '1c730d33da2fa861000b3990b5e6c9ff69291387': ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/AudioSource.h8
-rw-r--r--include/media/stagefright/TimeSource.h2
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;
};