From fa8de752507feaca695123911915070c1ce463b2 Mon Sep 17 00:00:00 2001 From: Andreas Huber Date: Thu, 8 Oct 2009 10:07:49 -0700 Subject: Change to a int64_t usecs representation for timestamps and duration throughout stagefright. --- cmds/stagefright/SineSource.cpp | 4 ++-- cmds/stagefright/stagefright.cpp | 10 ++++------ 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'cmds') diff --git a/cmds/stagefright/SineSource.cpp b/cmds/stagefright/SineSource.cpp index e5a6ccb..e272a65 100644 --- a/cmds/stagefright/SineSource.cpp +++ b/cmds/stagefright/SineSource.cpp @@ -86,8 +86,8 @@ status_t SineSource::read( x += k; } - buffer->meta_data()->setInt32(kKeyTimeUnits, mPhase); - buffer->meta_data()->setInt32(kKeyTimeScale, mSampleRate); + buffer->meta_data()->setInt64( + kKeyTime, ((int64_t)mPhase * 1000000) / mSampleRate); mPhase += numFramesPerBuffer; diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp index 5397a69..6674620 100644 --- a/cmds/stagefright/stagefright.cpp +++ b/cmds/stagefright/stagefright.cpp @@ -76,14 +76,12 @@ static void playSource(OMXClient *client, const sp &source) { shouldSeek = true; } else { - int32_t units, scale; - CHECK(buffer->meta_data()->findInt32(kKeyTimeUnits, &units)); - CHECK(buffer->meta_data()->findInt32(kKeyTimeScale, &scale)); - int64_t timestamp = ((OMX_TICKS)units * 1000000) / scale; + int64_t timestampUs; + CHECK(buffer->meta_data()->findInt64(kKeyTime, ×tampUs)); bool failed = false; if (seekTimeUs >= 0) { - int64_t diff = timestamp - seekTimeUs; + int64_t diff = timestampUs - seekTimeUs; if (diff > 500000) { printf("ERROR: "); @@ -92,7 +90,7 @@ static void playSource(OMXClient *client, const sp &source) { } printf("buffer has timestamp %lld us (%.2f secs)\n", - timestamp, timestamp / 1E6); + timestampUs, timestampUs / 1E6); buffer->release(); buffer = NULL; -- cgit v1.1