diff options
| author | Tyler Luu <tluu@ti.com> | 2012-05-31 14:37:32 -0500 |
|---|---|---|
| committer | Daniel Levin <dendy@ti.com> | 2012-11-26 18:22:46 +0200 |
| commit | 0857077eba23b110f41801af92fbd8d4ea10ddd7 (patch) | |
| tree | 703f923ee83d1a1d7860fbdb13262193ac332d3a | |
| parent | 6ead645a25586f167ec39e9e2e5553f8ec02527c (diff) | |
| download | hardware_ti_omap4-0857077eba23b110f41801af92fbd8d4ea10ddd7.zip hardware_ti_omap4-0857077eba23b110f41801af92fbd8d4ea10ddd7.tar.gz hardware_ti_omap4-0857077eba23b110f41801af92fbd8d4ea10ddd7.tar.bz2 | |
camera_test: reprocess: Use tap-out surface
Add support for using a surface for the tap-out for the
reprocess pipe.
Change-Id: I4e1262f247aca4050b49330ba515bfa841f8e4f2
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Vladimir Petrov <vppetrov@mm-sol.com>
Signed-off-by: Daniel Levin <dendy@ti.com>
| -rw-r--r-- | test/CameraHal/camera_test.h | 5 | ||||
| -rw-r--r-- | test/CameraHal/camera_test_menu.cpp | 7 | ||||
| -rw-r--r-- | test/CameraHal/camera_test_script.cpp | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/test/CameraHal/camera_test.h b/test/CameraHal/camera_test.h index 3d34056..6e86d15 100644 --- a/test/CameraHal/camera_test.h +++ b/test/CameraHal/camera_test.h @@ -453,9 +453,13 @@ private: class BufferSourceInput : public RefBase { public: BufferSourceInput(sp<Camera> camera) : mCamera(camera) { + mTapOut = new BufferSourceThread(camera); + mTapOut->run(); } virtual ~BufferSourceInput() { + mTapOut->requestExit(); + mTapOut.clear(); } virtual void init() = 0; @@ -463,6 +467,7 @@ public: virtual void setInput(buffer_info_t, const char *format); protected: + sp<BufferSourceThread> mTapOut; sp<ANativeWindow> mWindowTapIn; sp<Camera> mCamera; }; diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp index 4a0d909..105a371 100644 --- a/test/CameraHal/camera_test_menu.cpp +++ b/test/CameraHal/camera_test_menu.cpp @@ -3436,11 +3436,8 @@ int functional_menu() { case 'P': { - int msgType = CAMERA_MSG_COMPRESSED_IMAGE | - CAMERA_MSG_RAW_IMAGE; -#ifdef OMAP_ENHANCEMENT_BURST_CAPTURE - msgType |= CAMERA_MSG_RAW_BURST; -#endif + int msgType = CAMERA_MSG_COMPRESSED_IMAGE; + gettimeofday(&picture_start, 0); if (!bufferSourceInput.get()) { #ifdef ANDROID_API_JB_OR_LATER diff --git a/test/CameraHal/camera_test_script.cpp b/test/CameraHal/camera_test_script.cpp index 51bd081..759f3cf 100644 --- a/test/CameraHal/camera_test_script.cpp +++ b/test/CameraHal/camera_test_script.cpp @@ -1213,11 +1213,7 @@ int execute_functional_script(char *script) { case 'P': { - int msgType = CAMERA_MSG_COMPRESSED_IMAGE | - CAMERA_MSG_RAW_IMAGE; -#ifdef OMAP_ENHANCEMENT_BURST_CAPTURE - msgType |= CAMERA_MSG_RAW_BURST; -#endif + int msgType = CAMERA_MSG_COMPRESSED_IMAGE; gettimeofday(&picture_start, 0); if (!bufferSourceInput.get()) { #ifdef ANDROID_API_JB_OR_LATER |