QCamera2: avoid leaking device code names to JPEG EXIF
am: e9fabb980d
Change-Id: I689e3947f7cb28addaaa90757898bb32f751930e
diff --git a/QCamera2/HAL/QCamera2HWI.cpp b/QCamera2/HAL/QCamera2HWI.cpp
index 380e7f6..55260af 100644
--- a/QCamera2/HAL/QCamera2HWI.cpp
+++ b/QCamera2/HAL/QCamera2HWI.cpp
@@ -3069,7 +3069,7 @@
mParameters.getHfrFps(pFpsRange);
streamInfo->user_buf_info.frameInterval =
(long)((1000/pFpsRange.video_max_fps) * 1000);
- LOGH("Video Batch Count = %d, interval = %d",
+ LOGH("Video Batch Count = %d, interval = %ld",
streamInfo->user_buf_info.frame_buf_cnt,
streamInfo->user_buf_info.frameInterval);
}
diff --git a/QCamera2/HAL/QCamera2HWICallbacks.cpp b/QCamera2/HAL/QCamera2HWICallbacks.cpp
index ec05ec4..5c7d280 100644
--- a/QCamera2/HAL/QCamera2HWICallbacks.cpp
+++ b/QCamera2/HAL/QCamera2HWICallbacks.cpp
@@ -2873,7 +2873,7 @@
}
}
- LOGH("written number of bytes %ld\n",
+ LOGH("written number of bytes %zd\n",
written_len);
close(file_fd);
} else {
diff --git a/QCamera2/HAL/QCameraStream.cpp b/QCamera2/HAL/QCameraStream.cpp
index 2da9980..a8f44c0 100644
--- a/QCamera2/HAL/QCameraStream.cpp
+++ b/QCamera2/HAL/QCameraStream.cpp
@@ -1376,7 +1376,7 @@
*num_bufs = mNumBufs;
*initial_reg_flag = regFlags;
*bufs = mBufDefs;
- LOGH("stream type: %d, mRegFlags: 0x%x, numBufs: %d",
+ LOGH("stream type: %d, mRegFlags: %p, numBufs: %d",
mStreamInfo->stream_type, regFlags, mNumBufs);
if (mNumBufsNeedAlloc > 0) {
diff --git a/QCamera2/HAL3/QCamera3Stream.cpp b/QCamera2/HAL3/QCamera3Stream.cpp
index dad6072..9274d7e 100644
--- a/QCamera2/HAL3/QCamera3Stream.cpp
+++ b/QCamera2/HAL3/QCamera3Stream.cpp
@@ -804,7 +804,7 @@
mBufDefs[index].mem_info = NULL;
} else {
- LOGE("Buffer at index %d not registered");
+ LOGE("Buffer at index %d not registered", index);
return BAD_INDEX;
}
diff --git a/QCamera2/stack/mm-camera-test/Android.mk b/QCamera2/stack/mm-camera-test/Android.mk
index c2fe9f7..2d77f38 100644
--- a/QCamera2/stack/mm-camera-test/Android.mk
+++ b/QCamera2/stack/mm-camera-test/Android.mk
@@ -86,7 +86,7 @@
LOCAL_CFLAGS += -Wall -Wextra -Werror
LOCAL_SHARED_LIBRARIES:= \
- libcutils libdl libmmcamera_interface
+ liblog libcutils libdl libmmcamera_interface
LOCAL_MODULE_TAGS := optional
@@ -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
diff --git a/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c b/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c
index e7a2afb..3062b1f 100644
--- a/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c
+++ b/QCamera2/stack/mm-camera-test/src/mm_qcamera_app.c
@@ -35,8 +35,11 @@
#include <errno.h>
#include <fcntl.h>
#include <linux/msm_ion.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
#define MMAN_H <SYSTEM_HEADER_PREFIX/mman.h>
#include MMAN_H
+#include <unistd.h>
// Camera dependencies
#include "mm_qcamera_dbg.h"
diff --git a/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c b/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c
index 0865c6f..99f855f 100644
--- a/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c
+++ b/QCamera2/stack/mm-camera-test/src/mm_qcamera_main_menu.c
@@ -30,6 +30,7 @@
// System dependencies
#include <ctype.h>
#include <errno.h>
+#include <unistd.h>
// Camera dependencies
#include "mm_qcamera_main_menu.h"
diff --git a/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c b/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c
index 2072f20..21fa4c3 100644
--- a/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c
+++ b/QCamera2/stack/mm-camera-test/src/mm_qcamera_preview.c
@@ -31,16 +31,18 @@
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
+#include <semaphore.h>
+#include <stdio.h>
+#include <sys/ioctl.h>
+#include <sys/mman.h>
#define MMAN_H <SYSTEM_HEADER_PREFIX/mman.h>
#include MMAN_H
+#include <unistd.h>
// Camera dependencies
#include "mm_qcamera_app.h"
#include "mm_qcamera_dbg.h"
#include "mm_qcamera_app.h"
-#include <assert.h>
-#include <sys/mman.h>
-#include <semaphore.h>
static void mm_app_metadata_notify_cb(mm_camera_super_buf_t *bufs,
void *user_data)
diff --git a/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c b/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c
index 0e87e72..9d0f028 100644
--- a/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c
+++ b/QCamera2/stack/mm-camera-test/src/mm_qcamera_rdi.c
@@ -29,6 +29,8 @@
// System dependencies
#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
// Camera dependencies
#include "mm_qcamera_app.h"
diff --git a/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c b/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c
index 7ab8db8..73a7d2d 100644
--- a/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c
+++ b/QCamera2/stack/mm-camera-test/src/mm_qcamera_socket.c
@@ -29,6 +29,8 @@
// System dependencies
#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
// Camera dependencies
#include "mm_qcamera_socket.h"
diff --git a/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c b/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c
index c6eaab7..3a51362 100644
--- a/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c
+++ b/QCamera2/stack/mm-camera-test/src/mm_qcamera_unit_test.c
@@ -36,6 +36,8 @@
#define MM_QCAMERA_APP_UTEST_INNER_LOOP 1
#define MM_QCAM_APP_TEST_NUM 128
+#include <unistd.h>
+
static mm_app_tc_t mm_app_tc[MM_QCAM_APP_TEST_NUM];
int mm_app_tc_open_close(mm_camera_app_t *cam_app)
diff --git a/QCamera2/stack/mm-jpeg-interface/test/Android.mk b/QCamera2/stack/mm-jpeg-interface/test/Android.mk
index b42636c..46a17da 100644
--- a/QCamera2/stack/mm-jpeg-interface/test/Android.mk
+++ b/QCamera2/stack/mm-jpeg-interface/test/Android.mk
@@ -37,7 +37,7 @@
LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
LOCAL_MODULE := mm-jpeg-interface-test
LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libmmjpeg_interface
include $(BUILD_EXECUTABLE)
@@ -80,8 +80,8 @@
LOCAL_32_BIT_ONLY := $(BOARD_QTI_CAMERA_32BIT_ONLY)
LOCAL_MODULE := mm-jpegdec-interface-test
LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libcutils libdl libmmjpeg_interface
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl libmmjpeg_interface
include $(BUILD_EXECUTABLE)
-LOCAL_PATH := $(OLD_LOCAL_PATH)
\ No newline at end of file
+LOCAL_PATH := $(OLD_LOCAL_PATH)
diff --git a/mm-image-codec/qomx_core/Android.mk b/mm-image-codec/qomx_core/Android.mk
index fa7242b..9108c2c 100644
--- a/mm-image-codec/qomx_core/Android.mk
+++ b/mm-image-codec/qomx_core/Android.mk
@@ -20,7 +20,7 @@
LOCAL_MODULE := libqomx_core
LOCAL_PRELINK_MODULE := false
-LOCAL_SHARED_LIBRARIES := libcutils libdl
+LOCAL_SHARED_LIBRARIES := liblog libcutils libdl
LOCAL_32_BIT_ONLY := true
include $(BUILD_SHARED_LIBRARY)
