diff options
| -rw-r--r-- | modules/camera/Camera.cpp | 8 | ||||
| -rw-r--r-- | modules/camera/Stream.cpp | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/modules/camera/Camera.cpp b/modules/camera/Camera.cpp index 1f22e00..de3ae78 100644 --- a/modules/camera/Camera.cpp +++ b/modules/camera/Camera.cpp @@ -473,14 +473,14 @@ void Camera::dump(int fd) ATRACE_CALL(); android::Mutex::Autolock al(mDeviceLock); - fdprintf(fd, "Camera ID: %d (Busy: %d)\n", mId, mBusy); + dprintf(fd, "Camera ID: %d (Busy: %d)\n", mId, mBusy); // TODO: dump all settings - fdprintf(fd, "Most Recent Settings: (%p)\n", mSettings); + dprintf(fd, "Most Recent Settings: (%p)\n", mSettings); - fdprintf(fd, "Number of streams: %d\n", mNumStreams); + dprintf(fd, "Number of streams: %d\n", mNumStreams); for (int i = 0; i < mNumStreams; i++) { - fdprintf(fd, "Stream %d/%d:\n", i, mNumStreams); + dprintf(fd, "Stream %d/%d:\n", i, mNumStreams); mStreams[i]->dump(fd); } } diff --git a/modules/camera/Stream.cpp b/modules/camera/Stream.cpp index b846a71..2db3ed2 100644 --- a/modules/camera/Stream.cpp +++ b/modules/camera/Stream.cpp @@ -225,18 +225,18 @@ void Stream::dump(int fd) { android::Mutex::Autolock al(mLock); - fdprintf(fd, "Stream ID: %d (%p)\n", mId, mStream); - fdprintf(fd, "Stream Type: %s (%d)\n", typeToString(mType), mType); - fdprintf(fd, "Width: %"PRIu32" Height: %"PRIu32"\n", mWidth, mHeight); - fdprintf(fd, "Stream Format: %s (%d)", formatToString(mFormat), mFormat); + dprintf(fd, "Stream ID: %d (%p)\n", mId, mStream); + dprintf(fd, "Stream Type: %s (%d)\n", typeToString(mType), mType); + dprintf(fd, "Width: %"PRIu32" Height: %"PRIu32"\n", mWidth, mHeight); + dprintf(fd, "Stream Format: %s (%d)", formatToString(mFormat), mFormat); // ToDo: prettyprint usage mask flags - fdprintf(fd, "Gralloc Usage Mask: %#"PRIx32"\n", mUsage); - fdprintf(fd, "Max Buffer Count: %"PRIu32"\n", mMaxBuffers); - fdprintf(fd, "Buffers Registered: %s\n", mRegistered ? "true" : "false"); - fdprintf(fd, "Number of Buffers: %"PRIu32"\n", mNumBuffers); + dprintf(fd, "Gralloc Usage Mask: %#"PRIx32"\n", mUsage); + dprintf(fd, "Max Buffer Count: %"PRIu32"\n", mMaxBuffers); + dprintf(fd, "Buffers Registered: %s\n", mRegistered ? "true" : "false"); + dprintf(fd, "Number of Buffers: %"PRIu32"\n", mNumBuffers); for (uint32_t i = 0; i < mNumBuffers; i++) { - fdprintf(fd, "Buffer %"PRIu32"/%"PRIu32": %p\n", i, mNumBuffers, - mBuffers[i]); + dprintf(fd, "Buffer %"PRIu32"/%"PRIu32": %p\n", i, mNumBuffers, + mBuffers[i]); } } |