diff options
| author | Kyle Repinski <repinski23@gmail.com> | 2015-01-09 13:02:09 -0600 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-04-11 20:24:53 +0200 |
| commit | 55d21caa69a85f1e9b909ed699282b041a2bcec5 (patch) | |
| tree | bf9b74c9b1fcde8c11c49b865bb94ec8dea8e9d1 /camera/AppCallbackNotifier.cpp | |
| parent | 48d5c7c1d27835ae882ade0bb92a14e7874f5558 (diff) | |
| download | device_samsung_tuna-55d21caa69a85f1e9b909ed699282b041a2bcec5.zip device_samsung_tuna-55d21caa69a85f1e9b909ed699282b041a2bcec5.tar.gz device_samsung_tuna-55d21caa69a85f1e9b909ed699282b041a2bcec5.tar.bz2 | |
camera: Fix compiler warnings, remove some S3D stuff.
Signed-off-by: Kyle Repinski <repinski23@gmail.com>
Diffstat (limited to 'camera/AppCallbackNotifier.cpp')
| -rw-r--r-- | camera/AppCallbackNotifier.cpp | 8 |
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, |