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

Commit 0f4d10e7 authored by Ethan Chen's avatar Ethan Chen
Browse files

camera: Remove deprecated HTC camera support code 

* Squash of the following:

Revert "Add camera parameters for htc evo 3D. (1/2)"

This reverts commit 8ffd5b96.

Revert "Camera: QCOM legacy definitions,HTC cam switch,NO_UPDATE_PREVIEW"

This reverts commit c62d1579.

Change-Id: Icb90ef229b4019705136eafd75dbf017ed82f58c
parent e6800880

camera/Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ endif 
ifeq ($(BOARD_USES_QCOM_HARDWARE),true)

	LOCAL_CFLAGS += -DQCOM_HARDWARE

endif

ifeq ($(BOARD_USES_QCOM_LEGACY_CAM_PARAMS),true)

	LOCAL_CFLAGS += -DQCOM_LEGACY_CAM_PARAMS

endif



LOCAL_MODULE:= libcamera_client

camera/CameraParameters.cpp

+0 −34
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ const char CameraParameters::PANORAMA_MODE_INPROGRESS[] = "in-progress"; 
const char CameraParameters::KEY_PICTURE_SIZE[] = "picture-size";

const char CameraParameters::KEY_SUPPORTED_PICTURE_SIZES[] = "picture-size-values";

const char CameraParameters::KEY_PICTURE_FORMAT[] = "picture-format";

const char CameraParameters::KEY_SUPPORTED_3D_FILE_FORMAT[] = "3d-file-format";

const char CameraParameters::KEY_SUPPORTED_PICTURE_FORMATS[] = "picture-format-values";

const char CameraParameters::KEY_JPEG_THUMBNAIL_WIDTH[] = "jpeg-thumbnail-width";

const char CameraParameters::KEY_JPEG_THUMBNAIL_HEIGHT[] = "jpeg-thumbnail-height";
@@ -385,9 +384,6 @@ const char CameraParameters::FOCUS_MODE_CONTINUOUS_PICTURE[] = "continuous-pictu 
const char CameraParameters::FOCUS_MODE_MANUAL_POSITION[] = "manual";

#endif

#if defined(QCOM_HARDWARE)

#ifdef QCOM_LEGACY_CAM_PARAMS

const char CameraParameters::FOCUS_MODE_CONTINUOUS_CAMERA[] = "continuous-camera";

#endif

const char CameraParameters::FOCUS_MODE_NORMAL[] = "normal";
@@ -431,26 +427,11 @@ const char CameraParameters::SKIN_TONE_ENHANCEMENT_ENABLE[] = "enable"; 
const char CameraParameters::SKIN_TONE_ENHANCEMENT_DISABLE[] = "disable";



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

#ifdef QCOM_LEGACY_CAM_PARAMS

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

const char CameraParameters::KEY_MIN_SHARPNESS[] = "sharpness-min";

#else

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

#endif

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

#ifdef QCOM_LEGACY_CAM_PARAMS

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

const char CameraParameters::KEY_MIN_CONTRAST[] = "contrast-min";

#else

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

#endif

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

#ifdef QCOM_LEGACY_CAM_PARAMS

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

const char CameraParameters::KEY_MIN_SATURATION[] = "saturation-min";

#else

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

#endif



//Values for DENOISE

const char CameraParameters::DENOISE_OFF[] = "denoise-off";
@@ -465,9 +446,6 @@ const char CameraParameters::SELECTABLE_ZONE_AF_FRAME_AVERAGE[] = "frame-average 
const char CameraParameters::FACE_DETECTION_OFF[] = "off";

const char CameraParameters::FACE_DETECTION_ON[] = "on";



const char CameraParameters::FILE_FORMAT_MPO[] = "mpo";

const char CameraParameters::FILE_FORMAT_JPS[] = "jps";



// Values for MCE settings.

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

const char CameraParameters::MCE_DISABLE[] = "disable";
@@ -782,13 +760,6 @@ void CameraParameters::getSupportedPreviewSizes(Vector<Size> &sizes) const 
}



#ifdef QCOM_HARDWARE

#ifdef QCOM_LEGACY_CAM_PARAMS

void CameraParameters::setPostviewSize(int width, int height)

{

    // dummy

}

#endif



void CameraParameters::getSupportedHfrSizes(Vector<Size> &sizes) const

{

    const char *hfrSizesStr = get(KEY_SUPPORTED_HFR_SIZES);
@@ -886,11 +857,6 @@ void CameraParameters::getSupportedPictureSizes(Vector<Size> &sizes) const 
    parseSizesList(pictureSizesStr, sizes);

}



void CameraParameters::set3DFileFormat(const char *format)

{

    set(KEY_SUPPORTED_3D_FILE_FORMAT, format);

}



void CameraParameters::setPictureFormat(const char *format)

{

    set(KEY_PICTURE_FORMAT, format);

include/camera/CameraParameters.h

+0 −49
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ public: 
    void setPictureSize(int width, int height);

    void getPictureSize(int *width, int *height) const;

    void getSupportedPictureSizes(Vector<Size> &sizes) const;

    void set3DFileFormat(const char* buffer);

    void setPictureFormat(const char *format);

    const char *getPictureFormat() const;

#ifdef QCOM_HARDWARE
@@ -183,20 +182,6 @@ public: 
    static const char KEY_SUPPORTED_PREVIEW_FRAME_RATE_MODES[];

    static const char KEY_PREVIEW_FRAME_RATE_AUTO_MODE[];

    static const char KEY_PREVIEW_FRAME_RATE_FIXED_MODE[];

#ifdef QCOM_LEGACY_CAM_PARAMS

    static const char KEY_CAPTURE_MODE[];

    static const char KEY_SUPPORTED_CAPTURE_MODES[];

    static const char KEY_PICTURE_COUNT[];

    static const char KEY_MAX_BURST_PICTURE_COUNT[];

    static const char KEY_SUPPORTED_CONTINUOUS_AF[];

    static const char KEY_SUPPORTED_CAF[];

    static const char CAPTURE_MODE_NORMAL[];

    static const char CAPTURE_MODE_BURST[];

    static const char CAPTURE_MODE_CONTI_BURST[];

    static const char CAPTURE_MODE_HDR[];

    static const char CAPTURE_MODE_HJR[];

    static const char CAPTURE_MODE_PANORAMA[];

#endif

#endif

    // The dimensions for captured pictures in pixels (width x height).

    // Example value: "1024x768". Read/write.
@@ -204,8 +189,6 @@ public: 
    // Supported dimensions for captured pictures in pixels.

    // Example value: "2048x1536,1024x768". Read only.

    static const char KEY_SUPPORTED_PICTURE_SIZES[];

    //HTC 3D color format

    static const char KEY_SUPPORTED_3D_FILE_FORMAT[];

    // The image format for captured pictures. See CAMERA_MSG_COMPRESSED_IMAGE

    // in frameworks/base/include/camera/Camera.h.

    // Example value: "jpeg" or PIXEL_FORMAT_XXX constants. Read/write.
@@ -937,22 +920,6 @@ public: 
    static const char LIGHTFX_HDR[];



#ifdef QCOM_HARDWARE

#ifdef QCOM_LEGACY_CAM_PARAMS

    static const char FOCUS_MODE_CONTINUOUS_CAMERA[];



    // Values for Continuous AF

    static const char CAF_OFF[] ;

    static const char CAF_ON[] ;

    // Proprietaries from CodeAurora use these...

    static const char CONTINUOUS_AF_OFF[] ;

    static const char CONTINUOUS_AF_ON[] ;

    static const char KEY_CONTINUOUS_AF[] ;

    static const char KEY_CAF[] ;

    static const char KEY_TAKING_PICTURE_ZOOM[];

    static const char KEY_PANORAMA_MODE[];

    static const char PANORAMA_MODE_NOT_INPROGRESS[];

    static const char PANORAMA_MODE_INPROGRESS[];

#endif

    // Normal focus mode. Applications should call

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

    static const char FOCUS_MODE_NORMAL[];
@@ -976,19 +943,10 @@ public: 


    static const char KEY_SHARPNESS[];

    static const char KEY_MAX_SHARPNESS[];

#ifdef QCOM_LEGACY_CAM_PARAMS

    static const char KEY_MIN_SHARPNESS[];

#endif

    static const char KEY_CONTRAST[];

    static const char KEY_MAX_CONTRAST[];

#ifdef QCOM_LEGACY_CAM_PARAMS

    static const char KEY_MIN_CONTRAST[];

#endif

    static const char KEY_SATURATION[];

    static const char KEY_MAX_SATURATION[];

#ifdef QCOM_LEGACY_CAM_PARAMS

    static const char KEY_MIN_SATURATION[];

#endif



    static const char KEY_HISTOGRAM[] ;

    static const char KEY_SUPPORTED_HISTOGRAM_MODES[] ;
@@ -1014,10 +972,6 @@ public: 
    static const char FACE_DETECTION_OFF[];

    static const char FACE_DETECTION_ON[];



    // Values for HTC 3D image settings.

    static const char FILE_FORMAT_MPO[];

    static const char FILE_FORMAT_JPS[];



    // Values for MCE settings.

    static const char MCE_ENABLE[];

    static const char MCE_DISABLE[];
@@ -1085,9 +1039,6 @@ public: 
    int getOrientation() const;

    void setOrientation(int orientation);

    void setPreviewFpsRange(int minFPS,int maxFPS);

#ifdef QCOM_LEGACY_CAM_PARAMS

    void setPostviewSize(int x, int y);

#endif

    void getSupportedHfrSizes(Vector<Size> &sizes) const;

#endif

media/libstagefright/Android.mk

+0 −4
Original line number Diff line number Diff line
@@ -3,10 +3,6 @@ include $(CLEAR_VARS) 


include frameworks/av/media/libstagefright/codecs/common/Config.mk



ifeq ($(BOARD_HTC_3D_SUPPORT),true)

   LOCAL_CFLAGS += -DHTC_3D_SUPPORT

endif



LOCAL_SRC_FILES:=                         \

        ACodec.cpp                        \

        AACExtractor.cpp                  \

media/libstagefright/CameraSource.cpp

+0 −4
Original line number Diff line number Diff line
@@ -356,13 +356,11 @@ status_t CameraSource::configureCamera( 
        ALOGV("Supported frame rates: %s", supportedFrameRates);

        char buf[4];

        snprintf(buf, 4, "%d", frameRate);

#ifndef HTC_3D_SUPPORT  // HTC uses invalid frame rates intentionally on the 3D camera

        if (strstr(supportedFrameRates, buf) == NULL) {

            ALOGE("Requested frame rate (%d) is not supported: %s",

                frameRate, supportedFrameRates);

            return BAD_VALUE;

        }

#endif



        // The frame rate is supported, set the camera to the requested value.

        params->setPreviewFrameRate(frameRate);
@@ -460,13 +458,11 @@ status_t CameraSource::checkFrameRate( 


    // Check the actual video frame rate against the target/requested

    // video frame rate.

#ifndef HTC_3D_SUPPORT  // HTC uses invalid frame rates intentionally on the 3D camera

    if (frameRate != -1 && (frameRateActual - frameRate) != 0) {

        ALOGE("Failed to set preview frame rate to %d fps. The actual "

                "frame rate is %d", frameRate, frameRateActual);

        return UNKNOWN_ERROR;

    }

#endif



    // Good now.

    mVideoFrameRate = frameRateActual;