Camera2: Add more verbose logging
Until ATRACE works in emulator, add more verbose logs to help debugging
Bug: 6243944
Change-Id: Ic5fbf764f2717e5edd05d37e0f7d826f1d494179
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp
index 9d904e8..a115ef4 100644
--- a/services/camera/libcameraservice/Camera2Client.cpp
+++ b/services/camera/libcameraservice/Camera2Client.cpp
@@ -67,6 +67,7 @@
status_t Camera2Client::initialize(camera_module_t *module)
{
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
status_t res;
res = mDevice->initialize(module);
@@ -320,6 +321,7 @@
void Camera2Client::disconnect() {
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
if (mDevice == 0) return;
@@ -348,7 +350,7 @@
status_t Camera2Client::connect(const sp<ICameraClient>& client) {
ATRACE_CALL();
-
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
if (mClientPid != 0 && getCallingPid() != mClientPid) {
@@ -366,6 +368,7 @@
status_t Camera2Client::lock() {
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
ALOGV("%s: Camera %d: Lock call from pid %d; current client pid %d",
__FUNCTION__, mCameraId, getCallingPid(), mClientPid);
@@ -386,6 +389,7 @@
status_t Camera2Client::unlock() {
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
ALOGV("%s: Camera %d: Unlock call from pid %d; current client pid %d",
__FUNCTION__, mCameraId, getCallingPid(), mClientPid);
@@ -406,6 +410,7 @@
status_t Camera2Client::setPreviewDisplay(
const sp<Surface>& surface) {
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
sp<IBinder> binder;
@@ -421,6 +426,7 @@
status_t Camera2Client::setPreviewTexture(
const sp<ISurfaceTexture>& surfaceTexture) {
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
sp<IBinder> binder;
@@ -438,6 +444,8 @@
status_t res;
if (binder == mPreviewSurface) {
+ ALOGV("%s: Camera %d: New window is same as old window",
+ __FUNCTION__, mCameraId);
return NO_ERROR;
}
@@ -495,6 +503,7 @@
status_t Camera2Client::startPreview() {
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
return startPreviewLocked();
}
@@ -561,6 +570,7 @@
void Camera2Client::stopPreview() {
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
stopPreviewLocked();
}
@@ -605,6 +615,7 @@
status_t Camera2Client::startRecording() {
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
status_t res;
switch (mState) {
@@ -674,6 +685,7 @@
void Camera2Client::stopRecording() {
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
status_t res;
switch (mState) {
@@ -848,6 +860,7 @@
status_t Camera2Client::setParameters(const String8& params) {
ATRACE_CALL();
+ ALOGV("%s: E", __FUNCTION__);
Mutex::Autolock icl(mICameraLock);
Mutex::Autolock pl(mParamsLock);
status_t res;
@@ -2335,6 +2348,9 @@
}
if (currentWidth != (uint32_t)mParameters.previewWidth ||
currentHeight != (uint32_t)mParameters.previewHeight) {
+ ALOGV("%s: Camera %d: Preview size switch: %d x %d -> %d x %d",
+ __FUNCTION__, mCameraId, currentWidth, currentHeight,
+ mParameters.previewWidth, mParameters.previewHeight);
res = mDevice->waitUntilDrained();
if (res != OK) {
ALOGE("%s: Camera %d: Error waiting for preview to drain: "
diff --git a/services/camera/libcameraservice/Camera2Device.cpp b/services/camera/libcameraservice/Camera2Device.cpp
index 54dde80..f42e3a5 100644
--- a/services/camera/libcameraservice/Camera2Device.cpp
+++ b/services/camera/libcameraservice/Camera2Device.cpp
@@ -146,7 +146,7 @@
}
camera_metadata_t *Camera2Device::info() {
- ALOGV("%s: E", __FUNCTION__);
+ ALOGVV("%s: E", __FUNCTION__);
return mDeviceInfo;
}
@@ -268,7 +268,7 @@
status_t Camera2Device::waitUntilDrained() {
static const uint32_t kSleepTime = 50000; // 50 ms
static const uint32_t kMaxSleepTime = 10000000; // 10 s
-
+ ALOGV("%s: E", __FUNCTION__);
if (mRequestQueue.getBufferCount() ==
CAMERA2_REQUEST_QUEUE_IS_BOTTOMLESS) return INVALID_OPERATION;
@@ -642,6 +642,7 @@
sp<ANativeWindow> consumer,
uint32_t width, uint32_t height, int format, size_t size) {
status_t res;
+ ALOGV("%s: E", __FUNCTION__);
if (mState != RELEASED) return INVALID_OPERATION;
if (consumer == NULL) {