diff options
author | Andreas Huber <andih@google.com> | 2009-10-08 10:07:49 -0700 |
---|---|---|
committer | Andreas Huber <andih@google.com> | 2009-10-12 16:00:07 -0700 |
commit | 48c948b1137e7bbdb161b51908657ab72ac5e2da (patch) | |
tree | 93382f5cf363010d79ea26d9e44e6470821f1658 /cmds | |
parent | d3eaeefb1bac68bc1fee91b794be2c2c3bea6d94 (diff) | |
download | frameworks_av-48c948b1137e7bbdb161b51908657ab72ac5e2da.zip frameworks_av-48c948b1137e7bbdb161b51908657ab72ac5e2da.tar.gz frameworks_av-48c948b1137e7bbdb161b51908657ab72ac5e2da.tar.bz2 |
Change to a int64_t usecs representation for timestamps and duration throughout stagefright.
Diffstat (limited to 'cmds')
-rw-r--r-- | cmds/stagefright/SineSource.cpp | 4 | ||||
-rw-r--r-- | cmds/stagefright/stagefright.cpp | 10 |
2 files changed, 6 insertions, 8 deletions
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<MediaSource> &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<MediaSource> &source) { } printf("buffer has timestamp %lld us (%.2f secs)\n", - timestamp, timestamp / 1E6); + timestampUs, timestampUs / 1E6); buffer->release(); buffer = NULL; |