diff options
Diffstat (limited to 'test/CameraHal')
| -rw-r--r-- | test/CameraHal/Android.mk | 1 | ||||
| -rw-r--r-- | test/CameraHal/camera_test.h | 6 | ||||
| -rw-r--r-- | test/CameraHal/camera_test_menu.cpp | 27 | ||||
| -rw-r--r-- | test/CameraHal/camera_test_script.cpp | 10 |
4 files changed, 18 insertions, 26 deletions
diff --git a/test/CameraHal/Android.mk b/test/CameraHal/Android.mk index c7da48a9..9a31d850 100644 --- a/test/CameraHal/Android.mk +++ b/test/CameraHal/Android.mk @@ -13,6 +13,7 @@ LOCAL_SHARED_LIBRARIES:= \ libcutils \ libbinder \ libmedia \ + libmedia_native \ libui \ libgui \ libcamera_client diff --git a/test/CameraHal/camera_test.h b/test/CameraHal/camera_test.h index ad750ff9..df448332 100644 --- a/test/CameraHal/camera_test.h +++ b/test/CameraHal/camera_test.h @@ -1,9 +1,9 @@ #ifndef CAMERA_TEST_H #define CAMERA_TEST_H -#define PRINTOVER(arg...) LOGD(#arg) -#define LOG_FUNCTION_NAME LOGD("%d: %s() ENTER", __LINE__, __FUNCTION__); -#define LOG_FUNCTION_NAME_EXIT LOGD("%d: %s() EXIT", __LINE__, __FUNCTION__); +#define PRINTOVER(arg...) ALOGD(#arg) +#define LOG_FUNCTION_NAME ALOGD("%d: %s() ENTER", __LINE__, __FUNCTION__); +#define LOG_FUNCTION_NAME_EXIT ALOGD("%d: %s() EXIT", __LINE__, __FUNCTION__); #define KEY_GBCE "gbce" #define KEY_GLBCE "glbce" #define KEY_CAMERA "camera-index" diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp index f8ef2b1b..eb78f0fc 100644 --- a/test/CameraHal/camera_test_menu.cpp +++ b/test/CameraHal/camera_test_menu.cpp @@ -7,11 +7,8 @@ #include <semaphore.h> #include <pthread.h> -#include <surfaceflinger/Surface.h> -#include <surfaceflinger/ISurface.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/ISurfaceComposerClient.h> -#include <surfaceflinger/SurfaceComposerClient.h> +#include <gui/Surface.h> +#include <gui/SurfaceComposerClient.h> #include <camera/Camera.h> #include <camera/ICamera.h> @@ -513,19 +510,19 @@ void saveFile(const sp<IMemory>& mem) { sprintf(fn, "/sdcard/preview%03d.yuv", counter); fd = open(fn, O_CREAT | O_WRONLY | O_TRUNC, 0777); if(fd < 0) { - LOGE("Unable to open file %s: %s", fn, strerror(fd)); + ALOGE("Unable to open file %s: %s", fn, strerror(fd)); goto out; } size = mem->size(); if (size <= 0) { - LOGE("IMemory object is of zero size"); + ALOGE("IMemory object is of zero size"); goto out; } buff = (unsigned char *)mem->pointer(); if (!buff) { - LOGE("Buffer pointer is invalid"); + ALOGE("Buffer pointer is invalid"); goto out; } @@ -603,19 +600,19 @@ void my_jpeg_callback(const sp<IMemory>& mem) { fd = open(fn, O_CREAT | O_WRONLY | O_TRUNC, 0777); if(fd < 0) { - LOGE("Unable to open file %s: %s", fn, strerror(fd)); + ALOGE("Unable to open file %s: %s", fn, strerror(fd)); goto out; } size = mem->size(); if (size <= 0) { - LOGE("IMemory object is of zero size"); + ALOGE("IMemory object is of zero size"); goto out; } buff = (unsigned char *)mem->pointer(); if (!buff) { - LOGE("Buffer pointer is invalid"); + ALOGE("Buffer pointer is invalid"); goto out; } @@ -1016,13 +1013,13 @@ int stopRecording() { int openCamera() { printf("openCamera(camera_index=%d)\n", camera_index); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { printf("Unable to connect to CameraService\n"); printf("Retrying... \n"); sleep(1); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { printf("Giving up!! \n"); @@ -1459,10 +1456,10 @@ int functional_menu() { stopRecording(); closeRecorder(); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { sleep(1); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { return -1; } diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp index a0b8aded..d8c2fb11 100644 --- a/test/CameraHal/camera_test_script.cpp +++ b/test/CameraHal/camera_test_script.cpp @@ -7,12 +7,6 @@ #include <semaphore.h> #include <pthread.h> -#include <surfaceflinger/Surface.h> -#include <surfaceflinger/ISurface.h> -#include <surfaceflinger/ISurfaceComposer.h> -#include <surfaceflinger/ISurfaceComposerClient.h> -#include <surfaceflinger/SurfaceComposerClient.h> - #include <camera/Camera.h> #include <camera/ICamera.h> #include <media/mediarecorder.h> @@ -243,10 +237,10 @@ int execute_functional_script(char *script) { stopRecording(); closeRecorder(); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { sleep(1); - camera = Camera::connect(camera_index); + camera = Camera::connect(camera_index, false, false); if ( NULL == camera.get() ) { return -1; |