Chiebot-Mirror
/
opencv
mirror of https://github.com/opencv/opencv.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Refactoring of native camera implementation

Browse Source
pull/13383/head
Andrey Kamaev 14 years ago
parent ffe7a658fb
commit 98375e1d4b
1 changed files with 129 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 227
      modules/androidcamera/camera_wrapper/camera_wrapper.cpp

227
modules/androidcamera/camera_wrapper/camera_wrapper.cpp
Unescape View File

@ -1,5 +1,3 @@
#define USE_RECORDING_INSTEAD_PREVIEW 0
#if !defined(ANDROID_r2_2_2) && !defined(ANDROID_r2_3_3) && !defined(ANDROID_r3_0_1)
#error unsupported version of Android
#endif
@ -9,99 +7,163 @@
#include "../include/camera_properties.h"
#include <string>
//undef logging macro from /system/core/libcutils/loghack.h
#ifdef LOGD
#undef LOGD
#endif
#ifdef LOGI
#undef LOGI
#endif
#ifdef LOGW
#undef LOGW
#endif
#ifdef LOGE
#undef LOGE
#endif
// LOGGING
#include <android/log.h>
#define CAMERA_LOG_TAG "OpenCV_NativeCamera"
#define LOGD(...) ((void)__android_log_print(ANDROID_LOG_DEBUG, CAMERA_LOG_TAG, __VA_ARGS__))
#define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, CAMERA_LOG_TAG, __VA_ARGS__))
#define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, CAMERA_LOG_TAG, __VA_ARGS__))
#define LOGE(...) ((void)__android_log_print(ANDROID_LOG_ERROR, CAMERA_LOG_TAG, __VA_ARGS__))
using namespace android;
void debugShowFPS()
{
static int mFrameCount = 0;
static int mLastFrameCount = 0;
static nsecs_t mLastFpsTime = systemTime();;
static nsecs_t mLastFpsTime = systemTime();
static float mFps = 0;
mFrameCount++;
if ( ( mFrameCount % 30 ) == 0 ) {
nsecs_t now = systemTime();
nsecs_t diff = now - mLastFpsTime;
if (diff==0)
return;
if (( mFrameCount % 30 ) != 0)
return;
mFps = ((mFrameCount - mLastFrameCount) * float(s2ns(1))) / diff;
mLastFpsTime = now;
mLastFrameCount = mFrameCount;
LOGI("####### [%d] Frames, %f FPS", mFrameCount, mFps);
}
nsecs_t now = systemTime();
nsecs_t diff = now - mLastFpsTime;
if (diff==0)
return;
mFps = ((mFrameCount - mLastFrameCount) * float(s2ns(1))) / diff;
mLastFpsTime = now;
mLastFrameCount = mFrameCount;
LOGI("### Camera FPS ### [%d] Frames, %.2f FPS", mFrameCount, mFps);
}
class CameraHandler: public CameraListener
{
protected:
int cameraId;
sp<Camera> camera;
CameraCallback cameraCallback;
CameraParameters params;
CameraCallback cameraCallback;
void* userData;
int cameraId;
bool isEmptyCameraCallbackReported;
virtual void doCall(void* buffer, size_t bufferSize)
int emptyCameraCallbackReported;
void doCall(void* buffer, size_t bufferSize)
{
if (cameraCallback == 0)
{
if (!isEmptyCameraCallbackReported)
LOGE("Camera callback is empty!");
if (!emptyCameraCallbackReported)
LOGE("CameraHandler::doCall(void*, size_t): Camera callback is empty!");
isEmptyCameraCallbackReported = true;
return;
emptyCameraCallbackReported++;
}
else
{
bool res = (*cameraCallback)(buffer, bufferSize, userData);
bool res = (*cameraCallback)(buffer, bufferSize, userData);
if(!res) closeCameraConnect();
if(!res)
{
LOGE("CameraHandler::doCall(void*, size_t): cameraCallback returns false (camera connection will be closed)");
closeCameraConnect();
}
}
}
virtual void doCall(const sp<IMemory>& dataPtr)
void doCall(const sp<IMemory>& dataPtr)
{
LOGI("doCall started");
if (dataPtr == NULL)
{
LOGE("CameraBuffer: dataPtr==NULL");
LOGE("CameraHandler::doCall(const sp<IMemory>&): dataPtr==NULL (no frame to handle)");
return;
}
size_t size = dataPtr->size();
if (size <= 0)
{
LOGE("CameraBuffer: IMemory object is of zero size");
LOGE("CameraHandler::doCall(const sp<IMemory>&): IMemory object is of zero size");
return;
}
unsigned char* buffer = (unsigned char *)dataPtr->pointer();
void* buffer = (void *)dataPtr->pointer();
if (!buffer)
{
LOGE("CameraBuffer: Buffer pointer is invalid");
LOGE("CameraHandler::doCall(const sp<IMemory>&): Buffer pointer is NULL");
return;
}
doCall(buffer, size);
}
virtual void postDataTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr)
{
static uint32_t count = 0;
count++;
LOGE("Recording cb: %d %lld %%p Offset:%%d Stride:%%d\n", msgType, timestamp);
if (dataPtr == NULL)
{
LOGE("postDataTimestamp: dataPtr IS ZERO -- returning");
camera->releaseRecordingFrame(dataPtr);
LOGE("postDataTimestamp: camera->releaseRecordingFrame(dataPtr) is done");
return;
}
uint8_t *ptr = (uint8_t*) dataPtr->pointer();
if (ptr)
LOGE("VID_CB: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], ptr[8], ptr[9]);
else
LOGE("postDataTimestamp: Ptr is zero");
camera->releaseRecordingFrame(dataPtr);
}
public:
CameraHandler(CameraCallback callback = 0, void* _userData = 0):cameraCallback(callback), userData(_userData), cameraId(0), isEmptyCameraCallbackReported(false) {}
CameraHandler(CameraCallback callback = 0, void* _userData = 0):
cameraId(0),
cameraCallback(callback),
userData(_userData),
emptyCameraCallbackReported(0)
{
LOGD("Instantiated new CameraHandler (%p, %p)", callback, _userData);
}
virtual ~CameraHandler()
{
LOGW("CameraHandler destructor is called!");
LOGD("CameraHandler destructor is called");
}
virtual void notify(int32_t msgType, int32_t ext1, int32_t ext2)
{
LOGE("Notify cb: %d %d %d\n", msgType, ext1, ext2);
LOGE("CameraHandler::Notify: msgType=%d ext1=%d ext2=%d\n", msgType, ext1, ext2);
#if 0
if ( msgType & CAMERA_MSG_FOCUS )
LOGE("AutoFocus %s in %llu us\n", (ext1) ? "OK" : "FAIL", timevalDelay(&autofocus_start));
LOGE("CameraHandler::Notify AutoFocus %s in %llu us\n", (ext1) ? "OK" : "FAIL", timevalDelay(&autofocus_start));
if ( msgType & CAMERA_MSG_SHUTTER )
LOGE("Shutter done in %llu us\n", timeval_delay(&picture_start));
LOGE("CameraHandler::Notify Shutter done in %llu us\n", timeval_delay(&picture_start));
#endif
}
@ -116,40 +178,16 @@ public:
}
if (msgType != CAMERA_MSG_PREVIEW_FRAME)
LOGE("Recieved not CAMERA_MSG_PREVIEW_FRAME message %d", (int) msgType);
LOGE("CameraHandler::postData Recieved message %d is not equal to CAMERA_MSG_PREVIEW_FRAME (%d)", (int) msgType, CAMERA_MSG_PREVIEW_FRAME);
if ( msgType & CAMERA_MSG_RAW_IMAGE )
LOGE("Unexpected data format: RAW\n");
LOGE("CameraHandler::postData Unexpected data format: RAW\n");
if (msgType & CAMERA_MSG_POSTVIEW_FRAME)
LOGE("Unexpected data format: Postview frame\n");
LOGE("CameraHandler::postData Unexpected data format: Postview frame\n");
if (msgType & CAMERA_MSG_COMPRESSED_IMAGE )
LOGE("Unexpected data format: JPEG");
}
virtual void postDataTimestamp(nsecs_t timestamp, int32_t msgType, const sp<IMemory>& dataPtr)
{
static uint32_t count = 0;
count++;
LOGE("Recording cb: %d %lld %%p Offset:%%d Stride:%%d\n", msgType, timestamp);
if (dataPtr == NULL)
{
LOGE("postDataTimestamp: dataPtr IS ZERO -- returning");
camera->releaseRecordingFrame(dataPtr);
LOGE("postDataTimestamp: camera->releaseRecordingFrame(dataPtr) is done");
return;
}
uint8_t *ptr = (uint8_t*) dataPtr->pointer();
if (ptr)
LOGE("VID_CB: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x", ptr[0], ptr[1], ptr[2], ptr[3], ptr[4], ptr[5], ptr[6], ptr[7], ptr[8], ptr[9]);
else
LOGE("postDataTimestamp: Ptr is zero");
camera->releaseRecordingFrame(dataPtr);
LOGE("CameraHandler::postData Unexpected data format: JPEG");
}
static CameraHandler* initCameraConnect(const CameraCallback& callback, int cameraId, void* userData, CameraParameters* prevCameraParameters);
@ -164,11 +202,7 @@ public:
CameraHandler* CameraHandler::initCameraConnect(const CameraCallback& callback, int cameraId, void* userData, CameraParameters* prevCameraParameters)
{
// if (camera != NULL)
// {
// LOGE("initCameraConnect: camera have been connected already");
// return false;
// }
LOGD("CameraHandler::initCameraConnect(%p, %d, %p, %p)", callback, cameraId, userData, prevCameraParameters);
sp<Camera> camera = 0;
@ -179,7 +213,7 @@ CameraHandler* CameraHandler::initCameraConnect(const CameraCallback& callback,
camera = Camera::connect(cameraId);
#endif
if ( NULL == camera.get() )
if ( 0 == camera.get() )
{
LOGE("initCameraConnect: Unable to connect to CameraService\n");
return 0;
@ -189,15 +223,18 @@ CameraHandler* CameraHandler::initCameraConnect(const CameraCallback& callback,
camera->setListener(handler);
handler->camera = camera;
handler->cameraId=cameraId;
#if 1
//setting paramers from previous camera handler
if (prevCameraParameters != NULL) {
camera->setParameters(prevCameraParameters->flatten());
handler->cameraId = cameraId;
if (prevCameraParameters != 0)
{
LOGI("initCameraConnect: Setting paramers from previous camera handler");
camera->setParameters(prevCameraParameters->flatten());
}
#endif
handler->params.unflatten(camera->getParameters());
android::String8 params_str = camera->getParameters();
LOGI("initCameraConnect: [%s]", params_str.string());
handler->params.unflatten(params_str);
LOGD("Supported Cameras: %s", handler->params.get("camera-indexes"));
LOGD("Supported Picture Sizes: %s", handler->params.get(CameraParameters::KEY_SUPPORTED_PICTURE_SIZES));
@ -216,9 +253,11 @@ CameraHandler* CameraHandler::initCameraConnect(const CameraCallback& callback,
//TODO: check if yuv420i format available. Set this format as preview format.
#if USE_RECORDING_INSTEAD_PREVIEW
status_t err = camera->setPreviewDisplay(sp<ISurface>(NULL /*new DummySurface1*/));
#endif
status_t pdstatus = camera->setPreviewDisplay(sp<ISurface>(0 /*new DummySurface*/));
if (pdstatus != 0)
{
LOGE("initCameraConnect: failed setPreviewDisplay(0) call; camera migth not work correcttly on some devices");
}
////ATTENTION: switching between two versions: with and without copying memory inside Android OS
//// see the method CameraService::Client::copyFrameAndPostCopiedFrame and where it is used
@ -228,17 +267,15 @@ CameraHandler* CameraHandler::initCameraConnect(const CameraCallback& callback,
camera->setPreviewCallbackFlags( FRAME_CALLBACK_FLAG_ENABLE_MASK );//without copy
#endif
#if USE_RECORDING_INSTEAD_PREVIEW
status_t resStart = camera->startRecording();
#else
status_t resStart = camera->startPreview();
#endif
if (resStart != 0)
{
LOGE("initCameraConnect: startPreview() fails. Closing camera connection...");
handler->closeCameraConnect();
handler = 0;
}
return handler;
}
@ -246,17 +283,11 @@ void CameraHandler::closeCameraConnect()
{
if (camera == NULL)
{
LOGI("... camera is NULL");
LOGI("... camera is already NULL");
return;
}
//TODO: ATTENTION! should we do it ALWAYS???
#if USE_RECORDING_INSTEAD_PREVIEW
camera->stopRecording();
#else
camera->stopPreview();
#endif
camera->disconnect();
camera.clear();
@ -290,18 +321,18 @@ double CameraHandler::getProperty(int propIdx)
case ANDROID_CAMERA_PROPERTY_FRAMEWIDTH:
{
int w,h;
params.getPreviewSize(&w,&h);
params.getPreviewSize(&w, &h);
return w;
}
case ANDROID_CAMERA_PROPERTY_FRAMEHEIGHT:
{
int w,h;
params.getPreviewSize(&w,&h);
params.getPreviewSize(&w, &h);
return h;
}
case ANDROID_CAMERA_PROPERTY_SUPPORTED_PREVIEW_SIZES_STRING:
{
cameraPropertySupportedPreviewSizesString=params.get(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES);
cameraPropertySupportedPreviewSizesString = params.get(CameraParameters::KEY_SUPPORTED_PREVIEW_SIZES);
double res;
memset(&res, 0, sizeof(res));
(*( (void**)&res ))= (void*)( cameraPropertySupportedPreviewSizesString.c_str() );
@ -320,17 +351,17 @@ void CameraHandler::setProperty(int propIdx, double value)
case ANDROID_CAMERA_PROPERTY_FRAMEWIDTH:
{
int w,h;
params.getPreviewSize(&w,&h);
params.getPreviewSize(&w, &h);
w = (int)value;
params.setPreviewSize(w,h);
params.setPreviewSize(w, h);
}
break;
case ANDROID_CAMERA_PROPERTY_FRAMEHEIGHT:
{
int w,h;
params.getPreviewSize(&w,&h);
params.getPreviewSize(&w, &h);
h = (int)value;
params.setPreviewSize(w,h);
params.setPreviewSize(w, h);
}
break;
};

Write Preview
Loading…
Cancel
Save