Skip to content

Commit

Permalink
bring back qcom legacy camera parameters
Browse files Browse the repository at this point in the history 
Set COMMON_GLOBAL_CFLAGS += -DQCOM_LEGACY_CAM_PARAMS
in BoardConfig.mk to enable.
  • Loading branch information
@KonstaT
KonstaT committed Apr 2, 2014
1 parent ee137d2 commit dd11cda
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 0 deletions.
47 changes: 47 additions & 0 deletions camera/CameraParameters.cpp
View file
Expand Up @@ -40,6 +40,31 @@ const char CameraParameters::KEY_PREVIEW_FRAME_RATE_MODE[] = "preview-frame-rate
const char CameraParameters::KEY_SUPPORTED_PREVIEW_FRAME_RATE_MODES[] = "preview-frame-rate-modes";
const char CameraParameters::KEY_PREVIEW_FRAME_RATE_AUTO_MODE[] = "frame-rate-auto";
const char CameraParameters::KEY_PREVIEW_FRAME_RATE_FIXED_MODE[] = "frame-rate-fixed";
#ifdef QCOM_LEGACY_CAM_PARAMS
const char CameraParameters::CAF_OFF[] = "caf-off";
const char CameraParameters::CAF_ON[] = "caf-on";
const char CameraParameters::CAPTURE_MODE_NORMAL[] = "normal";
const char CameraParameters::CAPTURE_MODE_BURST[] = "burst";
const char CameraParameters::CAPTURE_MODE_CONTI_BURST[] = "contiburst";
const char CameraParameters::CAPTURE_MODE_HDR[] = "hdr";
const char CameraParameters::CAPTURE_MODE_HJR[] = "hjr";
const char CameraParameters::CAPTURE_MODE_PANORAMA[] = "panorama";
const char CameraParameters::CONTINUOUS_AF_OFF[] = "caf-off";
const char CameraParameters::CONTINUOUS_AF_ON[] = "caf-on";
const char CameraParameters::FOCUS_MODE_CONTINUOUS_CAMERA[] = "continuous-camera";
const char CameraParameters::KEY_CONTINUOUS_AF[] = "continuous-af";
const char CameraParameters::KEY_CAF[] = "continuous-af";
const char CameraParameters::KEY_CAPTURE_MODE[] = "capture-mode";
const char CameraParameters::KEY_PICTURE_COUNT[] = "picture-count";
const char CameraParameters::KEY_MAX_BURST_PICTURE_COUNT[] = "max-burst-picture-count";
const char CameraParameters::KEY_SUPPORTED_CONTINUOUS_AF[] = "continuous-af-mode";
const char CameraParameters::KEY_SUPPORTED_CAF[] = "continuous-af-values";
const char CameraParameters::KEY_SUPPORTED_CAPTURE_MODES[] = "capture-mode-values";
const char CameraParameters::KEY_TAKING_PICTURE_ZOOM[] = "taking-picture-zoom";
const char CameraParameters::KEY_PANORAMA_MODE[] = "panorama-mode";
const char CameraParameters::PANORAMA_MODE_NOT_INPROGRESS[] = "not-in-progress";
const char CameraParameters::PANORAMA_MODE_INPROGRESS[] = "in-progress";
#endif
#endif
const char CameraParameters::KEY_PICTURE_SIZE[] = "picture-size";
const char CameraParameters::KEY_SUPPORTED_PICTURE_SIZES[] = "picture-size-values";
Expand Down Expand Up @@ -428,11 +453,26 @@ 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";
Expand Down Expand Up @@ -761,6 +801,13 @@ 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);
Expand Down
37 changes: 37 additions & 0 deletions include/camera/CameraParameters.h
View file
Expand Up @@ -182,6 +182,31 @@ class CameraParameters
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 CAF_OFF[];
static const char CAF_ON[];
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[];
static const char CONTINUOUS_AF_OFF[];
static const char CONTINUOUS_AF_ON[];
static const char FOCUS_MODE_CONTINUOUS_CAMERA[];
static const char KEY_CONTINUOUS_AF[];
static const char KEY_CAF[];
static const char KEY_CAPTURE_MODE[];
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 KEY_SUPPORTED_CAPTURE_MODES[];
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
#endif
// The dimensions for captured pictures in pixels (width x height).
// Example value: "1024x768". Read/write.
Expand Down Expand Up @@ -970,10 +995,19 @@ class CameraParameters

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[] ;
Expand Down Expand Up @@ -1066,6 +1100,9 @@ class CameraParameters
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

Expand Down

5 comments on commit dd11cda

@galaxyfreak
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't mind, but why you prefer
COMMON_GLOBAL_CFLAGS += -DQCOM_LEGACY_CAM_PARAMS
over
BOARD_USES_QCOM_LEGACY_CAM_PARAMS := true
they do same thing but any specific reason?

@KonstaT
Copy link
Member Author

@KonstaT KonstaT commented on dd11cda Apr 4, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No specific reason, just following how all the other camera parameters are set.

@galaxyfreak
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also needed

0f4d10e#diff-e21ab572623e6703810808957ab74d31L785

E/HAL ( 113): dlopen failed: cannot locate symbol "_ZN7android16CameraParameters15setPostviewSizeEii" referenced by "camera.vendor.msm7x27a.so"...

@KonstaT
Copy link
Member Author

@KonstaT KonstaT commented on dd11cda Jun 7, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Already here.
dd11cda#diff-e21ab572623e6703810808957ab74d31R804

@galaxyfreak
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops I missed it

Please sign in to comment.