diff options
| author | Narayan Kamath <narayan@google.com> | 2014-02-11 13:47:53 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-02-11 13:53:20 +0000 |
| commit | 1d6fa7af1288b550faabe4ec2cf98684236723db (patch) | |
| tree | a8801ca9a0925ba1faccf17acea4aa78d71a9d29 /media/libstagefright/omx/tests | |
| parent | b82a9f105f89d6b3684c9f626918042bd8977912 (diff) | |
| parent | 566be7c33fc56ae4c34168ecbee5316374f7e3c5 (diff) | |
| download | frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.zip frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.tar.gz frameworks_av-1d6fa7af1288b550faabe4ec2cf98684236723db.tar.bz2 | |
resolved conflicts for merge of 566be7c3 to master
Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
Diffstat (limited to 'media/libstagefright/omx/tests')
| -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 499545e..03725df 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" @@ -713,11 +714,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(); |