diff options
| author | Emilian Peev <epeev@mm-sol.com> | 2012-04-23 12:21:57 +0300 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2012-04-29 20:36:07 -0700 |
| commit | 2dc9bc1f87be40c2e4903b97a3df353d0f7c6781 (patch) | |
| tree | 873d1b31e6a945d85e2ddea3400d431d435958d4 /camera | |
| parent | 726dfe7cd16efb9640283c86504cf1a3fb857277 (diff) | |
| download | hardware_ti_omap4xxx-2dc9bc1f87be40c2e4903b97a3df353d0f7c6781.zip hardware_ti_omap4xxx-2dc9bc1f87be40c2e4903b97a3df353d0f7c6781.tar.gz hardware_ti_omap4xxx-2dc9bc1f87be40c2e4903b97a3df353d0f7c6781.tar.bz2 | |
CameraHal: Fix for YV12 camera callbacks
- 'mPreviewPixelFormat' was being set incorrectly
for YV12 case.
Bug: 6325348
Change-Id: I80acc5cd721d317fac9525bdb734fe2e70df85bf
Signed-off-by: Emilian Peev <epeev@mm-sol.com>
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/AppCallbackNotifier.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/camera/AppCallbackNotifier.cpp b/camera/AppCallbackNotifier.cpp index aa41141..63ed000 100644 --- a/camera/AppCallbackNotifier.cpp +++ b/camera/AppCallbackNotifier.cpp @@ -468,7 +468,7 @@ static void copy2Dto1D(void *dst, unsigned int *y_uv = (unsigned int *)src; CAMHAL_LOGVB("copy2Dto1D() y= %p ; uv=%p.",y_uv[0], y_uv[1]); - CAMHAL_LOGVB("pixelFormat,= %d; offset=%d",*pixelFormat,offset); + CAMHAL_LOGVB("pixelFormat= %s; offset=%d", pixelFormat,offset); if (pixelFormat!=NULL) { if (strcmp(pixelFormat, CameraParameters::PIXEL_FORMAT_YUV422I) == 0) { @@ -1403,8 +1403,7 @@ status_t AppCallbackNotifier::startPreviewCallbacks(CameraParameters ¶ms, vo size = w*h*2; mPreviewPixelFormat = CameraParameters::PIXEL_FORMAT_YUV422I; } - else if(strcmp(mPreviewPixelFormat, (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP) == 0 || - strcmp(mPreviewPixelFormat, (const char *) CameraParameters::PIXEL_FORMAT_YUV420P) == 0) + else if(strcmp(mPreviewPixelFormat, (const char *) CameraParameters::PIXEL_FORMAT_YUV420SP) == 0 ) { size = (w*h*3)/2; mPreviewPixelFormat = CameraParameters::PIXEL_FORMAT_YUV420SP; @@ -1414,6 +1413,11 @@ status_t AppCallbackNotifier::startPreviewCallbacks(CameraParameters ¶ms, vo size = w*h*2; mPreviewPixelFormat = CameraParameters::PIXEL_FORMAT_RGB565; } + else if(strcmp(mPreviewPixelFormat, (const char *) CameraParameters::PIXEL_FORMAT_YUV420P) == 0) + { + size = (w*h*3)/2; + mPreviewPixelFormat = CameraParameters::PIXEL_FORMAT_YUV420P; + } mPreviewMemory = mRequestMemory(-1, size, AppCallbackNotifier::MAX_BUFFERS, NULL); if (!mPreviewMemory) { |