summaryrefslogtreecommitdiffstats
path: root/modules/camera
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-22 11:12:12 -0700
committerElliott Hughes <enh@google.com>2014-05-22 11:12:12 -0700
commit0d1c2a49d675945a34baca364d68c396f03cc3e8 (patch)
tree0dcb5d34136049c2b5573ea3878093a30710a9e6 /modules/camera
parent3c0ddf0af95fa6ad6d84d2a8d942c3181b65457f (diff)
downloadhardware_libhardware-0d1c2a49d675945a34baca364d68c396f03cc3e8.zip
hardware_libhardware-0d1c2a49d675945a34baca364d68c396f03cc3e8.tar.gz
hardware_libhardware-0d1c2a49d675945a34baca364d68c396f03cc3e8.tar.bz2
Switch libhardware to POSIX dprintf.
Bug: 15022164 Change-Id: Ie4c93318c2e7a947a57e16b220a6abceec59e6aa
Diffstat (limited to 'modules/camera')
-rw-r--r--modules/camera/Camera.cpp8
-rw-r--r--modules/camera/Stream.cpp20
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]);
}
}