diff options
author | Andreas Gampe <agampe@google.com> | 2014-11-21 09:57:52 -0800 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-11-21 09:57:52 -0800 |
commit | 307218c7f2e3edac95c2d4d31fa3beadcde3d30c (patch) | |
tree | 9c004075a42515e399db4833a3b89bd002ebd11f /media/tests | |
parent | 55dbf00fd8f3931c41b580c7a6b78bf6c2a64de3 (diff) | |
parent | 09910723c5ad434281d12e6625e0b4175d97ef2c (diff) | |
download | frameworks_base-307218c7f2e3edac95c2d4d31fa3beadcde3d30c.zip frameworks_base-307218c7f2e3edac95c2d4d31fa3beadcde3d30c.tar.gz frameworks_base-307218c7f2e3edac95c2d4d31fa3beadcde3d30c.tar.bz2 |
resolved conflicts for merge of 09910723 to lmp-mr1-dev-plus-aosp
Change-Id: I4b47723a9314bf9bef08e68ce269038d0d50c5d9
Diffstat (limited to 'media/tests')
-rw-r--r-- | media/tests/audiotests/Android.mk | 22 | ||||
-rw-r--r-- | media/tests/audiotests/shared_mem_test.cpp | 6 | ||||
-rw-r--r-- | media/tests/players/Android.mk | 1 | ||||
-rw-r--r-- | media/tests/players/invoke_mock_media_player.cpp | 34 |
4 files changed, 33 insertions, 30 deletions
diff --git a/media/tests/audiotests/Android.mk b/media/tests/audiotests/Android.mk index 69f0bb5..794e7f22 100644 --- a/media/tests/audiotests/Android.mk +++ b/media/tests/audiotests/Android.mk @@ -1,21 +1,23 @@ -ifeq ($(TARGET_ARCH),arm) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE:= shared_mem_test + LOCAL_SRC_FILES := \ - shared_mem_test.cpp + shared_mem_test.cpp + LOCAL_SHARED_LIBRARIES := \ - libc \ - libcutils \ - libutils \ - libbinder \ - libhardware_legacy \ - libmedia + libc \ + libcutils \ + libutils \ + libbinder \ + libhardware_legacy \ + libmedia + LOCAL_MODULE_TAGS := tests -include $(BUILD_EXECUTABLE) +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code -endif +include $(BUILD_EXECUTABLE) diff --git a/media/tests/audiotests/shared_mem_test.cpp b/media/tests/audiotests/shared_mem_test.cpp index 992c900..2f57499 100644 --- a/media/tests/audiotests/shared_mem_test.cpp +++ b/media/tests/audiotests/shared_mem_test.cpp @@ -133,12 +133,8 @@ int AudioTrackTest::Test01() { ************************************************************/ void AudioTrackTest::Generate(short *buffer, long bufferSz, long amplitude, unsigned long &phi, long dPhi) { - long pi13 = 25736; // 2^13*pi // fill buffer for(int i0=0; i0<bufferSz; i0++) { - long sample; - long l0, l1; - buffer[i0] = ComputeSine( amplitude, phi); phi += dPhi; } @@ -210,7 +206,7 @@ int main() { * global main * ************************************************************/ -int main(int argc, char *argv[]) { +int main() { return android::main(); } diff --git a/media/tests/players/Android.mk b/media/tests/players/Android.mk index adf0d30..7ab6458 100644 --- a/media/tests/players/Android.mk +++ b/media/tests/players/Android.mk @@ -26,5 +26,6 @@ LOCAL_SHARED_LIBRARIES:= \ LOCAL_MODULE:= invoke_mock_media_player LOCAL_MODULE_TAGS := tests eng +LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code include $(BUILD_SHARED_LIBRARY) diff --git a/media/tests/players/invoke_mock_media_player.cpp b/media/tests/players/invoke_mock_media_player.cpp index d1fed7bb..0d0c7ad 100644 --- a/media/tests/players/invoke_mock_media_player.cpp +++ b/media/tests/players/invoke_mock_media_player.cpp @@ -58,7 +58,7 @@ class Player: public MediaPlayerBase virtual bool hardwareOutput() {return true;} virtual status_t setDataSource( - const sp<IMediaHTTPService> &httpService, + const sp<IMediaHTTPService>& /* httpService */, const char *url, const KeyedVector<String8, String8> *) { ALOGV("setDataSource %s", url); @@ -69,24 +69,28 @@ class Player: public MediaPlayerBase return OK; } - virtual status_t setDataSource(int fd, int64_t offset, int64_t length) {return OK;} + virtual status_t setDataSource(int /* fd */, int64_t /* offset */, int64_t /* length */) { + return OK; + } virtual status_t setVideoSurfaceTexture( - const sp<IGraphicBufferProducer>& bufferProducer) {return OK;} - virtual status_t prepare() {return OK;} - virtual status_t prepareAsync() {return OK;} - virtual status_t start() {return OK;} - virtual status_t stop() {return OK;} - virtual status_t pause() {return OK;} - virtual bool isPlaying() {return true;} - virtual status_t seekTo(int msec) {return OK;} - virtual status_t getCurrentPosition(int *msec) {return OK;} - virtual status_t getDuration(int *msec) {return OK;} + const sp<IGraphicBufferProducer>& /* bufferProducer */) { + return OK; + } + virtual status_t prepare() { return OK; } + virtual status_t prepareAsync() { return OK; } + virtual status_t start() { return OK; } + virtual status_t stop() { return OK; } + virtual status_t pause() { return OK; } + virtual bool isPlaying() { return true; } + virtual status_t seekTo(int /* msec */) { return OK; } + virtual status_t getCurrentPosition(int* /* msec */) { return OK; } + virtual status_t getDuration(int* /* msec */) { return OK; } virtual status_t reset() {return OK;} - virtual status_t setLooping(int loop) {return OK;} + virtual status_t setLooping(int /* loop */) { return OK; } virtual player_type playerType() {return TEST_PLAYER;} virtual status_t invoke(const Parcel& request, Parcel *reply); - virtual status_t setParameter(int key, const Parcel &request) {return OK;} - virtual status_t getParameter(int key, Parcel *reply) {return OK;} + virtual status_t setParameter(int /* key */, const Parcel& /* request */) { return OK; } + virtual status_t getParameter(int /* key */, Parcel* /* reply */) { return OK; } private: |