Commit 93ccb21c authored by Dave Stevenson's avatar Dave Stevenson Committed by Phil Elwell
Browse files

staging: bcm2835-camera: Add greyworld AWB mode 



This is mainly used for the NoIR camera which has no IR
filter and can completely confuse normal AWB presets.

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
parent 510ea22f

drivers/staging/vc04_services/bcm2835-camera/controls.c

+6 −2
Original line number Diff line number Diff line
@@ -481,6 +481,10 @@ static int ctrl_set_awb_mode(struct bm2835_mmal_dev *dev, 
	case V4L2_WHITE_BALANCE_SHADE:

		u32_value = MMAL_PARAM_AWBMODE_SHADE;

		break;



	case V4L2_WHITE_BALANCE_GREYWORLD:

		u32_value = MMAL_PARAM_AWBMODE_GREYWORLD;

		break;

	}



	return vchiq_mmal_port_parameter_set(dev->instance, control,
@@ -1008,8 +1012,8 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = { 
	{

		V4L2_CID_AUTO_N_PRESET_WHITE_BALANCE,

		MMAL_CONTROL_TYPE_STD_MENU,

		~0x3ff, V4L2_WHITE_BALANCE_SHADE, V4L2_WHITE_BALANCE_AUTO, 0,

		NULL,

		~0x7ff, V4L2_WHITE_BALANCE_GREYWORLD, V4L2_WHITE_BALANCE_AUTO,

		0, NULL,

		MMAL_PARAMETER_AWB_MODE,

		&ctrl_set_awb_mode,

		false

drivers/staging/vc04_services/vchiq-mmal/mmal-parameters.h

+1 −0
Original line number Diff line number Diff line
@@ -313,6 +313,7 @@ enum mmal_parameter_awbmode { 
	MMAL_PARAM_AWBMODE_INCANDESCENT,

	MMAL_PARAM_AWBMODE_FLASH,

	MMAL_PARAM_AWBMODE_HORIZON,

	MMAL_PARAM_AWBMODE_GREYWORLD,

};



enum mmal_parameter_imagefx {