summaryrefslogtreecommitdiff
authorYuxi Sun <yuxi.sun@amlogic.com>2015-01-08 11:41:21 (GMT)
committer Yuxi Sun <yuxi.sun@amlogic.com>2015-01-08 11:41:21 (GMT)
commit9191641f0206816088203fc2db66115e2a1d049e (patch)
tree345add7cd757dc55c87db2d7be30188a5a68ef73
parentadfc8ee6e191f61a4d744513490fb6de30fb933c (diff)
downloadcamera-9191641f0206816088203fc2db66115e2a1d049e.zip
camera-9191641f0206816088203fc2db66115e2a1d049e.tar.gz
camera-9191641f0206816088203fc2db66115e2a1d049e.tar.bz2
Fix cts CameraTest testImmediateZoom fail
Mark all previous streams as not alive, so as to can be deleted later. Change-Id: I2a252ec0e179be23aebeeae89f5e238bae77a1df Signed-off-by: Yuxi Sun <yuxi.sun@amlogic.com>
Diffstat
-rwxr-xr-xv3/EmulatedFakeCamera3.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/v3/EmulatedFakeCamera3.cpp b/v3/EmulatedFakeCamera3.cpp
index 4937c2c..4738ded 100755
--- a/v3/EmulatedFakeCamera3.cpp
+++ b/v3/EmulatedFakeCamera3.cpp
@@ -543,7 +543,7 @@ status_t EmulatedFakeCamera3::configureStreams(
DBG_LOGB("width=%d, height=%d, pixelfmt=%.4s\n",
width, height, (char*)&pixelfmt);
}
-#if 0
+
/**
* Initially mark all existing streams as not alive
*/
@@ -552,7 +552,6 @@ status_t EmulatedFakeCamera3::configureStreams(
static_cast<PrivateStreamInfo*>((*s)->priv);
privStream->alive = false;
}
-#endif
/**
* Find new streams and mark still-alive ones