From cc588adda3aa146d6b3aa52774c64b302abc4903 Mon Sep 17 00:00:00 2001
From: Eino-Ville Talvala <etalvala@google.com>
Date: Thu, 14 Jun 2012 10:52:04 -0700
Subject: [PATCH] EmulatedFakeCamera2: Implement basic dump()

Bug: 6243944
Change-Id: I84696ea79f8c36d34c2cccdac259c9baba048c1f
---
 .../emulator/system/camera/EmulatedFakeCamera2.cpp | 14 ++++++++++++++
 tools/emulator/system/camera/EmulatedFakeCamera2.h |  2 ++
 tools/emulator/system/camera/fake-pipeline2/Base.h |  1 -
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
index 31ac8ea95..e1c6010cf 100644
--- a/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
+++ b/tools/emulator/system/camera/EmulatedFakeCamera2.cpp
@@ -455,6 +455,20 @@ int EmulatedFakeCamera2::getVendorTagType(uint32_t tag) {
 /** Shutdown and debug methods */
 
 int EmulatedFakeCamera2::dump(int fd) {
+    String8 result;
+
+    result.appendFormat("    Camera HAL device: EmulatedFakeCamera2\n");
+    result.appendFormat("      Streams:\n");
+    for (size_t i = 0; i < mStreams.size(); i++) {
+        int id = mStreams.keyAt(i);
+        const Stream& s = mStreams.valueAt(i);
+        result.appendFormat(
+            "         Stream %d: %d x %d, format 0x%x, stride %d\n",
+            id, s.width, s.height, s.format, s.stride);
+    }
+
+    write(fd, result.string(), result.size());
+
     return NO_ERROR;
 }
 
diff --git a/tools/emulator/system/camera/EmulatedFakeCamera2.h b/tools/emulator/system/camera/EmulatedFakeCamera2.h
index 34d1b1221..9a0b67623 100644
--- a/tools/emulator/system/camera/EmulatedFakeCamera2.h
+++ b/tools/emulator/system/camera/EmulatedFakeCamera2.h
@@ -29,6 +29,8 @@
 #include "fake-pipeline2/JpegCompressor.h"
 #include <utils/Condition.h>
 #include <utils/KeyedVector.h>
+#include <utils/String8.h>
+#include <utils/String16.h>
 #include <utils/Thread.h>
 
 namespace android {
diff --git a/tools/emulator/system/camera/fake-pipeline2/Base.h b/tools/emulator/system/camera/fake-pipeline2/Base.h
index f6ee5db39..7f6be16c7 100644
--- a/tools/emulator/system/camera/fake-pipeline2/Base.h
+++ b/tools/emulator/system/camera/fake-pipeline2/Base.h
@@ -41,7 +41,6 @@ struct StreamBuffer {
 typedef Vector<StreamBuffer> Buffers;
 
 struct Stream {
-    uint32_t id;
     const camera2_stream_ops_t *ops;
     uint32_t width, height;
     uint32_t format;