Merge "CameraHAL: Save size for preview callbacks" into p-ics-mr1

2 files changed, 13 insertions, 7 deletions

diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp
index 8b3d46a..9486af0 100644
--- a/camera/AppCallbackNotifier.cpp
+++ b/camera/AppCallbackNotifier.cpp
@@ -671,9 +671,9 @@ void AppCallbackNotifier::copyAndSendPreviewFrame(CameraFrame* frame, int32_t ms
                      __LINE__,
                       dest,
                       frame->mBuffer,
-                      frame->mWidth,
-                      frame->mHeight,
-                      frame->mAlignment,
+                      mPreviewWidth,
+                      mPreviewHeight,
+                      mPreviewStride,
                       2,
                       frame->mLength,
                       mPreviewPixelFormat);
@@ -694,9 +694,9 @@ void AppCallbackNotifier::copyAndSendPreviewFrame(CameraFrame* frame, int32_t ms
               else{
                 copy2Dto1D(dest,
                            frame->mYuv,
-                           frame->mWidth,
-                           frame->mHeight,
-                           frame->mAlignment,
+                           mPreviewWidth,
+                           mPreviewHeight,
+                           mPreviewStride,
                            frame->mOffset,
                            2,
                            frame->mLength,
@@ -1429,7 +1429,10 @@ status_t AppCallbackNotifier::startPreviewCallbacks(CameraParameters &params, vo
     ///Get preview size
     params.getPreviewSize(&w, &h);
 
-    //Get the preview pixel format
+    // save preview pixel format, size and stride
+    mPreviewWidth = w;
+    mPreviewHeight = h;
+    mPreviewStride = 4096;
     mPreviewPixelFormat = getContstantForPixelFormat(params.getPreviewFormat());
     size = calculateBufferSize(w, h, mPreviewPixelFormat);
 
diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h
index e6531c7..1fff01e 100644
--- a/camera/inc/CameraHal.h
+++ b/camera/inc/CameraHal.h
@@ -734,6 +734,9 @@ private:
     camera_memory_t* mPreviewMemory;
     unsigned char* mPreviewBufs[MAX_BUFFERS];
     int mPreviewBufCount;
+    int mPreviewWidth;
+    int mPreviewHeight;
+    int mPreviewStride;
     const char *mPreviewPixelFormat;
     KeyedVector<unsigned int, sp<MemoryHeapBase> > mSharedPreviewHeaps;
     KeyedVector<unsigned int, sp<MemoryBase> > mSharedPreviewBuffers;