alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feature/support_to_reconfig_isp_awb_after_enable' into 'master'

Browse Source 
feat(isp_awb): support to change config after initialized

See merge request espressif/esp-idf!31522
This commit is contained in:
Kevin (Lao Kaiyao) 2024-06-17 12:23:07 +08:00
commit a4bbdd3b16
2 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/esp_driver_isp/include/driver/isp_awb.h
View File

@ -49,8 +49,8 @@ typedef struct {
* so that all the distorted pixels will be counted for the reference of white balance. * so that all the distorted pixels will be counted for the reference of white balance.
*/ */
} white_patch; /*!< white patch configuration */ } white_patch; /*!< white patch configuration */
int intr_priority; /*!< The interrupt priority, range 0~7, if set to 0, the driver will try to allocate an interrupt with int intr_priority; /*!< The interrupt priority, range 0~3, if set to 0, the driver will try to allocate an interrupt with
* a relative low priority (1,2,3) otherwise the larger the higher, 7 is NMI. * a relative low priority (1,2,3)
*/ */
} esp_isp_awb_config_t; } esp_isp_awb_config_t;
@ -82,6 +82,19 @@ esp_err_t esp_isp_new_awb_controller(isp_proc_handle_t isp_proc, const esp_isp_a
*/ */
esp_err_t esp_isp_del_awb_controller(isp_awb_ctlr_t awb_ctlr); esp_err_t esp_isp_del_awb_controller(isp_awb_ctlr_t awb_ctlr);
/**
* @brief Reconfigure the ISP AWB controller
* @note This function is allowed to be called no matter the awb controller is enabled or not.
*
* @param[in] awb_ctlr AWB controller handle
* @param[in] awb_cfg Pointer to AWB config. Refer to ``esp_isp_awb_config_t``
*
* @return
* - ESP_OK On success
* - ESP_ERR_INVALID_ARG If the combination of arguments is invalid
*/
esp_err_t esp_isp_awb_controller_reconfig(isp_awb_ctlr_t awb_ctlr, const esp_isp_awb_config_t *awb_cfg);
/** /**
* @brief Enable an ISP AWB controller * @brief Enable an ISP AWB controller
* *

48
components/esp_driver_isp/src/isp_awb.c
View File

@ -18,6 +18,7 @@ typedef struct isp_awb_controller_t {
isp_fsm_t fsm; isp_fsm_t fsm;
portMUX_TYPE spinlock; portMUX_TYPE spinlock;
intr_handle_t intr_handle; intr_handle_t intr_handle;
int intr_priority;
isp_proc_handle_t isp_proc; isp_proc_handle_t isp_proc;
QueueHandle_t evt_que; QueueHandle_t evt_que;
SemaphoreHandle_t stat_lock; SemaphoreHandle_t stat_lock;
@ -72,6 +73,25 @@ static void s_isp_awb_free_controller(isp_awb_ctlr_t awb_ctlr)
} }
} }
static esp_err_t s_esp_isp_awb_config_hardware(isp_proc_handle_t isp_proc, const esp_isp_awb_config_t *awb_cfg)
{
isp_ll_awb_set_sample_point(isp_proc->hal.hw, awb_cfg->sample_point);
ESP_RETURN_ON_FALSE(isp_hal_awb_set_window_range(&isp_proc->hal, &awb_cfg->window),
ESP_ERR_INVALID_ARG, TAG, "invalid window");
isp_u32_range_t lum_range = awb_cfg->white_patch.luminance;
ESP_RETURN_ON_FALSE(isp_hal_awb_set_luminance_range(&isp_proc->hal, lum_range.min, lum_range.max),
ESP_ERR_INVALID_ARG, TAG, "invalid luminance range");
isp_float_range_t rg_range = awb_cfg->white_patch.red_green_ratio;
ESP_RETURN_ON_FALSE(rg_range.min < rg_range.max && rg_range.min >= 0 &&
isp_hal_awb_set_rg_ratio_range(&isp_proc->hal, rg_range.min, rg_range.max),
ESP_ERR_INVALID_ARG, TAG, "invalid range of Red Green ratio");
isp_float_range_t bg_range = awb_cfg->white_patch.blue_green_ratio;
ESP_RETURN_ON_FALSE(bg_range.min < bg_range.max && bg_range.min >= 0 &&
isp_hal_awb_set_bg_ratio_range(&isp_proc->hal, bg_range.min, bg_range.max),
ESP_ERR_INVALID_ARG, TAG, "invalid range of Blue to Green ratio");
return ESP_OK;
}
esp_err_t esp_isp_new_awb_controller(isp_proc_handle_t isp_proc, const esp_isp_awb_config_t *awb_cfg, isp_awb_ctlr_t *ret_hdl) esp_err_t esp_isp_new_awb_controller(isp_proc_handle_t isp_proc, const esp_isp_awb_config_t *awb_cfg, isp_awb_ctlr_t *ret_hdl)
{ {
esp_err_t ret = ESP_FAIL; esp_err_t ret = ESP_FAIL;
@ -91,27 +111,14 @@ esp_err_t esp_isp_new_awb_controller(isp_proc_handle_t isp_proc, const esp_isp_a
ESP_GOTO_ON_ERROR(s_isp_claim_awb_controller(isp_proc, awb_ctlr), err1, TAG, "no available controller"); ESP_GOTO_ON_ERROR(s_isp_claim_awb_controller(isp_proc, awb_ctlr), err1, TAG, "no available controller");
// Register the AWB ISR // Register the AWB ISR
uint32_t intr_st_reg_addr = isp_ll_get_intr_status_reg_addr(isp_proc->hal.hw); uint32_t intr_st_reg_addr = isp_ll_get_intr_status_reg_addr(isp_proc->hal.hw);
int intr_priority = awb_cfg->intr_priority > 0 && awb_cfg->intr_priority <= 7 ? BIT(awb_cfg->intr_priority) : ESP_INTR_FLAG_LOWMED; awb_ctlr->intr_priority = awb_cfg->intr_priority > 0 && awb_cfg->intr_priority <= 3 ? BIT(awb_cfg->intr_priority) : ESP_INTR_FLAG_LOWMED;
ESP_GOTO_ON_ERROR(esp_intr_alloc_intrstatus(isp_hw_info.instances[isp_proc->proc_id].irq, ISP_INTR_ALLOC_FLAGS | intr_priority, intr_st_reg_addr, ISP_LL_EVENT_AWB_MASK, ESP_GOTO_ON_ERROR(esp_intr_alloc_intrstatus(isp_hw_info.instances[isp_proc->proc_id].irq, ISP_INTR_ALLOC_FLAGS | awb_ctlr->intr_priority, intr_st_reg_addr, ISP_LL_EVENT_AWB_MASK,
s_isp_awb_default_isr, awb_ctlr, &awb_ctlr->intr_handle), err2, TAG, "allocate interrupt failed"); s_isp_awb_default_isr, awb_ctlr, &awb_ctlr->intr_handle), err2, TAG, "allocate interrupt failed");
// Configure the hardware // Configure the hardware
isp_ll_awb_enable(isp_proc->hal.hw, false); isp_ll_awb_enable(isp_proc->hal.hw, false);
isp_ll_awb_set_sample_point(isp_proc->hal.hw, awb_cfg->sample_point);
isp_ll_awb_enable_algorithm_mode(isp_proc->hal.hw, true); isp_ll_awb_enable_algorithm_mode(isp_proc->hal.hw, true);
ESP_GOTO_ON_FALSE(isp_hal_awb_set_window_range(&isp_proc->hal, &awb_cfg->window), ESP_GOTO_ON_ERROR(s_esp_isp_awb_config_hardware(isp_proc, awb_cfg), err2, TAG, "configure awb hardware failed");
ESP_ERR_INVALID_ARG, err2, TAG, "invalid window");
isp_u32_range_t lum_range = awb_cfg->white_patch.luminance;
ESP_GOTO_ON_FALSE(isp_hal_awb_set_luminance_range(&isp_proc->hal, lum_range.min, lum_range.max),
ESP_ERR_INVALID_ARG, err2, TAG, "invalid luminance range");
isp_float_range_t rg_range = awb_cfg->white_patch.red_green_ratio;
ESP_GOTO_ON_FALSE(rg_range.min < rg_range.max && rg_range.min >= 0 &&
isp_hal_awb_set_rg_ratio_range(&isp_proc->hal, rg_range.min, rg_range.max),
ESP_ERR_INVALID_ARG, err2, TAG, "invalid range of Red Green ratio");
isp_float_range_t bg_range = awb_cfg->white_patch.blue_green_ratio;
ESP_GOTO_ON_FALSE(bg_range.min < bg_range.max && bg_range.min >= 0 &&
isp_hal_awb_set_bg_ratio_range(&isp_proc->hal, bg_range.min, bg_range.max),
ESP_ERR_INVALID_ARG, err2, TAG, "invalid range of Blue to Green ratio");
*ret_hdl = awb_ctlr; *ret_hdl = awb_ctlr;
@ -138,6 +145,15 @@ esp_err_t esp_isp_del_awb_controller(isp_awb_ctlr_t awb_ctlr)
return ESP_OK; return ESP_OK;
} }
esp_err_t esp_isp_awb_controller_reconfig(isp_awb_ctlr_t awb_ctlr, const esp_isp_awb_config_t *awb_cfg)
{
ESP_RETURN_ON_FALSE(awb_ctlr && awb_cfg, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");
int intr_priority = awb_cfg->intr_priority > 0 && awb_cfg->intr_priority <= 3 ? BIT(awb_cfg->intr_priority) : ESP_INTR_FLAG_LOWMED;
ESP_RETURN_ON_FALSE(intr_priority == awb_ctlr->intr_priority, ESP_ERR_INVALID_ARG, TAG, "can't change interrupt priority after initialized");
return s_esp_isp_awb_config_hardware(awb_ctlr->isp_proc, awb_cfg);
}
esp_err_t esp_isp_awb_controller_enable(isp_awb_ctlr_t awb_ctlr) esp_err_t esp_isp_awb_controller_enable(isp_awb_ctlr_t awb_ctlr)
{ {
ESP_RETURN_ON_FALSE(awb_ctlr && awb_ctlr->isp_proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer"); ESP_RETURN_ON_FALSE(awb_ctlr && awb_ctlr->isp_proc, ESP_ERR_INVALID_ARG, TAG, "invalid argument: null pointer");