commit cd615bb0b6cd1b26f4b9fb9ba5ce9973356b5171
author The Android Automerger <android-build@android.com> Tue May 01 07:03:36 2012 -0700
committer The Android Automerger <android-build@android.com> Tue May 01 07:03:36 2012 -0700
tree 709e6a42bbefd266f347373c9c933aef0ca324d6
parent 80f21d5d3ff761d2905d99548c2e6f1bab078eae
parent e63c645cb33a335f5fd13826b890364c44340b05

merge in jb-release history after reset to jb-dev

camera/AppCallbackNotifier.cpp

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 @@
     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 @@
         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 @@
         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) {

test/CameraHal/camera_test_menu.cpp

diff --git a/test/CameraHal/camera_test_menu.cpp b/test/CameraHal/camera_test_menu.cpp
index 1430ea4..8f3ae50 100644
--- a/test/CameraHal/camera_test_menu.cpp
+++ b/test/CameraHal/camera_test_menu.cpp
@@ -291,8 +291,7 @@
   { AUDIO_ENCODER_AMR_NB, "AMR_NB" },
   { AUDIO_ENCODER_AMR_WB, "AMR_WB" },
   { AUDIO_ENCODER_AAC, "AAC" },
-  { AUDIO_ENCODER_AAC_PLUS, "AAC+" },
-  { AUDIO_ENCODER_EAAC_PLUS, "EAAC+" },
+  { AUDIO_ENCODER_HE_AAC, "AAC+" },
   { AUDIO_ENCODER_LIST_END, "disabled"},
 };
 
@@ -2506,4 +2505,3 @@
     system("echo camerahal_test > /sys/power/wake_unlock");
     return 0;
 }
-