diff options
author | Narayan Kamath <narayan@google.com> | 2014-03-07 02:26:36 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-07 02:26:36 +0000 |
commit | e857b65c1d3aa055281cb48f59c9b5eb4a062dd0 (patch) | |
tree | 9d0780a2aebbb8839ec74fe16b1b868e6d45e3e9 /media/libstagefright/omx/tests/OMXHarness.cpp | |
parent | ce9be73c7e7f379d68e1a0d0210a6f7b9418269f (diff) | |
parent | 3c9130a8a12ce962dc8d22e04243b135b9e98b01 (diff) | |
download | frameworks_av-e857b65c1d3aa055281cb48f59c9b5eb4a062dd0.zip frameworks_av-e857b65c1d3aa055281cb48f59c9b5eb4a062dd0.tar.gz frameworks_av-e857b65c1d3aa055281cb48f59c9b5eb4a062dd0.tar.bz2 |
am 3c9130a8: Merge "Make frameworks/av 64-bit compatible"
* commit '3c9130a8a12ce962dc8d22e04243b135b9e98b01':
Make frameworks/av 64-bit compatible
Diffstat (limited to 'media/libstagefright/omx/tests/OMXHarness.cpp')
-rw-r--r-- | media/libstagefright/omx/tests/OMXHarness.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp index 4bee808..44e4f9d 100644 --- a/media/libstagefright/omx/tests/OMXHarness.cpp +++ b/media/libstagefright/omx/tests/OMXHarness.cpp @@ -16,6 +16,7 @@ //#define LOG_NDEBUG 0 #define LOG_TAG "OMXHarness" +#include <inttypes.h> #include <utils/Log.h> #include "OMXHarness.h" @@ -711,11 +712,11 @@ status_t Harness::testSeek( int64_t bufferTimeUs; CHECK(buffer->meta_data()->findInt64(kKeyTime, &bufferTimeUs)); if (!CloseEnough(bufferTimeUs, actualSeekTimeUs)) { - printf("\n * Attempted seeking to %lld us (%.2f secs)", + printf("\n * Attempted seeking to %" PRId64 " us (%.2f secs)", requestedSeekTimeUs, requestedSeekTimeUs / 1E6); - printf("\n * Nearest keyframe is at %lld us (%.2f secs)", + printf("\n * Nearest keyframe is at %" PRId64 " us (%.2f secs)", actualSeekTimeUs, actualSeekTimeUs / 1E6); - printf("\n * Returned buffer was at %lld us (%.2f secs)\n\n", + printf("\n * Returned buffer was at %" PRId64 " us (%.2f secs)\n\n", bufferTimeUs, bufferTimeUs / 1E6); buffer->release(); |