remove useless file

3 files changed, 0 insertions, 724 deletions

diff --git a/TICameraParameters.cpp b/TICameraParameters.cpp
deleted file mode 100644
index 221cff4..0000000
--- a/TICameraParameters.cpp
+++ b/dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) Texas Instruments - http://www.ti.com/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-#define LOG_TAG "CameraHAL"
-#include <utils/Log.h>
-
-#include <string.h>
-#include <stdlib.h>
-#include <TICameraParameters.h>
-#include "CameraHal.h"
-
-namespace android {
-
-//TI extensions to camera mode
-const char TICameraParameters::HIGH_PERFORMANCE_MODE[] = "high-performance";
-const char TICameraParameters::HIGH_QUALITY_MODE[] = "high-quality";
-const char TICameraParameters::HIGH_QUALITY_ZSL_MODE[] = "high-quality-zsl";
-const char TICameraParameters::VIDEO_MODE[] = "video-mode";
-
-// TI extensions to standard android Parameters
-const char TICameraParameters::KEY_SUPPORTED_CAMERAS[] = "camera-indexes";
-const char TICameraParameters::KEY_CAMERA[] = "camera-index";
-const char TICameraParameters::KEY_SHUTTER_ENABLE[] = "shutter-enable";
-const char TICameraParameters::KEY_CAMERA_NAME[] = "camera-name";
-const char TICameraParameters::KEY_BURST[] = "burst-capture";
-const char TICameraParameters::KEY_CAP_MODE[] = "mode";
-const char TICameraParameters::KEY_VNF[] = "vnf";
-const char TICameraParameters::KEY_SATURATION[] = "saturation";
-const char TICameraParameters::KEY_BRIGHTNESS[] = "brightness";
-const char TICameraParameters::KEY_EXPOSURE_MODE[] = "exposure";
-const char TICameraParameters::KEY_SUPPORTED_EXPOSURE[] = "exposure-mode-values";
-const char TICameraParameters::KEY_CONTRAST[] = "contrast";
-const char TICameraParameters::KEY_SHARPNESS[] = "sharpness";
-const char TICameraParameters::KEY_ISO[] = "iso";
-const char TICameraParameters::KEY_SUPPORTED_ISO_VALUES[] = "iso-mode-values";
-const char TICameraParameters::KEY_SUPPORTED_IPP[] = "ipp-values";
-const char TICameraParameters::KEY_IPP[] = "ipp";
-const char TICameraParameters::KEY_MAN_EXPOSURE[] = "manual-exposure";
-const char TICameraParameters::KEY_METERING_MODE[] = "meter-mode";
-const char TICameraParameters::KEY_PADDED_WIDTH[] = "padded-width";
-const char TICameraParameters::KEY_PADDED_HEIGHT[] = "padded-height";
-const char TICameraParameters::KEY_EXP_BRACKETING_RANGE[] = "exp-bracketing-range";
-const char TICameraParameters::KEY_TEMP_BRACKETING[] = "temporal-bracketing";
-const char TICameraParameters::KEY_TEMP_BRACKETING_RANGE_POS[] = "temporal-bracketing-range-positive";
-const char TICameraParameters::KEY_TEMP_BRACKETING_RANGE_NEG[] = "temporal-bracketing-range-negative";
-const char TICameraParameters::KEY_S3D_SUPPORTED[] = "s3d-supported";
-const char TICameraParameters::KEY_MEASUREMENT_ENABLE[] = "measurement";
-const char TICameraParameters::KEY_GBCE[] = "gbce";
-const char TICameraParameters::KEY_GLBCE[] = "glbce";
-const char TICameraParameters::KEY_CURRENT_ISO[] = "current-iso";
-const char TICameraParameters::KEY_SENSOR_ORIENTATION[] = "sensor-orientation";
-const char TICameraParameters::KEY_SENSOR_ORIENTATION_VALUES[] = "sensor-orientation-values";
-const char TICameraParameters::KEY_MINFRAMERATE[] = "min-framerate";
-const char TICameraParameters::KEY_MAXFRAMERATE[] = "max-framerate";
-const char TICameraParameters::KEY_RECORDING_HINT[] = "internal-recording-hint";
-const char TICameraParameters::KEY_AUTO_FOCUS_LOCK[] = "auto-focus-lock";
-
-//TI extensions for enabling/disabling GLBCE
-const char TICameraParameters::GLBCE_ENABLE[] = "enable";
-const char TICameraParameters::GLBCE_DISABLE[] = "disable";
-
-//TI extensions for enabling/disabling GBCE
-const char TICameraParameters::GBCE_ENABLE[] = "enable";
-const char TICameraParameters::GBCE_DISABLE[] = "disable";
-
-//TI extensions for enabling/disabling measurement
-const char TICameraParameters::MEASUREMENT_ENABLE[] = "enable";
-const char TICameraParameters::MEASUREMENT_DISABLE[] = "disable";
-
-//TI extensions for zoom
-const char TICameraParameters::ZOOM_SUPPORTED[] = "true";
-const char TICameraParameters::ZOOM_UNSUPPORTED[] = "false";
-
-// TI extensions for 2D Preview in Stereo Mode
-const char TICameraParameters::KEY_S3D2D_PREVIEW[] = "s3d2d-preview";
-const char TICameraParameters::KEY_S3D2D_PREVIEW_MODE[] = "s3d2d-preview-values";
-
-//TI extensions for SAC/SMC
-const char TICameraParameters::KEY_AUTOCONVERGENCE[] = "auto-convergence";
-const char TICameraParameters::KEY_AUTOCONVERGENCE_MODE[] = "auto-convergence-mode";
-const char TICameraParameters::KEY_MANUALCONVERGENCE_VALUES[] = "manual-convergence-values";
-
-//TI extensions for setting EXIF tags
-const char TICameraParameters::KEY_EXIF_MODEL[] = "exif-model";
-const char TICameraParameters::KEY_EXIF_MAKE[] = "exif-make";
-
-//TI extensions for additiona GPS data
-const char TICameraParameters::KEY_GPS_MAPDATUM[] = "gps-mapdatum";
-const char TICameraParameters::KEY_GPS_VERSION[] = "gps-version";
-const char TICameraParameters::KEY_GPS_DATESTAMP[] = "gps-datestamp";
-
-//TI extensions for enabling/disabling shutter sound
-const char TICameraParameters::SHUTTER_ENABLE[] = "true";
-const char TICameraParameters::SHUTTER_DISABLE[] = "false";
-
-//TI extensions for Temporal Bracketing
-const char TICameraParameters::BRACKET_ENABLE[] = "enable";
-const char TICameraParameters::BRACKET_DISABLE[] = "disable";
-
-//TI extensions to Image post-processing
-const char TICameraParameters::IPP_LDCNSF[] = "ldc-nsf";
-const char TICameraParameters::IPP_LDC[] = "ldc";
-const char TICameraParameters::IPP_NSF[] = "nsf";
-const char TICameraParameters::IPP_NONE[] = "off";
-
-// TI extensions to standard android pixel formats
-const char TICameraParameters::PIXEL_FORMAT_RAW[] = "raw";
-const char TICameraParameters::PIXEL_FORMAT_JPS[] = "jps";
-const char TICameraParameters::PIXEL_FORMAT_MPO[] = "mpo";
-const char TICameraParameters::PIXEL_FORMAT_RAW_JPEG[] = "raw+jpeg";
-const char TICameraParameters::PIXEL_FORMAT_RAW_MPO[] = "raw+mpo";
-
-// TI extensions to standard android scene mode settings
-const char TICameraParameters::SCENE_MODE_SPORT[] = "sport";
-const char TICameraParameters::SCENE_MODE_CLOSEUP[] = "closeup";
-const char TICameraParameters::SCENE_MODE_AQUA[] = "aqua";
-const char TICameraParameters::SCENE_MODE_SNOWBEACH[] = "snow-beach";
-const char TICameraParameters::SCENE_MODE_MOOD[] = "mood";
-const char TICameraParameters::SCENE_MODE_NIGHT_INDOOR[] = "night-indoor";
-const char TICameraParameters::SCENE_MODE_DOCUMENT[] = "document";
-const char TICameraParameters::SCENE_MODE_BARCODE[] = "barcode";
-const char TICameraParameters::SCENE_MODE_VIDEO_SUPER_NIGHT[] = "super-night";
-const char TICameraParameters::SCENE_MODE_VIDEO_CINE[] = "cine";
-const char TICameraParameters::SCENE_MODE_VIDEO_OLD_FILM[] = "old-film";
-
-// TI extensions to standard android white balance values.
-const char TICameraParameters::WHITE_BALANCE_TUNGSTEN[] = "tungsten";
-const char TICameraParameters::WHITE_BALANCE_HORIZON[] = "horizon";
-const char TICameraParameters::WHITE_BALANCE_SUNSET[] = "sunset";
-const char TICameraParameters::WHITE_BALANCE_FACE[] = "face-priority";
-
-// TI extensions to  standard android focus modes.
-const char TICameraParameters::FOCUS_MODE_PORTRAIT[] = "portrait";
-const char TICameraParameters::FOCUS_MODE_EXTENDED[] = "extended";
-const char TICameraParameters::FOCUS_MODE_FACE[] = "face-priority";
-
-//  TI extensions to add  values for effect settings.
-const char TICameraParameters::EFFECT_NATURAL[] = "natural";
-const char TICameraParameters::EFFECT_VIVID[] = "vivid";
-const char TICameraParameters::EFFECT_COLOR_SWAP[] = "color-swap";
-const char TICameraParameters::EFFECT_BLACKWHITE[] = "blackwhite";
-
-// TI extensions to add exposure preset modes
-const char TICameraParameters::EXPOSURE_MODE_OFF[] = "off";
-const char TICameraParameters::EXPOSURE_MODE_AUTO[] = "auto";
-const char TICameraParameters::EXPOSURE_MODE_NIGHT[] = "night";
-const char TICameraParameters::EXPOSURE_MODE_BACKLIGHT[] = "backlighting";
-const char TICameraParameters::EXPOSURE_MODE_SPOTLIGHT[] = "spotlight";
-const char TICameraParameters::EXPOSURE_MODE_SPORTS[] = "sports";
-const char TICameraParameters::EXPOSURE_MODE_SNOW[] = "snow";
-const char TICameraParameters::EXPOSURE_MODE_BEACH[] = "beach";
-const char TICameraParameters::EXPOSURE_MODE_APERTURE[] = "aperture";
-const char TICameraParameters::EXPOSURE_MODE_SMALL_APERTURE[] = "small-aperture";
-const char TICameraParameters::EXPOSURE_MODE_FACE[] = "face-priority";
-
-// TI extensions to add iso values
-const char TICameraParameters::ISO_MODE_AUTO[] = "auto";
-const char TICameraParameters::ISO_MODE_100[] = "100";
-const char TICameraParameters::ISO_MODE_200[] = "200";
-const char TICameraParameters::ISO_MODE_400[] = "400";
-const char TICameraParameters::ISO_MODE_800[] = "800";
-const char TICameraParameters::ISO_MODE_1000[] = "1000";
-const char TICameraParameters::ISO_MODE_1200[] = "1200";
-const char TICameraParameters::ISO_MODE_1600[] = "1600";
-
-//  TI extensions to add auto convergence values
-const char TICameraParameters::AUTOCONVERGENCE_MODE_DISABLE[] = "mode-disable";
-const char TICameraParameters::AUTOCONVERGENCE_MODE_FRAME[] = "mode-frame";
-const char TICameraParameters::AUTOCONVERGENCE_MODE_CENTER[] = "mode-center";
-const char TICameraParameters::AUTOCONVERGENCE_MODE_FFT[] = "mode-fft";
-const char TICameraParameters::AUTOCONVERGENCE_MODE_MANUAL[] = "mode-manual";
-
-//TI values for camera direction
-const char TICameraParameters::FACING_FRONT[]="front";
-const char TICameraParameters::FACING_BACK[]="back";
-
-//TI extensions to flash settings
-const char TICameraParameters::FLASH_MODE_FILL_IN[] = "fill-in";
-
-//TI extensions to add sensor orientation parameters
-const char TICameraParameters::ORIENTATION_SENSOR_NONE[] = "0";
-const char TICameraParameters::ORIENTATION_SENSOR_90[] = "90";
-const char TICameraParameters::ORIENTATION_SENSOR_180[] = "180";
-const char TICameraParameters::ORIENTATION_SENSOR_270[] = "270";
-};
-
diff --git a/inc/General3A_Settings.h b/inc/General3A_Settings.h
deleted file mode 100644
index dab1f8e..0000000
--- a/inc/General3A_Settings.h
+++ b/dev/null
@@ -1,280 +0,0 @@
-/*
- * Copyright (C) Texas Instruments - http://www.ti.com/
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
-* @file General3A_Settings.h
-*
-* This file maps the Camera Hardware Interface to OMX.
-*
-*/
-
-#include "OMX_TI_IVCommon.h"
-#include "OMX_TI_Common.h"
-#include "OMX_TI_Index.h"
-#include "TICameraParameters.h"
-
-#ifndef GENERAL_3A_SETTINGS_H
-#define GENERAL_3A_SETTINGS_H
-
-#define FOCUS_FACE_PRIORITY OMX_IMAGE_FocusControlMax -1
-#define FOCUS_REGION_PRIORITY OMX_IMAGE_FocusControlMax -2
-#define WB_FACE_PRIORITY OMX_WhiteBalControlMax -1
-#define EXPOSURE_FACE_PRIORITY OMX_ExposureControlMax - 1
-
-namespace android {
-
-struct userToOMX_LUT{
-    const char * userDefinition;
-    int         omxDefinition;
-};
-
-struct LUTtype{
-    int size;
-    const userToOMX_LUT *Table;
-};
-
-const userToOMX_LUT isoUserToOMX[] = {
-    { TICameraParameters::ISO_MODE_AUTO, 0 },
-    { TICameraParameters::ISO_MODE_100, 100 },
-    { TICameraParameters::ISO_MODE_200, 200 },
-    { TICameraParameters::ISO_MODE_400, 400 },
-    { TICameraParameters::ISO_MODE_800, 800 },
-    { TICameraParameters::ISO_MODE_1000, 1000 },
-    { TICameraParameters::ISO_MODE_1200, 1200 },
-    { TICameraParameters::ISO_MODE_1600, 1600 },
-};
-
-const userToOMX_LUT effects_UserToOMX [] = {
-    { CameraParameters::EFFECT_NONE, OMX_ImageFilterNone },
-    { CameraParameters::EFFECT_NEGATIVE, OMX_ImageFilterNegative },
-    { CameraParameters::EFFECT_SOLARIZE,  OMX_ImageFilterSolarize },
-    { CameraParameters::EFFECT_SEPIA, OMX_ImageFilterSepia },
-    { CameraParameters::EFFECT_MONO, OMX_ImageFilterGrayScale },
-    { CameraParameters::EFFECT_BLACKBOARD, OMX_TI_ImageFilterBlackBoard },
-    { CameraParameters::EFFECT_WHITEBOARD, OMX_TI_ImageFilterWhiteBoard },
-    { CameraParameters::EFFECT_AQUA, OMX_TI_ImageFilterAqua },
-    { CameraParameters::EFFECT_POSTERIZE, OMX_TI_ImageFilterPosterize },
-#ifdef OMAP_ENHANCEMENT
-    { TICameraParameters::EFFECT_NATURAL, OMX_ImageFilterNatural },
-    { TICameraParameters::EFFECT_VIVID, OMX_ImageFilterVivid },
-    { TICameraParameters::EFFECT_COLOR_SWAP, OMX_ImageFilterColourSwap   },
-    { TICameraParameters::EFFECT_BLACKWHITE, OMX_TI_ImageFilterBlackWhite }
-#endif
-};
-
-const userToOMX_LUT scene_UserToOMX [] = {
-    { CameraParameters::SCENE_MODE_AUTO, OMX_Manual },
-    { CameraParameters::SCENE_MODE_ACTION, OMX_TI_Action },
-    { CameraParameters::SCENE_MODE_NIGHT, OMX_TI_Night },
-    { CameraParameters::SCENE_MODE_PARTY, OMX_TI_Party },
-    { CameraParameters::SCENE_MODE_SUNSET, OMX_TI_Sunset },
-/*********** TODO: These scene modes are not verified. ************
- ***************** Have to verify and reeable later. **************
-    { CameraParameters::SCENE_MODE_THEATRE, OMX_TI_Theatre },
-    { CameraParameters::SCENE_MODE_LANDSCAPE, OMX_Landscape },
-    { CameraParameters::SCENE_MODE_NIGHT_PORTRAIT, OMX_NightPortrait },
-    { CameraParameters::SCENE_MODE_FIREWORKS, OMX_Fireworks },
-    { CameraParameters::SCENE_MODE_BEACH, OMX_TI_Beach },
-    { CameraParameters::SCENE_MODE_CANDLELIGHT, OMX_TI_Candlelight },
-    { CameraParameters::SCENE_MODE_PORTRAIT, OMX_TI_Portrait },
-    { CameraParameters::SCENE_MODE_SNOW, OMX_TI_Snow },
-    { CameraParameters::SCENE_MODE_STEADYPHOTO, OMX_TI_Steadyphoto },
-*********************************************************************/
-#ifdef OMAP_ENHANCEMENT
-    { TICameraParameters::SCENE_MODE_CLOSEUP, OMX_Closeup },
-    { TICameraParameters::SCENE_MODE_AQUA, OMX_Underwater },
-    { TICameraParameters::SCENE_MODE_SPORT, OMX_Sport },
-    { TICameraParameters::SCENE_MODE_MOOD, OMX_Mood },
-    { TICameraParameters::SCENE_MODE_NIGHT_INDOOR, OMX_NightIndoor },
-    { TICameraParameters::SCENE_MODE_DOCUMENT, OMX_Document },
-    { TICameraParameters::SCENE_MODE_BARCODE, OMX_Barcode },
-    { TICameraParameters::SCENE_MODE_VIDEO_SUPER_NIGHT, OMX_SuperNight },
-    { TICameraParameters::SCENE_MODE_VIDEO_CINE, OMX_Cine },
-    { TICameraParameters::SCENE_MODE_VIDEO_OLD_FILM, OMX_OldFilm },
-#endif
-};
-
-const userToOMX_LUT whiteBal_UserToOMX [] = {
-    { CameraParameters::WHITE_BALANCE_AUTO, OMX_WhiteBalControlAuto },
-    { CameraParameters::WHITE_BALANCE_DAYLIGHT, OMX_WhiteBalControlSunLight },
-    { CameraParameters::WHITE_BALANCE_CLOUDY_DAYLIGHT, OMX_WhiteBalControlCloudy },
-    { CameraParameters::WHITE_BALANCE_FLUORESCENT, OMX_WhiteBalControlFluorescent },
-    { CameraParameters::WHITE_BALANCE_INCANDESCENT, OMX_WhiteBalControlIncandescent },
-/********************** THESE ARE CURRENT NOT TUNED PROPERLY *************************
-    { CameraParameters::WHITE_BALANCE_SHADE, OMX_TI_WhiteBalControlShade },
-    { CameraParameters::WHITE_BALANCE_TWILIGHT, OMX_TI_WhiteBalControlTwilight },
-    { CameraParameters::WHITE_BALANCE_WARM_FLUORESCENT, OMX_TI_WhiteBalControlWarmFluorescent },
-**************************************************************************************/
-#ifdef OMAP_ENHANCEMENT
-    { TICameraParameters::WHITE_BALANCE_TUNGSTEN, OMX_WhiteBalControlTungsten },
-    { TICameraParameters::WHITE_BALANCE_HORIZON, OMX_WhiteBalControlHorizon },
-    { TICameraParameters::WHITE_BALANCE_FACE, WB_FACE_PRIORITY },
-    { TICameraParameters::WHITE_BALANCE_SUNSET, OMX_TI_WhiteBalControlSunset }
-#endif
-};
-
-const userToOMX_LUT antibanding_UserToOMX [] = {
-    { CameraParameters::ANTIBANDING_OFF, OMX_FlickerCancelOff },
-    { CameraParameters::ANTIBANDING_AUTO, OMX_FlickerCancelAuto },
-    { CameraParameters::ANTIBANDING_50HZ, OMX_FlickerCancel50 },
-    { CameraParameters::ANTIBANDING_60HZ, OMX_FlickerCancel60 }
-};
-
-const userToOMX_LUT focus_UserToOMX [] = {
-    { CameraParameters::FOCUS_MODE_AUTO, OMX_IMAGE_FocusControlAutoLock },
-    { CameraParameters::FOCUS_MODE_INFINITY, OMX_IMAGE_FocusControlAutoInfinity },
-    { CameraParameters::FOCUS_MODE_INFINITY, OMX_IMAGE_FocusControlHyperfocal },
-    { CameraParameters::FOCUS_MODE_MACRO, OMX_IMAGE_FocusControlAutoMacro },
-    { CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO, OMX_IMAGE_FocusControlAuto },
-    { CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE, OMX_IMAGE_FocusControlAuto },
-#ifdef OMAP_ENHANCEMENT
-    { TICameraParameters::FOCUS_MODE_FACE , FOCUS_FACE_PRIORITY },
-    { TICameraParameters::FOCUS_MODE_PORTRAIT, OMX_IMAGE_FocusControlPortrait },
-    { TICameraParameters::FOCUS_MODE_EXTENDED, OMX_IMAGE_FocusControlExtended },
-#endif
-};
-
-const userToOMX_LUT exposure_UserToOMX [] = {
-    { TICameraParameters::EXPOSURE_MODE_OFF, OMX_ExposureControlOff },
-    { TICameraParameters::EXPOSURE_MODE_AUTO, OMX_ExposureControlAuto },
-    { TICameraParameters::EXPOSURE_MODE_NIGHT, OMX_ExposureControlNight },
-    { TICameraParameters::EXPOSURE_MODE_BACKLIGHT, OMX_ExposureControlBackLight },
-    { TICameraParameters::EXPOSURE_MODE_SPOTLIGHT, OMX_ExposureControlSpotLight},
-    { TICameraParameters::EXPOSURE_MODE_SPORTS, OMX_ExposureControlSports },
-    { TICameraParameters::EXPOSURE_MODE_SNOW, OMX_ExposureControlSnow },
-    { TICameraParameters::EXPOSURE_MODE_BEACH, OMX_ExposureControlBeach },
-    { TICameraParameters::EXPOSURE_MODE_APERTURE, OMX_ExposureControlLargeAperture },
-    { TICameraParameters::EXPOSURE_MODE_SMALL_APERTURE, OMX_ExposureControlSmallApperture },
-    { TICameraParameters::EXPOSURE_MODE_FACE, EXPOSURE_FACE_PRIORITY },
-};
-
-const userToOMX_LUT flash_UserToOMX [] = {
-    { CameraParameters::FLASH_MODE_OFF           ,OMX_IMAGE_FlashControlOff             },
-    { CameraParameters::FLASH_MODE_ON            ,OMX_IMAGE_FlashControlOn              },
-    { CameraParameters::FLASH_MODE_AUTO          ,OMX_IMAGE_FlashControlAuto            },
-    { CameraParameters::FLASH_MODE_TORCH         ,OMX_IMAGE_FlashControlTorch           },
-    { CameraParameters::FLASH_MODE_RED_EYE        ,OMX_IMAGE_FlashControlRedEyeReduction },
-#ifdef OMAP_ENHANCEMENT
-    { TICameraParameters::FLASH_MODE_FILL_IN        ,OMX_IMAGE_FlashControlFillin          }
-#endif
-};
-
-const LUTtype ExpLUT =
-    {
-    sizeof(exposure_UserToOMX)/sizeof(exposure_UserToOMX[0]),
-    exposure_UserToOMX
-    };
-
-const LUTtype WBalLUT =
-    {
-    sizeof(whiteBal_UserToOMX)/sizeof(whiteBal_UserToOMX[0]),
-    whiteBal_UserToOMX
-    };
-
-const LUTtype FlickerLUT =
-    {
-    sizeof(antibanding_UserToOMX)/sizeof(antibanding_UserToOMX[0]),
-    antibanding_UserToOMX
-    };
-
-const LUTtype SceneLUT =
-    {
-    sizeof(scene_UserToOMX)/sizeof(scene_UserToOMX[0]),
-    scene_UserToOMX
-    };
-
-const LUTtype FlashLUT =
-    {
-    sizeof(flash_UserToOMX)/sizeof(flash_UserToOMX[0]),
-    flash_UserToOMX
-    };
-
-const LUTtype EffLUT =
-    {
-    sizeof(effects_UserToOMX)/sizeof(effects_UserToOMX[0]),
-    effects_UserToOMX
-    };
-
-const LUTtype FocusLUT =
-    {
-    sizeof(focus_UserToOMX)/sizeof(focus_UserToOMX[0]),
-    focus_UserToOMX
-    };
-
-const LUTtype IsoLUT =
-    {
-    sizeof(isoUserToOMX)/sizeof(isoUserToOMX[0]),
-    isoUserToOMX
-    };
-
-/*
-*   class Gen3A_settings
-*   stores the 3A settings
-*   also defines the look up tables
-*   for mapping settings from Hal to OMX
-*/
-class Gen3A_settings{
-    public:
-
-    int Exposure;
-    int WhiteBallance;
-    int Flicker;
-    int SceneMode;
-    int Effect;
-    int Focus;
-    int EVCompensation;
-    int Contrast;
-    int Saturation;
-    int Sharpness;
-    int ISO;
-    int FlashMode;
-
-    unsigned int Brightness;
-    OMX_BOOL ExposureLock;
-    OMX_BOOL FocusLock;
-    OMX_BOOL WhiteBalanceLock;
-};
-
-/*
-*   Flags raised when a setting is changed
-*/
-enum E3ASettingsFlags
-{
-    SetSceneMode            = 1 << 0,
-    SetEVCompensation       = 1 << 1,
-    SetWhiteBallance        = 1 << 2,
-    SetFlicker              = 1 << 3,
-    SetExposure             = 1 << 4,
-    SetSharpness            = 1 << 5,
-    SetBrightness           = 1 << 6,
-    SetContrast             = 1 << 7,
-    SetISO                  = 1 << 8,
-    SetSaturation           = 1 << 9,
-    SetEffect               = 1 << 10,
-    SetFocus                = 1 << 11,
-    SetExpMode              = 1 << 14,
-    SetFlash                = 1 << 15,
-    SetExpLock              = 1 << 16,
-    SetWBLock               = 1 << 17,
-    SetMeteringAreas        = 1 << 18,
-
-    E3aSettingMax,
-    E3AsettingsAll = ( ((E3aSettingMax -1 ) << 1) -1 ) /// all possible flags raised
-};
-
-};
-
-#endif //GENERAL_3A_SETTINGS_H
diff --git a/inc/TICameraParameters.h b/inc/TICameraParameters.h
deleted file mode 100644
index 633e5b6..0000000
--- a/inc/TICameraParameters.h
+++ b/dev/null
@@ -1,242 +0,0 @@
-/*

- * Copyright (C) Texas Instruments - http://www.ti.com/

- *

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- *      http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- */

-

-

-

-

-#ifndef TI_CAMERA_PARAMETERS_H

-#define TI_CAMERA_PARAMETERS_H

-

-#include <utils/KeyedVector.h>

-#include <utils/String8.h>

-

-namespace android {

-

-///TI Specific Camera Parameters

-class TICameraParameters

-{

-public:

-

-// Supported Camera indexes

-// Example value: "0,1,2,3", where 0-primary, 1-secondary1, 2-secondary2, 3-sterocamera

-static const  char KEY_SUPPORTED_CAMERAS[];

-// Select logical Camera index

-static const char KEY_CAMERA[];

-static const char KEY_CAMERA_NAME[];

-static const  char KEY_S3D_SUPPORTED[];

-static const char  KEY_BURST[];

-static const  char KEY_CAP_MODE[];

-static const  char KEY_VNF[];

-static const  char KEY_SATURATION[];

-static const  char KEY_BRIGHTNESS[];

-static const  char KEY_EXPOSURE_MODE[];

-static const  char KEY_SUPPORTED_EXPOSURE[];

-static const  char KEY_CONTRAST[];

-static const  char KEY_SHARPNESS[];

-static const  char KEY_ISO[];

-static const  char KEY_SUPPORTED_ISO_VALUES[];

-static const  char KEY_SUPPORTED_IPP[];

-static const  char KEY_IPP[];

-static const  char KEY_MAN_EXPOSURE[];

-static const  char KEY_METERING_MODE[];

-static const  char KEY_PADDED_WIDTH[];

-static const  char KEY_PADDED_HEIGHT[];

-static const char  KEY_EXP_BRACKETING_RANGE[];

-static const char  KEY_TEMP_BRACKETING[];

-static const char  KEY_TEMP_BRACKETING_RANGE_POS[];

-static const char  KEY_TEMP_BRACKETING_RANGE_NEG[];

-static const char  KEY_SHUTTER_ENABLE[];

-static const char  KEY_MEASUREMENT_ENABLE[];

-static const char  KEY_INITIAL_VALUES[];

-static const char  KEY_GBCE[];

-static const char  KEY_GLBCE[];

-static const char  KEY_MINFRAMERATE[];

-static const char  KEY_MAXFRAMERATE[];

-

-// TI recording hint to notify camera adapters of possible recording

-static const char  KEY_RECORDING_HINT[];

-static const char  KEY_AUTO_FOCUS_LOCK[];

-static const char  KEY_CURRENT_ISO[];

-

-static const char KEY_SENSOR_ORIENTATION[];

-static const char KEY_SENSOR_ORIENTATION_VALUES[];

-

-//TI extensions for zoom

-static const char ZOOM_SUPPORTED[];

-static const char ZOOM_UNSUPPORTED[];

-

-//TI extensions for camera capabilies

-static const char INITIAL_VALUES_TRUE[];

-static const char INITIAL_VALUES_FALSE[];

-

-//TI extensions for enabling/disabling measurements

-static const char MEASUREMENT_ENABLE[];

-static const char MEASUREMENT_DISABLE[];

-

-//  TI extensions to add values for ManualConvergence and AutoConvergence mode

-static const char KEY_AUTOCONVERGENCE[];

-static const char KEY_AUTOCONVERGENCE_MODE[];

-static const char KEY_MANUALCONVERGENCE_VALUES[];

-

-//TI extensions for enabling/disabling GLBCE

-static const char GLBCE_ENABLE[];

-static const char GLBCE_DISABLE[];

-

-//TI extensions for enabling/disabling GBCE

-static const char GBCE_ENABLE[];

-static const char GBCE_DISABLE[];

-

-// TI extensions to add Min frame rate Values

-static const char VIDEO_MINFRAMERATE_5[];

-static const char VIDEO_MINFRAMERATE_10[];

-static const char VIDEO_MINFRAMERATE_15[];

-static const char VIDEO_MINFRAMERATE_20[];

-static const char VIDEO_MINFRAMERATE_24[];

-static const char VIDEO_MINFRAMERATE_25[];

-static const char VIDEO_MINFRAMERATE_30[];

-static const char VIDEO_MINFRAMERATE_33[];

-

-//  TI extensions for Manual Gain and Manual Exposure

-static const char KEY_MANUAL_EXPOSURE_LEFT[];

-static const char KEY_MANUAL_EXPOSURE_RIGHT[];

-static const char KEY_MANUAL_EXPOSURE_MODES[];

-static const char KEY_MANUAL_GAIN_EV_RIGHT[];

-static const char KEY_MANUAL_GAIN_EV_LEFT[];

-static const char KEY_MANUAL_GAIN_ISO_RIGHT[];

-static const char KEY_MANUAL_GAIN_ISO_LEFT[];

-static const char KEY_MANUAL_GAIN_MODES[];

-

-//TI extensions for setting EXIF tags

-static const char KEY_EXIF_MODEL[];

-static const char KEY_EXIF_MAKE[];

-

-//TI extensions for additional GPS data

-static const char  KEY_GPS_MAPDATUM[];

-static const char  KEY_GPS_VERSION[];

-static const char  KEY_GPS_DATESTAMP[];

-

-//TI extensions for enabling/disabling shutter sound

-static const char SHUTTER_ENABLE[];

-static const char SHUTTER_DISABLE[];

-

-//TI extensions for Temporal bracketing

-static const char BRACKET_ENABLE[];

-static const char BRACKET_DISABLE[];

-

-//TI extensions to Image post-processing

-static const char IPP_LDCNSF[];

-static const char IPP_LDC[];

-static const char IPP_NSF[];

-static const char IPP_NONE[];

-

-//TI extensions to camera mode

-static const char HIGH_PERFORMANCE_MODE[];

-static const char HIGH_QUALITY_MODE[];

-static const char HIGH_QUALITY_ZSL_MODE[];

-static const char VIDEO_MODE[];

-

-

-// TI extensions to standard android pixel formats

-static const char PIXEL_FORMAT_RAW[];

-static const char PIXEL_FORMAT_JPS[];

-static const char PIXEL_FORMAT_MPO[];

-static const char PIXEL_FORMAT_RAW_JPEG[];

-static const char PIXEL_FORMAT_RAW_MPO[];

-

-// TI extensions to standard android scene mode settings

-static const  char SCENE_MODE_SPORT[];

-static const  char SCENE_MODE_CLOSEUP[];

-static const  char SCENE_MODE_AQUA[];

-static const  char SCENE_MODE_SNOWBEACH[];

-static const  char SCENE_MODE_MOOD[];

-static const  char SCENE_MODE_NIGHT_INDOOR[];

-static const  char SCENE_MODE_DOCUMENT[];

-static const  char SCENE_MODE_BARCODE[];

-static const  char SCENE_MODE_VIDEO_SUPER_NIGHT[];

-static const  char SCENE_MODE_VIDEO_CINE[];

-static const  char SCENE_MODE_VIDEO_OLD_FILM[];

-

-// TI extensions to standard android white balance settings.

-static const  char WHITE_BALANCE_TUNGSTEN[];

-static const  char WHITE_BALANCE_HORIZON[];

-static const  char WHITE_BALANCE_SUNSET[];

-static const  char WHITE_BALANCE_FACE[];

-

-// TI extensions to add exposure preset modes to android api

-static const  char EXPOSURE_MODE_OFF[];

-static const  char EXPOSURE_MODE_AUTO[];

-static const  char EXPOSURE_MODE_NIGHT[];

-static const  char EXPOSURE_MODE_BACKLIGHT[];

-static const  char EXPOSURE_MODE_SPOTLIGHT[];

-static const  char EXPOSURE_MODE_SPORTS[];

-static const  char EXPOSURE_MODE_SNOW[];

-static const  char EXPOSURE_MODE_BEACH[];

-static const  char EXPOSURE_MODE_APERTURE[];

-static const  char EXPOSURE_MODE_SMALL_APERTURE[];

-static const  char EXPOSURE_MODE_FACE[];

-

-// TI extensions to standard android focus presets.

-static const  char FOCUS_MODE_PORTRAIT[];

-static const  char FOCUS_MODE_EXTENDED[];

-static const char  FOCUS_MODE_FACE[];

-

-// TI extensions to add iso values

-static const char ISO_MODE_AUTO[];

-static const char ISO_MODE_100[];

-static const char ISO_MODE_200[];

-static const char ISO_MODE_400[];

-static const char ISO_MODE_800[];

-static const char ISO_MODE_1000[];

-static const char ISO_MODE_1200[];

-static const char ISO_MODE_1600[];

-

-//  TI extensions to add  values for effect settings.

-static const char EFFECT_NATURAL[];

-static const char EFFECT_VIVID[];

-static const char EFFECT_COLOR_SWAP[];

-static const char EFFECT_BLACKWHITE[];

-

-static const char KEY_S3D2D_PREVIEW[];

-static const char KEY_S3D2D_PREVIEW_MODE[];

-

-//  TI extensions to add values for AutoConvergence settings.

-static const char AUTOCONVERGENCE_MODE_DISABLE[];

-static const char AUTOCONVERGENCE_MODE_FRAME[];

-static const char AUTOCONVERGENCE_MODE_CENTER[];

-static const char AUTOCONVERGENCE_MODE_FFT[];

-static const char AUTOCONVERGENCE_MODE_MANUAL[];

-

-

-//TI extensions for flash mode settings

-static const char FLASH_MODE_FILL_IN[];

-

-//TI extensions to add sensor orientation parameters

-static const char ORIENTATION_SENSOR_NONE[];

-static const char ORIENTATION_SENSOR_90[];

-static const char ORIENTATION_SENSOR_180[];

-static const char ORIENTATION_SENSOR_270[];

-

-

-//TI values for camera direction

-static const char FACING_FRONT[];

-static const char FACING_BACK[];

-

-};

-

-};

-

-#endif

-