diff options
| author | Andreas Huber <andih@google.com> | 2012-10-01 16:03:44 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-10-01 16:03:44 -0700 |
| commit | af5dd7753e62353411cf0daf3b513c38818e9662 (patch) | |
| tree | e935f45f925c4ce6d35d16764e2d40db69cc954a /media/libstagefright/omx | |
| parent | 0868deae404604b577892413c128d55a2bafc56e (diff) | |
| download | frameworks_av-af5dd7753e62353411cf0daf3b513c38818e9662.zip frameworks_av-af5dd7753e62353411cf0daf3b513c38818e9662.tar.gz frameworks_av-af5dd7753e62353411cf0daf3b513c38818e9662.tar.bz2 | |
ALooper::GetNowUs() now relies on systemTime instead of gettimeofday.
Change-Id: Ia31eb0940b02581327a8bf51af6df135f9ab6de3
related-to-bug: 7266324
Diffstat (limited to 'media/libstagefright/omx')
| -rw-r--r-- | media/libstagefright/omx/tests/OMXHarness.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp index 4b369ed..6cca8da 100644 --- a/media/libstagefright/omx/tests/OMXHarness.cpp +++ b/media/libstagefright/omx/tests/OMXHarness.cpp @@ -27,6 +27,7 @@ #include <binder/MemoryDealer.h> #include <media/IMediaPlayerService.h> #include <media/stagefright/foundation/ADebug.h> +#include <media/stagefright/foundation/ALooper.h> #include <media/stagefright/DataSource.h> #include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MediaDefs.h> @@ -40,13 +41,6 @@ namespace android { -static int64_t getNowUs() { - struct timeval tv; - gettimeofday(&tv, NULL); - - return (int64_t)tv.tv_usec + tv.tv_sec * 1000000; -} - Harness::Harness() : mInitCheck(NO_INIT) { mInitCheck = initOMX(); @@ -126,7 +120,7 @@ status_t Harness::dequeueMessageForNodeIgnoringBuffers( Vector<Buffer> *inputBuffers, Vector<Buffer> *outputBuffers, omx_message *msg, int64_t timeoutUs) { - int64_t finishBy = getNowUs() + timeoutUs; + int64_t finishBy = ALooper::GetNowUs() + timeoutUs; for (;;) { Mutex::Autolock autoLock(mLock); @@ -150,7 +144,7 @@ status_t Harness::dequeueMessageForNodeIgnoringBuffers( status_t err = (timeoutUs < 0) ? mMessageAddedCondition.wait(mLock) : mMessageAddedCondition.waitRelative( - mLock, (finishBy - getNowUs()) * 1000); + mLock, (finishBy - ALooper::GetNowUs()) * 1000); if (err == TIMED_OUT) { return err; |