summaryrefslogtreecommitdiffstats
path: root/camera/AppCallbackNotifier.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'camera/AppCallbackNotifier.cpp')
-rw-r--r--camera/AppCallbackNotifier.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp
index 064310f..90f63a9 100644
--- a/camera/AppCallbackNotifier.cpp
+++ b/camera/AppCallbackNotifier.cpp
@@ -63,7 +63,7 @@ void AppCallbackNotifier::EncoderDoneCb(void* main_jpeg, void* thumb_jpeg, Camer
Encoder_libjpeg::params *main_param = NULL, *thumb_param = NULL;
size_t jpeg_size;
uint8_t* src = NULL;
- CameraBuffer *camera_buffer;
+ CameraBuffer *camera_buffer = NULL;
android::sp<Encoder_libjpeg> encoder = NULL;
LOG_FUNCTION_NAME;
@@ -1085,13 +1085,13 @@ void AppCallbackNotifier::notifyFrame()
mapper.lock((buffer_handle_t)vBuf, CAMHAL_GRALLOC_USAGE, bounds, y_uv);
y_uv[1] = y_uv[0] + mVideoHeight*4096;
- structConvImage input = {frame->mWidth,
- frame->mHeight,
+ structConvImage input = {(mmInt32)frame->mWidth,
+ (mmInt32)frame->mHeight,
4096,
IC_FORMAT_YCbCr420_lp,
(mmByte *)frame->mYuv[0],
(mmByte *)frame->mYuv[1],
- frame->mOffset};
+ (mmInt32)frame->mOffset};
structConvImage output = {mVideoWidth,
mVideoHeight,