summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules/camera/Camera.cpp2
-rw-r--r--modules/camera/Stream.cpp6
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/camera/Camera.cpp b/modules/camera/Camera.cpp
index 0a0b493..42e5cdb 100644
--- a/modules/camera/Camera.cpp
+++ b/modules/camera/Camera.cpp
@@ -411,6 +411,8 @@ bool Camera::isValidStreamSet(Stream **streams, int count)
if (streams[i]->isOutputType())
outputs++;
}
+ ALOGV("%s:%d: Configuring %d output streams and %d input streams",
+ __func__, mId, outputs, inputs);
if (outputs < 1) {
ALOGE("%s:%d: Stream config must have >= 1 output", __func__, mId);
return false;
diff --git a/modules/camera/Stream.cpp b/modules/camera/Stream.cpp
index 0834aee..31eefcd 100644
--- a/modules/camera/Stream.cpp
+++ b/modules/camera/Stream.cpp
@@ -83,12 +83,14 @@ int Stream::getType()
bool Stream::isInputType()
{
- return mType & (CAMERA3_STREAM_INPUT | CAMERA3_STREAM_BIDIRECTIONAL);
+ return mType == CAMERA3_STREAM_INPUT ||
+ mType == CAMERA3_STREAM_BIDIRECTIONAL;
}
bool Stream::isOutputType()
{
- return mType & (CAMERA3_STREAM_OUTPUT | CAMERA3_STREAM_BIDIRECTIONAL);
+ return mType == CAMERA3_STREAM_OUTPUT ||
+ mType == CAMERA3_STREAM_BIDIRECTIONAL;
}
bool Stream::isRegistered()