Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 670e1c7b authored by Priya Komarlingam's avatar Priya Komarlingam Committed by Ricardo Cerqueira
Browse files

frameworks/base: compilation changes 

camera changes and audio changes for compilation

Change-Id: Ic1ed590eed00e2c7093e6b2f9dc5188b6aee4926
parent baa07847

include/camera/CameraParameters.h

+41 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ public: 
    // The height (in pixels) of EXIF thumbnail in Jpeg picture.

    // Example value: "384". Read/write.

    static const char KEY_JPEG_THUMBNAIL_HEIGHT[];

    static const char KEY_SUPPORTED_THUMBNAIL_SIZES[];

    // Supported EXIF thumbnail sizes (width x height). 0x0 means not thumbnail

    // in EXIF.

    // Example value: "512x384,320x240,0x0". Read only.
@@ -173,6 +174,31 @@ public: 
    // header.

    // Example value: "21.0" or "-5". Write only.

    static const char KEY_GPS_ALTITUDE[];

    static const char KEY_GPS_LATITUDE_REF[];

    static const char KEY_GPS_LONGITUDE_REF[];

    static const char KEY_GPS_ALTITUDE_REF[];

    static const char KEY_GPS_STATUS[];

    static const char KEY_EXIF_DATETIME[];



    static const char KEY_AUTO_EXPOSURE[];

    static const char KEY_SUPPORTED_AUTO_EXPOSURE[];

    static const char KEY_ISO_MODE[];

    static const char KEY_SUPPORTED_ISO_MODES[];

    static const char KEY_LENSSHADE[] ;

    static const char KEY_SUPPORTED_LENSSHADE_MODES[] ;

    static const char KEY_SHARPNESS[];

    static const char KEY_MAX_SHARPNESS[];

    static const char KEY_CONTRAST[];

    static const char KEY_MAX_CONTRAST[];

    static const char KEY_SATURATION[];

    static const char KEY_MAX_SATURATION[];



    // Values for auto exposure settings.

    static const char AUTO_EXPOSURE_FRAME_AVG[];

    static const char AUTO_EXPOSURE_CENTER_WEIGHTED[];

    static const char AUTO_EXPOSURE_SPOT_METERING[];





    // GPS timestamp (UTC in seconds since January 1, 1970). This should be

    // stored in JPEG EXIF header.

    // Example value: "1251192757". Write only.
@@ -371,6 +397,8 @@ public: 
    static const char PIXEL_FORMAT_YUV422I[]; // YUY2

    static const char PIXEL_FORMAT_RGB565[];

    static const char PIXEL_FORMAT_JPEG[];

    static const char PIXEL_FORMAT_RAW[];





    // Values for focus mode settings.

    // Auto-focus mode. Applications should call
@@ -379,6 +407,7 @@ public: 
    // Focus is set at infinity. Applications should not call

    // CameraHardwareInterface.autoFocus in this mode.

    static const char FOCUS_MODE_INFINITY[];

    static const char FOCUS_MODE_NORMAL[];

    // Macro (close-up) focus mode. Applications should call

    // CameraHardwareInterface.autoFocus to start the focus in this mode.

    static const char FOCUS_MODE_MACRO[];
@@ -404,6 +433,18 @@ public: 
    static const char CAF_OFF[] ;

    static const char CAF_ON[] ;



    static const char ISO_AUTO[];

    static const char ISO_HJR[] ;

    static const char ISO_100[];

    static const char ISO_200[] ;

    static const char ISO_400[];

    static const char ISO_800[];

    static const char ISO_1600[];

    // Values for Lens Shading

    static const char LENSSHADE_ENABLE[] ;

    static const char LENSSHADE_DISABLE[] ;





private:

    DefaultKeyedVector<String8,String8>    mMap;

};

include/media/AudioRecord.h

+3 −3
Original line number Diff line number Diff line
@@ -142,9 +142,9 @@ public: 
     */



     enum record_flags {

         RECORD_AGC_ENABLE = AudioSystem::AGC_ENABLE,

         RECORD_NS_ENABLE  = AudioSystem::NS_ENABLE,

         RECORD_IIR_ENABLE = AudioSystem::TX_IIR_ENABLE

         RECORD_AGC_ENABLE = 0x0001, //AudioSystem::AGC_ENABLE,

         RECORD_NS_ENABLE  = 0x0002, //AudioSystem::NS_ENABLE,

         RECORD_IIR_ENABLE = 0x0004, //AudioSystem::TX_IIR_ENABLE

     };



                        AudioRecord(int inputSource,

libs/camera/CameraParameters.cpp

+43 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ const char CameraParameters::PIXEL_FORMAT_YUV420SP[] = "yuv420sp"; 
const char CameraParameters::PIXEL_FORMAT_YUV422I[] = "yuv422i-yuyv";

const char CameraParameters::PIXEL_FORMAT_RGB565[] = "rgb565";

const char CameraParameters::PIXEL_FORMAT_JPEG[] = "jpeg";

const char CameraParameters::PIXEL_FORMAT_RAW[] = "raw";



// Values for focus mode settings.

const char CameraParameters::FOCUS_MODE_AUTO[] = "auto";
@@ -144,8 +145,50 @@ const char CameraParameters::FOCUS_MODE_INFINITY[] = "infinity"; 
const char CameraParameters::FOCUS_MODE_MACRO[] = "macro";

const char CameraParameters::FOCUS_MODE_FIXED[] = "fixed";

const char CameraParameters::FOCUS_MODE_EDOF[] = "edof";

const char CameraParameters::FOCUS_MODE_NORMAL[] = "normal";

const char CameraParameters::FOCUS_MODE_CONTINUOUS_VIDEO[] = "continuous-video";



const char CameraParameters::KEY_SUPPORTED_THUMBNAIL_SIZES[] = "jpeg-thumbnail-size-values";

const char CameraParameters::KEY_GPS_LATITUDE_REF[] = "gps-latitude-ref";

const char CameraParameters::KEY_GPS_LONGITUDE_REF[] = "gps-longitude-ref";

const char CameraParameters::KEY_GPS_ALTITUDE_REF[] = "gps-altitude-ref";

const char CameraParameters::KEY_GPS_STATUS[] = "gps-status";



const char CameraParameters::KEY_EXIF_DATETIME[] = "exif-datetime";

const char CameraParameters::KEY_AUTO_EXPOSURE[] = "auto-exposure";

const char CameraParameters::KEY_SUPPORTED_AUTO_EXPOSURE[] = "auto-exposure-values";



const char CameraParameters::KEY_ISO_MODE[] = "iso";

const char CameraParameters::KEY_SUPPORTED_ISO_MODES[] = "iso-values";

const char CameraParameters::KEY_LENSSHADE[] = "lensshade";

const char CameraParameters::KEY_SUPPORTED_LENSSHADE_MODES[] = "lensshade-values";

const char CameraParameters::KEY_SHARPNESS[] = "sharpness";

const char CameraParameters::KEY_MAX_SHARPNESS[] = "max-sharpness";

const char CameraParameters::KEY_CONTRAST[] = "contrast";

const char CameraParameters::KEY_MAX_CONTRAST[] = "max-contrast";

const char CameraParameters::KEY_SATURATION[] = "saturation";

const char CameraParameters::KEY_MAX_SATURATION[] = "max-saturation";





// Values for auto exposure settings.

const char CameraParameters::AUTO_EXPOSURE_FRAME_AVG[] = "frame-average";

const char CameraParameters::AUTO_EXPOSURE_CENTER_WEIGHTED[] = "center-weighted";

const char CameraParameters::AUTO_EXPOSURE_SPOT_METERING[] = "spot-metering";



 // Values for ISO Settings

const char CameraParameters::ISO_AUTO[] = "auto";

const char CameraParameters::ISO_HJR[] = "ISO_HJR";

const char CameraParameters::ISO_100[] = "ISO100";

const char CameraParameters::ISO_200[] = "ISO200";

const char CameraParameters::ISO_400[] = "ISO400";

const char CameraParameters::ISO_800[] = "ISO800";

const char CameraParameters::ISO_1600[] = "ISO1600";



 //Values for Lens Shading

const char CameraParameters::LENSSHADE_ENABLE[] = "enable";

const char CameraParameters::LENSSHADE_DISABLE[] = "disable";





//Values for Continuous AF

const char CameraParameters::CAF_OFF[] = "caf-off";

const char CameraParameters::CAF_ON[] = "caf-on";