Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add greyworld mode to AWB options #90

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/RaspiCamControl.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ static XREF_T awb_map[] =
{"fluorescent", MMAL_PARAM_AWBMODE_FLUORESCENT},
{"incandescent", MMAL_PARAM_AWBMODE_INCANDESCENT},
{"flash", MMAL_PARAM_AWBMODE_FLASH},
{"horizon", MMAL_PARAM_AWBMODE_HORIZON}
{"horizon", MMAL_PARAM_AWBMODE_HORIZON},
{"greyworld", MMAL_PARAM_AWBMODE_GREYWORLD}
};

static const int awb_map_size = sizeof(awb_map) / sizeof(awb_map[0]);
Expand Down Expand Up @@ -1110,6 +1111,7 @@ int raspicamcontrol_set_exposure_mode(MMAL_COMPONENT_T *camera, MMAL_PARAM_EXPOS
* - MMAL_PARAM_AWBMODE_INCANDESCENT,
* - MMAL_PARAM_AWBMODE_FLASH,
* - MMAL_PARAM_AWBMODE_HORIZON,
* - MMAL_PARAM_AWBMODE_GREYWORLD,
* @return 0 if successful, non-zero if any parameters out of range
*/
int raspicamcontrol_set_awb_mode(MMAL_COMPONENT_T *camera, MMAL_PARAM_AWBMODE_T awb_mode)
Expand Down
1 change: 1 addition & 0 deletions src/RaspiCamControl.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
MMAL_PARAM_AWBMODE_INCANDESCENT,
MMAL_PARAM_AWBMODE_FLASH,
MMAL_PARAM_AWBMODE_HORIZON,
MMAL_PARAM_AWBMODE_GREYWORLD,
*
* Image FX
MMAL_PARAM_IMAGEFX_NONE,
Expand Down
3 changes: 2 additions & 1 deletion src/gstrpicam_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ typedef enum {
GST_RPI_CAM_SRC_AWB_MODE_FLUORESCENT = MMAL_PARAM_AWBMODE_FLUORESCENT,
GST_RPI_CAM_SRC_AWB_MODE_INCANDESCENT = MMAL_PARAM_AWBMODE_INCANDESCENT,
GST_RPI_CAM_SRC_AWB_MODE_FLASH = MMAL_PARAM_AWBMODE_FLASH,
GST_RPI_CAM_SRC_AWB_MODE_HORIZON = MMAL_PARAM_AWBMODE_HORIZON
GST_RPI_CAM_SRC_AWB_MODE_HORIZON = MMAL_PARAM_AWBMODE_HORIZON,
GST_RPI_CAM_SRC_AWB_MODE_GREYWORLD = MMAL_PARAM_AWBMODE_GREYWORLD
} GstRpiCamSrcAWBMode;

typedef enum {
Expand Down