summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Murashkin <iam@google.com>2013-04-02 16:36:33 -0700
committerIgor Murashkin <iam@google.com>2013-04-02 16:38:02 -0700
commita55b545ef3d8624123efe0e04c2a7d3a30b56b48 (patch)
treeebe24e5621c6d3483d11dfaac38499e40cc9153b
parentdf41f485a9162407b32b7db1cea483f64bbd0c65 (diff)
downloadframeworks_av-a55b545ef3d8624123efe0e04c2a7d3a30b56b48.zip
frameworks_av-a55b545ef3d8624123efe0e04c2a7d3a30b56b48.tar.gz
frameworks_av-a55b545ef3d8624123efe0e04c2a7d3a30b56b48.tar.bz2
Camera3: Fix output stream creation for JPEG streams
Change-Id: Iadf85c103c21614abb1aeb69a832ca01919c2aa5
-rw-r--r--services/camera/libcameraservice/camera3/Camera3OutputStream.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp b/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp
index d07ae94..276b940 100644
--- a/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp
+++ b/services/camera/libcameraservice/camera3/Camera3OutputStream.cpp
@@ -57,7 +57,14 @@ Camera3OutputStream::Camera3OutputStream(int id,
uint32_t width, uint32_t height, size_t maxSize, int format) :
Camera3Stream(id, CAMERA3_STREAM_OUTPUT,
width, height, maxSize, format),
- mConsumer(consumer) {
+ mConsumer(consumer),
+ mTransform(0),
+ mTotalBufferCount(0),
+ mDequeuedBufferCount(0),
+ mFrameCount(0),
+ mLastTimestamp(0) {
+
+ mCombinedFence = new Fence();
if (format != HAL_PIXEL_FORMAT_BLOB) {
ALOGE("%s: Bad format for size-only stream: %d", __FUNCTION__,