android/android_hardware_qcom_display
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 4c9f9c81: remove floats from libcamera2

Browse Source 
Merge commit '4c9f9c818223cc5ad0db63553796a54f29e959d1'

* commit '4c9f9c818223cc5ad0db63553796a54f29e959d1':
  remove floats from libcamera2
This commit is contained in:
Iliyan Malchev 2009-06-11 00:45:06 -07:00 committed by The Android Open Source Project
commit 75767da3f7
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libcamera2/QualcommCameraHardware.cpp
View File

@ -958,9 +958,9 @@ bool QualcommCameraHardware::initRaw(bool initJpegHeap)
return false;
}
mRawSize = mRawWidth * mRawHeight * 1.5;
mRawSize = mRawWidth * mRawHeight * 3 / 2;
mJpegMaxSize = mRawWidth * mRawHeight * 1.5;
mJpegMaxSize = mRawWidth * mRawHeight * 3 / 2;
LOGE("initRaw: clearing old mJpegHeap.");
mJpegHeap.clear();
@ -1412,7 +1412,7 @@ status_t QualcommCameraHardware::setParameters(
{
ZoomDirectionIn = true;
}
LOGV("new zoom value: %2.2f direction = %s",
LOGV("new zoom value: %d direction = %s",
mZoomValueCurr, (ZoomDirectionIn ? "in" : "out"));
mZoomValuePrev = mZoomValueCurr;
performZoom(ZoomDirectionIn);
@ -1547,7 +1547,7 @@ void QualcommCameraHardware::receivePreviewFrame(struct msm_frame *frame)
memcpy((uint8_t *)mPreviewHeap->mHeap->base() + offset,
(uint8_t *)frame->buffer,
mPreviewWidth * mPreviewHeight * 1.5);
mPreviewWidth * mPreviewHeight * 3 / 2);
mInPreviewCallback = true;
if (pcb != NULL)
@ -1655,10 +1655,10 @@ QualcommCameraHardware::receiveRawPicture()
LOGE("getPicture failed!");
return;
}
ssize_t offset = (mRawWidth * mRawHeight * 1.5 * snapshot_offset);
ssize_t offset = (mRawWidth * mRawHeight * snapshot_offset * 3 / 2);
#if CAPTURE_RAW
dump_to_file("/sdcard/photo.raw",
(uint8_t *)mMainImageBuf, mRawWidth * mRawHeight * 1.5 );
(uint8_t *)mMainImageBuf, mRawWidth * mRawHeight * 3 / 2);
#endif
mRawPictureCallback(mRawHeap->mBuffers[offset],
mPictureCallbackCookie);

12
libcamera2/QualcommCameraHardware.h
View File

@ -125,12 +125,12 @@ private:
int mPreviewWidth;
int mRawHeight;
int mRawWidth;
unsigned int frame_size;
int mBrightness;
float mZoomValuePrev;
float mZoomValueCurr;
bool mZoomInitialised;
bool mCameraRunning;
unsigned int frame_size;
int mBrightness;
int mZoomValuePrev;
int mZoomValueCurr;
bool mZoomInitialised;
bool mCameraRunning;
bool mPreviewInitialized;
// This class represents a heap which maintains several contiguous