commit 47512a7da600ababdfd052b574488b9e499c22f6
author Eino-Ville Talvala <etalvala@google.com> Mon Sep 10 13:30:43 2012 -0700
committer Eino-Ville Talvala <etalvala@google.com> Mon Sep 10 13:30:43 2012 -0700
tree 420a5bf7b929c78628d915fc8bbfa97858d34941
parent 66765846726c02db16a0f024f2217990a90802c0

Camera2: Clean up the right streams.

Change-Id: I780c3e8e255f6a185e0edf1d76f35afdc74dff48

services/camera/libcameraservice/camera2/ZslProcessor.cpp

diff --git a/services/camera/libcameraservice/camera2/ZslProcessor.cpp b/services/camera/libcameraservice/camera2/ZslProcessor.cpp
index ac02afc..ea1c2b9 100644
--- a/services/camera/libcameraservice/camera2/ZslProcessor.cpp
+++ b/services/camera/libcameraservice/camera2/ZslProcessor.cpp
@@ -134,7 +134,7 @@
         }
         if (currentWidth != (uint32_t)params.pictureWidth ||
                 currentHeight != (uint32_t)params.pictureHeight) {
-            res = device->deleteStream(mZslReprocessStreamId);
+            res = device->deleteReprocessStream(mZslReprocessStreamId);
             if (res != OK) {
                 ALOGE("%s: Camera %d: Unable to delete old reprocess stream "
                         "for ZSL: %s (%d)", __FUNCTION__,
@@ -189,9 +189,22 @@
         if (client == 0) return OK;
         sp<Camera2Device> device = client->getCameraDevice();
 
-        device->deleteStream(mZslReprocessStreamId);
+        res = device->deleteReprocessStream(mZslReprocessStreamId);
+        if (res != OK) {
+            ALOGE("%s: Camera %d: Cannot delete ZSL reprocessing stream %d: "
+                    "%s (%d)", __FUNCTION__, client->getCameraId(),
+                    mZslReprocessStreamId, strerror(-res), res);
+            return res;
+        }
+
         mZslReprocessStreamId = NO_STREAM;
-        device->deleteStream(mZslStreamId);
+        res = device->deleteStream(mZslStreamId);
+        if (res != OK) {
+            ALOGE("%s: Camera %d: Cannot delete ZSL output stream %d: "
+                    "%s (%d)", __FUNCTION__, client->getCameraId(),
+                    mZslStreamId, strerror(-res), res);
+            return res;
+        }
 
         mZslWindow.clear();
         mZslConsumer.clear();