commit 2fba584544e8687b526e3388bf7160b696da1dba
author Igor Murashkin <iam@google.com> Mon Apr 22 14:03:54 2013 -0700
committer Igor Murashkin <iam@google.com> Mon Apr 29 10:54:49 2013 -0700
tree bec9fffefdccb6646bbd7d8e40b5a1d601768dbe
parent d4d5227521a53dec6f77bed33846b4ccd4a760e4

Camera3: Add ZSL stream support

Bug: 8563838

Change-Id: I2feda142ff5172aba17ade5c8d502f9bb5d5b766

services/camera/libcameraservice/camera3/Camera3OutputStream.h

diff --git a/services/camera/libcameraservice/camera3/Camera3OutputStream.h b/services/camera/libcameraservice/camera3/Camera3OutputStream.h
index d331a94..2464dce 100644
--- a/services/camera/libcameraservice/camera3/Camera3OutputStream.h
+++ b/services/camera/libcameraservice/camera3/Camera3OutputStream.h
@@ -21,6 +21,7 @@
 #include <gui/Surface.h>
 
 #include "Camera3Stream.h"
+#include "Camera3OutputStreamInterface.h"
 
 namespace android {
 
@@ -29,7 +30,9 @@
 /**
  * A class for managing a single stream of output data from the camera device.
  */
-class Camera3OutputStream : public Camera3Stream {
+class Camera3OutputStream :
+        public Camera3Stream,
+        public Camera3OutputStreamInterface {
   public:
     /**
      * Set up a stream for formats that have 2 dimensions, such as RAW and YUV.