From 12398a8ed992f55fe35ac9d6cf513cd4f215ab5e Mon Sep 17 00:00:00 2001
From: Christoph Oberhofer <christoph@brighterfuture.co>
Date: Mon, 27 Mar 2017 21:35:25 +0200
Subject: [PATCH] Added color-channel constraint for images

---
 src/input/PixelCapture.js | 5 ++---
 src/input/Source.js       | 7 ++++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/input/PixelCapture.js b/src/input/PixelCapture.js
index e51396e..f2aa4ec 100644
--- a/src/input/PixelCapture.js
+++ b/src/input/PixelCapture.js
@@ -74,8 +74,7 @@ export function fromSource(source, {target = "#interactive.viewport"} = {}) {
             const dy = 0;
             const dWidth = canvasSize.width;
             const dHeight = canvasSize.height;
-
-            console.time("clipp")
+            const {colorChannels = 3} = source;
 
             clipping = clipping ? clipping(canvasSize) : {
                 x: 0,
@@ -98,7 +97,7 @@ export function fromSource(source, {target = "#interactive.viewport"} = {}) {
                 clipping.height
             ).data;
             var imageBuffer = nextAvailableBuffer(clipping.width * clipping.height);
-            computeGray(imageData, imageBuffer);
+            computeGray(imageData, imageBuffer, {singleChannel: colorChannels === 1});
             return Promise.resolve({
                 width: clipping.width,
                 height: clipping.height,
diff --git a/src/input/Source.js b/src/input/Source.js
index f0c022c..aaef1e0 100644
--- a/src/input/Source.js
+++ b/src/input/Source.js
@@ -153,7 +153,6 @@ function adjustWithZoom(videoConstraints) {
 
 export function fromCamera(constraints) {
     var {video: videoConstraints, zoom} = adjustWithZoom(constraints);
-    console.log(videoConstraints);
 
     const video = getOrCreateVideo();
     return CameraAccess.request(video, videoConstraints)
@@ -246,7 +245,7 @@ export function fromCanvas(input) {
     });
 }
 
-export function fromImage(input, constraints = {width: 800, height: 800}) {
+export function fromImage(input, constraints = {width: 800, height: 800, channels: 3}) {
     var $image = null;
     var src = null;
     if (typeof input === 'string') {
@@ -285,9 +284,11 @@ export function fromImage(input, constraints = {width: 800, height: 800}) {
 
         const calculatedWidth = imageAR > 1 ? constraints.width : Math.floor((imageAR) * constraints.width);
         const calculatedHeight = imageAR > 1 ? Math.floor((1 / imageAR) * constraints.width) : constraints.width;
+        const colorChannels = constraints.channels || 3;
 
         return {
             type: "IMAGE",
+            colorChannels,
             getDimensions() {
                 return {
                     viewport: {
@@ -313,7 +314,7 @@ export function fromImage(input, constraints = {width: 800, height: 800}) {
             },
             applyConstraints: function() {
                 console.log('ImageSource.applyConstraints not implemented');
-            }
+            },
         };
     });
 }