espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2026-06-11 11:42:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

change(isp): change isp_af_window_t to isp_window_t

Browse Source
This commit is contained in:
Armando
2024-06-04 14:58:51 +08:00
parent 9a1f67f222
commit ba79a66502
6 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_isp/include/driver/isp_af.h
+1 -1
View File
@@ -19,7 +19,7 @@ extern "C" {
* @brief AF controller config
*/
typedef struct {
isp_af_window_t window[ISP_AF_WINDOW_NUM]; ///< The sampling windows of AF
isp_window_t window[ISP_AF_WINDOW_NUM]; ///< The sampling windows of AF
int edge_thresh; ///< Edge threshold, definition higher than this value will be counted as a valid pixel for calculating AF result
int intr_priority; ///< The interrupt priority, range 0~7, 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
} esp_isp_af_config_t;
components/esp_driver_isp/src/isp_af.c
+10 -10
View File
@@ -88,17 +88,17 @@ esp_err_t esp_isp_new_af_controller(isp_proc_handle_t isp_proc, const esp_isp_af
ESP_RETURN_ON_FALSE(demosaic_en && rgb2yuv_en, ESP_ERR_INVALID_STATE, TAG, "RGB2YUV not enabled, please update the output_data_color_type");
for (int i = 0; i < SOC_ISP_AF_WINDOW_NUMS; i++) {
ESP_LOGV(TAG, "af_config->window[%d].top_left_x: %"PRId32, i, af_config->window[i].top_left_x);
ESP_LOGV(TAG, "af_config->window[%d].bottom_right_x: %"PRId32, i, af_config->window[i].bottom_right_x);
ESP_LOGV(TAG, "af_config->window[%d].bottom_right_y: %"PRId32, i, af_config->window[i].bottom_right_y);
ESP_LOGV(TAG, "af_config->window[%d].top_left_y: %"PRId32, i, af_config->window[i].top_left_y);
ESP_LOGV(TAG, "af_config->window[%d].top_left.x: %"PRId32, i, af_config->window[i].top_left.x);
ESP_LOGV(TAG, "af_config->window[%d].btm_right.x: %"PRId32, i, af_config->window[i].btm_right.x);
ESP_LOGV(TAG, "af_config->window[%d].btm_right.y: %"PRId32, i, af_config->window[i].btm_right.y);
ESP_LOGV(TAG, "af_config->window[%d].top_left.y: %"PRId32, i, af_config->window[i].top_left.y);
ESP_RETURN_ON_FALSE(((af_config->window[i].top_left_x < ISP_LL_AF_WINDOW_MAX_RANGE) &&
(af_config->window[i].bottom_right_x >= af_config->window[i].top_left_x) &&
(af_config->window[i].bottom_right_x < ISP_LL_AF_WINDOW_MAX_RANGE) &&
(af_config->window[i].top_left_y < ISP_LL_AF_WINDOW_MAX_RANGE) &&
(af_config->window[i].bottom_right_y >= af_config->window[i].top_left_y) &&
(af_config->window[i].bottom_right_y < ISP_LL_AF_WINDOW_MAX_RANGE)), ESP_ERR_INVALID_ARG, TAG, "invalid window");
ESP_RETURN_ON_FALSE(((af_config->window[i].top_left.x < ISP_LL_AF_WINDOW_MAX_RANGE) &&
(af_config->window[i].btm_right.x >= af_config->window[i].top_left.x) &&
(af_config->window[i].btm_right.x < ISP_LL_AF_WINDOW_MAX_RANGE) &&
(af_config->window[i].top_left.y < ISP_LL_AF_WINDOW_MAX_RANGE) &&
(af_config->window[i].btm_right.y >= af_config->window[i].top_left.y) &&
(af_config->window[i].btm_right.y < ISP_LL_AF_WINDOW_MAX_RANGE)), ESP_ERR_INVALID_ARG, TAG, "invalid window");
}
ESP_RETURN_ON_FALSE(af_config->edge_thresh > 0, ESP_ERR_INVALID_ARG, TAG, "edge threshold should be larger than 0");