Skip to content
Permalink
Browse files

camera: cleaup and update header location

  • Loading branch information...
tilal6991 committed Dec 24, 2012
1 parent bd8690e commit a0ae25daafe48baf9c50532c6f57e81df3b90a96
Showing with 2 additions and 20 deletions.
  1. +2 −20 libcamera/cameraHal.cpp
@@ -32,7 +32,7 @@
#define MSM_COPY_HW 1
#define HWA 1
#ifdef HWA
#include "qcom/display/libgralloc/gralloc_priv.h"
#include "qcom/display_legacy-mr1/libgralloc/gralloc_priv.h"
#else
#include "libhardware/modules/gralloc/gralloc_priv.h"
#endif
@@ -373,7 +373,6 @@ CameraHAL_GetNum_Cameras(void)
{
int numCameras = 1;

ALOGE("CameraHAL_GetNum_Cameras:\n");
void *libcameraHandle = ::dlopen("libcamera.so", RTLD_NOW);
ALOGD("CameraHAL_GetNum_Cameras: loading libcamera at %p", libcameraHandle);
if (!libcameraHandle) {
@@ -438,13 +437,6 @@ CameraHAL_FixupParams(android::CameraParameters &settings)
preview_sizes);
}

#if 0
if (!settings.get(android::CameraParameters::KEY_SUPPORTED_VIDEO_SIZES)) {
settings.set(android::CameraParameters::KEY_SUPPORTED_VIDEO_SIZES,
video_sizes);
}
#endif

if (!settings.get(android::CameraParameters::KEY_VIDEO_SIZE)) {
settings.set(android::CameraParameters::KEY_VIDEO_SIZE, preferred_size);
}
@@ -590,12 +582,6 @@ int
qcamera_start_recording(struct camera_device * device)
{
ALOGV("qcamera_start_recording\n");
/*
if (qcamera_preview_enabled(device)){
ALOGD("Preview was enabled");
qcamera_stop_preview(device);
}
*/
qCamera->enableMsgType(CAMERA_MSG_VIDEO_FRAME);
qCamera->startRecording();

@@ -609,9 +595,6 @@ qcamera_stop_recording(struct camera_device * device)

qCamera->disableMsgType(CAMERA_MSG_VIDEO_FRAME);
qCamera->stopRecording();
/*
qcamera_start_preview(device);
*/
}

int
@@ -748,7 +731,6 @@ camera_device_close(hw_device_t* device)
}

void sighandle(int s){
//abort();
}

int
@@ -758,7 +740,7 @@ qcamera_device_open(const hw_module_t* module, const char* name,

void *libcameraHandle;
int cameraId = atoi(name);
signal(SIGFPE,(*sighandle)); //@nAa: Bad boy doing hacks
signal(SIGFPE,(*sighandle));

ALOGD("qcamera_device_open: name:%s device:%p cameraId:%d\n",
name, device, cameraId);

0 comments on commit a0ae25d

Please sign in to comment.
You can’t perform that action at this time.