summaryrefslogtreecommitdiff
path: root/libcamera/CameraHardware.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libcamera/CameraHardware.cpp')
-rw-r--r--libcamera/CameraHardware.cpp32
1 files changed, 14 insertions, 18 deletions
diff --git a/libcamera/CameraHardware.cpp b/libcamera/CameraHardware.cpp
index fb10c91..a161039 100644
--- a/libcamera/CameraHardware.cpp
+++ b/libcamera/CameraHardware.cpp
@@ -55,11 +55,11 @@ CameraHardware::CameraHardware(int cameraId)
mParameters(),
mHeap(0),
mPreviewHeap(0),
- mRecordHeap(0),
mRawHeap(0),
+ mRecordHeap(0),
+ mRecordRunning(false),
mPreviewFrameSize(0),
mCurrentPreviewFrame(0),
- mRecordRunning(false),
previewStopped(true),
nQueued(0),
nDequeued(0),
@@ -181,7 +181,6 @@ int CameraHardware::previewThread()
int width, height;
int err;
IMG_native_handle_t** hndl2hndl;
- IMG_native_handle_t* handle;
int stride;
mParameters.getPreviewSize(&width, &height);
int framesize= width * height * 1.5 ; //yuv420sp
@@ -241,9 +240,6 @@ status_t CameraHardware::startPreview()
int ret;
int width, height;
int i;
- IMG_native_handle_t** hndl2hndl;
- IMG_native_handle_t* handle;
- int stride;
char devnode[15];
Mutex::Autolock lock(mLock);
if (mPreviewThread != 0) {
@@ -269,14 +265,14 @@ status_t CameraHardware::startPreview()
mBuffer = new MemoryBase(mHeap, 0, mPreviewFrameSize);
ret = camera.Init();
- if (ret != 0) {
+ if (ret != 0) {
ALOGI("startPreview: Camera.Init failed\n");
camera.Close();
return ret;
}
ret = camera.StartStreaming();
- if (ret != 0) {
+ if (ret != 0) {
ALOGI("startPreview: Camera.StartStreaming failed\n");
camera.Uninit();
camera.Close();
@@ -345,7 +341,7 @@ bool CameraHardware::recordingEnabled()
return mRecordRunning;
}
-void CameraHardware::releaseRecordingFrame(const void *opaque)
+void CameraHardware::releaseRecordingFrame(const void * /*opaque*/)
{
}
@@ -387,15 +383,15 @@ status_t CameraHardware::cancelAutoFocus()
int CameraHardware::pictureThread()
{
ALOGD ("CameraHardware::pictureThread");
- unsigned char *frame;
- int bufferSize;
+ //unsigned char *frame;
+ //int bufferSize;
int w,h;
int ret;
- struct v4l2_buffer buffer;
- struct v4l2_format format;
- struct v4l2_buffer cfilledbuffer;
- struct v4l2_requestbuffers creqbuf;
- struct v4l2_capability cap;
+ //struct v4l2_buffer buffer;
+ //struct v4l2_format format;
+ //struct v4l2_buffer cfilledbuffer;
+ //struct v4l2_requestbuffers creqbuf;
+ //struct v4l2_capability cap;
int i;
char devnode[15];
camera_memory_t* picture = NULL;
@@ -457,7 +453,7 @@ status_t CameraHardware::cancelPicture()
return NO_ERROR;
}
-status_t CameraHardware::dump(int fd, const Vector<String16>& args) const
+status_t CameraHardware::dump(int /*fd*/, const Vector<String16>& /*args*/) const
{
return NO_ERROR;
}
@@ -538,7 +534,7 @@ status_t CameraHardware::setParameters(const CameraParameters& params)
return NO_ERROR;
}
-status_t CameraHardware::sendCommand(int32_t command, int32_t arg1, int32_t arg2)
+status_t CameraHardware::sendCommand(int32_t /*command*/, int32_t /*arg1*/, int32_t /*arg2*/)
{
return BAD_VALUE;
}