commit a871c8241df63f40f780f2fefdc2f84b97c77374
author Thierry Strudel <tstrudel@google.com> Fri Oct 07 22:05:38 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 07 22:05:39 2016 +0000
tree 7fce364cf37c5da303a701f419b0612724e5f486
parent a97a4d48245e454ffe36cbc0582fa50059020ccb
parent 9e74aae7331f3227542b3e646a0dd658d3467a31

Merge "Update to 07.00.00.253.024" into nyc-mr1-dev

QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c

diff --git a/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c b/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c
index 881c5b0..3124484 100644
--- a/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c
+++ b/QCamera2/stack/mm-camera-interface/src/mm_camera_channel.c
@@ -889,7 +889,7 @@
         }
         break;
     default:
-        LOGE("invalid state (%d) for evt (%d)",
+        LOGW("invalid state (%d) for evt (%d)",
                     my_obj->state, evt);
         break;
     }

QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c

diff --git a/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c b/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c
index 2476887..4ef99a3 100644
--- a/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c
+++ b/QCamera2/stack/mm-camera-interface/src/mm_camera_stream.c
@@ -2350,27 +2350,35 @@
         val = V4L2_PIX_FMT_NV21;
         break;
     case CAM_FORMAT_BAYER_QCOM_RAW_10BPP_GBRG:
+    case CAM_FORMAT_BAYER_MIPI_RAW_10BPP_GBRG:
         val= V4L2_PIX_FMT_SGBRG10;
         break;
     case CAM_FORMAT_BAYER_QCOM_RAW_10BPP_GRBG:
+    case CAM_FORMAT_BAYER_MIPI_RAW_10BPP_GRBG:
         val= V4L2_PIX_FMT_SGRBG10;
         break;
     case CAM_FORMAT_BAYER_QCOM_RAW_10BPP_RGGB:
+    case CAM_FORMAT_BAYER_MIPI_RAW_10BPP_RGGB:
         val= V4L2_PIX_FMT_SRGGB10;
         break;
     case CAM_FORMAT_BAYER_QCOM_RAW_10BPP_BGGR:
+    case CAM_FORMAT_BAYER_MIPI_RAW_10BPP_BGGR:
         val= V4L2_PIX_FMT_SBGGR10;
         break;
     case CAM_FORMAT_BAYER_QCOM_RAW_12BPP_GBRG:
+    case CAM_FORMAT_BAYER_MIPI_RAW_12BPP_GBRG:
         val= V4L2_PIX_FMT_SGBRG12;
         break;
     case CAM_FORMAT_BAYER_QCOM_RAW_12BPP_GRBG:
+    case CAM_FORMAT_BAYER_MIPI_RAW_12BPP_GRBG:
         val= V4L2_PIX_FMT_SGRBG12;
         break;
     case CAM_FORMAT_BAYER_QCOM_RAW_12BPP_RGGB:
+    case CAM_FORMAT_BAYER_MIPI_RAW_12BPP_RGGB:
         val= V4L2_PIX_FMT_SRGGB12;
         break;
     case CAM_FORMAT_BAYER_QCOM_RAW_12BPP_BGGR:
+    case CAM_FORMAT_BAYER_MIPI_RAW_12BPP_BGGR:
         val = V4L2_PIX_FMT_SBGGR12;
         break;
     case CAM_FORMAT_BAYER_QCOM_RAW_14BPP_GBRG:

msmcobalt/QCamera2/stack/mm-camera-test/Android.mk

diff --git a/msmcobalt/QCamera2/stack/mm-camera-test/Android.mk b/msmcobalt/QCamera2/stack/mm-camera-test/Android.mk
index 0ea22e0..8724003 100644
--- a/msmcobalt/QCamera2/stack/mm-camera-test/Android.mk
+++ b/msmcobalt/QCamera2/stack/mm-camera-test/Android.mk
@@ -180,7 +180,7 @@
 LOCAL_CFLAGS += -Wall -Wextra -Werror
 
 LOCAL_SHARED_LIBRARIES:= \
-         libcutils libdl libmmcamera_interface
+         liblog libcutils libdl libmmcamera_interface
 
 LOCAL_MODULE_TAGS := optional