summaryrefslogtreecommitdiffstats
path: root/jni/feature_mos/src/mosaic/Blend.cpp
diff options
context:
space:
mode:
authorSai Kumar Sanagavarapu <ssanagav@codeaurora.org>2015-07-15 12:58:58 +0530
committerSai Kumar Sanagavarapu <ssanagav@codeaurora.org>2015-07-15 13:33:58 +0530
commit5655169cd7698f0a4a382520ca787703d3c5712e (patch)
treec6ef14229426e5e290eb747ccf6631bcac633e94 /jni/feature_mos/src/mosaic/Blend.cpp
parentc28dbaf74ea7627cbea47537049b972dde6bdc4a (diff)
downloadandroid_packages_apps_Snap-5655169cd7698f0a4a382520ca787703d3c5712e.tar.gz
android_packages_apps_Snap-5655169cd7698f0a4a382520ca787703d3c5712e.tar.bz2
android_packages_apps_Snap-5655169cd7698f0a4a382520ca787703d3c5712e.zip
SnapdragonCamera: Fix compilation
1. Address compilation due to compiler upgrade. 2. Comment out video dependencies to enable camera. 3. Fix compilation issue due to IMountService interface change. 4. Comment out ExtendedFace. 5. Remove non-standard video resolutions. 6. Revert "camera: override shutter sound volume" commit 8a50cda8f72738e943904fdf7cae189b2b0a8ea8. Change-Id: I167ab5ff399c4f1d306a1a7ddf94896565c9625a
Diffstat (limited to 'jni/feature_mos/src/mosaic/Blend.cpp')
-rw-r--r--jni/feature_mos/src/mosaic/Blend.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/jni/feature_mos/src/mosaic/Blend.cpp b/jni/feature_mos/src/mosaic/Blend.cpp
index fce89c6e1..8e8ca6749 100644
--- a/jni/feature_mos/src/mosaic/Blend.cpp
+++ b/jni/feature_mos/src/mosaic/Blend.cpp
@@ -29,6 +29,10 @@
#include "Log.h"
#define LOG_TAG "BLEND"
+const float Blend::LIMIT_SIZE_MULTIPLIER = 5.0f * 2.0f;
+
+const float Blend::LIMIT_HEIGHT_MULTIPLIER = 2.5f;
+
Blend::Blend()
{
m_wb.blendingType = BLEND_TYPE_NONE;