summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/omx/tests
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-17 13:46:19 -0700
committerLajos Molnar <lajos@google.com>2015-04-17 13:46:43 -0700
commitee4e1b1a63758941460ae79a064249d3a5189443 (patch)
treed27f03a73170da9cce96b6eae5b2ecd874eace22 /media/libstagefright/omx/tests
parent2170233c49e50f3986cdc4f726016d6003cb5b8e (diff)
downloadframeworks_av-ee4e1b1a63758941460ae79a064249d3a5189443.zip
frameworks_av-ee4e1b1a63758941460ae79a064249d3a5189443.tar.gz
frameworks_av-ee4e1b1a63758941460ae79a064249d3a5189443.tar.bz2
stagefright: warnings be gone, some are now errors, use clang
Change-Id: I81f438ae444f04c12ae27ae4ef6d073033de172c
Diffstat (limited to 'media/libstagefright/omx/tests')
-rw-r--r--media/libstagefright/omx/tests/Android.mk4
-rw-r--r--media/libstagefright/omx/tests/FrameDropper_test.cpp3
2 files changed, 6 insertions, 1 deletions
diff --git a/media/libstagefright/omx/tests/Android.mk b/media/libstagefright/omx/tests/Android.mk
index 9be637a..f7280f6 100644
--- a/media/libstagefright/omx/tests/Android.mk
+++ b/media/libstagefright/omx/tests/Android.mk
@@ -12,6 +12,7 @@ LOCAL_C_INCLUDES := \
$(TOP)/frameworks/native/include/media/openmax
LOCAL_CFLAGS += -Werror
+LOCAL_CLANG := true
LOCAL_MODULE := omx_tests
@@ -37,4 +38,7 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_C_INCLUDES := \
frameworks/av/media/libstagefright/omx \
+LOCAL_CFLAGS += -Werror
+LOCAL_CLANG := true
+
include $(BUILD_NATIVE_TEST)
diff --git a/media/libstagefright/omx/tests/FrameDropper_test.cpp b/media/libstagefright/omx/tests/FrameDropper_test.cpp
index 4ac72c4..f966b5e 100644
--- a/media/libstagefright/omx/tests/FrameDropper_test.cpp
+++ b/media/libstagefright/omx/tests/FrameDropper_test.cpp
@@ -100,7 +100,8 @@ protected:
for (size_t i = 0; i < size; ++i) {
int jitter = GetJitter(i);
int64_t testTimeUs = frames[i].timeUs + jitter;
- printf("time %lld, testTime %lld, jitter %d\n", frames[i].timeUs, testTimeUs, jitter);
+ printf("time %lld, testTime %lld, jitter %d\n",
+ (long long)frames[i].timeUs, (long long)testTimeUs, jitter);
EXPECT_EQ(frames[i].shouldDrop, mFrameDropper->shouldDrop(testTimeUs));
}
}