Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ppa_blend_yuv_hang_v6.0' into 'release/v6.0'

Browse Source 
fix(ppa): fix hang if blend operation on a YUV format input background image (v6.0)

See merge request espressif/esp-idf!49735
This commit is contained in:
morris
2026-06-29 10:17:45 +08:00
parent 6dc0cc8de2 0075f2b724
commit 383369eeb3
5 changed files with 377 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_driver_ppa/src/ppa_blend.c
+2
View File
@@ -152,6 +152,8 @@ bool ppa_blend_transaction_on_picked(uint32_t num_chans, const dma2d_trans_chann
ppa_ll_blend_set_tx_yuv_range(platform->hal.dev, blend_trans_desc->out.yuv_range); ppa_ll_blend_set_tx_yuv_range(platform->hal.dev, blend_trans_desc->out.yuv_range);
ppa_ll_blend_set_tx_rgb2yuv_std(platform->hal.dev, blend_trans_desc->out.yuv_std); ppa_ll_blend_set_tx_rgb2yuv_std(platform->hal.dev, blend_trans_desc->out.yuv_std);
} }
// For YUV420/YUV422 background input and output, blend_tx_size.blend_hb/vb must be set to make the Blending engine and 2D-DMA work properly
ppa_ll_blend_set_block_size(platform->hal.dev, blend_trans_desc->in_bg.block_w, blend_trans_desc->in_bg.block_h); // in_bg.block_w == in_fg.block_w && in_bg.block_h == in_fg.block_h
// Color keying // Color keying
color_pixel_rgb888_data_t rgb888_min = {.b = 0x00, .g = 0x00, .r = 0x00}; color_pixel_rgb888_data_t rgb888_min = {.b = 0x00, .g = 0x00, .r = 0x00};
components/esp_driver_ppa/src/ppa_fill.c
+2 -1
View File
@@ -74,8 +74,9 @@ bool ppa_fill_transaction_on_picked(uint32_t num_chans, const dma2d_trans_channe
dma2d_start(dma2d_rx_chan); dma2d_start(dma2d_rx_chan);
// Configure PPA Blending engine // Configure PPA Blending engine
ppa_ll_blend_configure_filling_block(platform->hal.dev, fill_trans_desc->out.fill_cm, (void *)&fill_trans_desc->fill_color_val, fill_trans_desc->fill_block_w, fill_trans_desc->fill_block_h); ppa_ll_blend_configure_filling_block_color(platform->hal.dev, fill_trans_desc->out.fill_cm, (void *)&fill_trans_desc->fill_color_val);
ppa_ll_blend_set_tx_color_mode(platform->hal.dev, fill_trans_desc->out.fill_cm); ppa_ll_blend_set_tx_color_mode(platform->hal.dev, fill_trans_desc->out.fill_cm);
ppa_ll_blend_set_block_size(platform->hal.dev, fill_trans_desc->fill_block_w, fill_trans_desc->fill_block_h);
ppa_ll_blend_start(platform->hal.dev, PPA_LL_BLEND_TRANS_MODE_FILL); ppa_ll_blend_start(platform->hal.dev, PPA_LL_BLEND_TRANS_MODE_FILL);
components/esp_driver_ppa/test_apps/main/CMakeLists.txt
+1 -1
View File
@@ -1,5 +1,5 @@
set(srcs "test_app_main.c" set(srcs "test_app_main.c"
"test_ppa.c") "test_ppa.cpp")
# In order for the cases defined by `TEST_CASE` to be linked into the final elf, # In order for the cases defined by `TEST_CASE` to be linked into the final elf,
# the component can be registered as WHOLE_ARCHIVE # the component can be registered as WHOLE_ARCHIVE
components/esp_driver_ppa/test_apps/main/test_ppa.c → components/esp_driver_ppa/test_apps/main/test_ppa.cpp
+358 -335
View File
@@ -32,9 +32,9 @@ TEST_CASE("ppa_client_do_ppa_operation", "[PPA]")
uint32_t buf_1_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth(buf_1_color_type_id) / 8, 64); uint32_t buf_1_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth(buf_1_color_type_id) / 8, 64);
uint32_t buf_2_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth(buf_2_color_type_id) / 8, 64); uint32_t buf_2_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth(buf_2_color_type_id) / 8, 64);
uint8_t *buf_1 = heap_caps_aligned_calloc(4, buf_1_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); // cache alignment is implicited by MALLOC_CAP_DMA uint8_t *buf_1 = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, buf_1_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA)); // cache alignment is implicited by MALLOC_CAP_DMA
TEST_ASSERT_NOT_NULL(buf_1); TEST_ASSERT_NOT_NULL(buf_1);
uint8_t *buf_2 = heap_caps_aligned_calloc(4, buf_2_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); uint8_t *buf_2 = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, buf_2_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(buf_2); TEST_ASSERT_NOT_NULL(buf_2);
// Register different types of PPA clients // Register different types of PPA clients
@@ -42,9 +42,8 @@ TEST_CASE("ppa_client_do_ppa_operation", "[PPA]")
ppa_client_handle_t ppa_client_blend_handle; ppa_client_handle_t ppa_client_blend_handle;
ppa_client_handle_t ppa_client_fill_handle_a; ppa_client_handle_t ppa_client_fill_handle_a;
ppa_client_handle_t ppa_client_fill_handle_b; ppa_client_handle_t ppa_client_fill_handle_b;
ppa_client_config_t ppa_client_config = { ppa_client_config_t ppa_client_config = {};
.oper_type = PPA_OPERATION_SRM, ppa_client_config.oper_type = PPA_OPERATION_SRM;
};
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_srm_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_srm_handle));
ppa_client_config.oper_type = PPA_OPERATION_BLEND; ppa_client_config.oper_type = PPA_OPERATION_BLEND;
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_blend_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_blend_handle));
@@ -52,30 +51,26 @@ TEST_CASE("ppa_client_do_ppa_operation", "[PPA]")
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_fill_handle_a)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_fill_handle_a));
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_fill_handle_b)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_fill_handle_b));
ppa_srm_oper_config_t srm_oper_config = { ppa_srm_oper_config_t srm_oper_config = {};
.in.buffer = buf_1, srm_oper_config.in.buffer = buf_1;
.in.pic_w = w, srm_oper_config.in.pic_w = w;
.in.pic_h = h, srm_oper_config.in.pic_h = h;
.in.block_w = w, srm_oper_config.in.block_w = w;
.in.block_h = h, srm_oper_config.in.block_h = h;
.in.block_offset_x = 0, srm_oper_config.in.block_offset_x = 0;
.in.block_offset_y = 0, srm_oper_config.in.block_offset_y = 0;
.in.srm_cm = buf_1_color_type_id, srm_oper_config.in.srm_cm = static_cast<ppa_srm_color_mode_t>(buf_1_color_type_id);
srm_oper_config.out.buffer = buf_2;
.out.buffer = buf_2, srm_oper_config.out.buffer_size = buf_2_size;
.out.buffer_size = buf_2_size, srm_oper_config.out.pic_w = w;
.out.pic_w = w, srm_oper_config.out.pic_h = h;
.out.pic_h = h, srm_oper_config.out.block_offset_x = 0;
.out.block_offset_x = 0, srm_oper_config.out.block_offset_y = 0;
.out.block_offset_y = 0, srm_oper_config.out.srm_cm = static_cast<ppa_srm_color_mode_t>(buf_2_color_type_id);
.out.srm_cm = buf_2_color_type_id, srm_oper_config.rotation_angle = PPA_SRM_ROTATION_ANGLE_0;
srm_oper_config.scale_x = 1.0;
.rotation_angle = PPA_SRM_ROTATION_ANGLE_0, srm_oper_config.scale_y = 1.0;
.scale_x = 1.0, srm_oper_config.mode = PPA_TRANS_MODE_BLOCKING;
.scale_y = 1.0,
.mode = PPA_TRANS_MODE_BLOCKING,
};
// A SRM client can request to do a SRM operation // A SRM client can request to do a SRM operation
if (!esp_efuse_is_flash_encryption_enabled()) { if (!esp_efuse_is_flash_encryption_enabled()) {
TEST_ESP_OK(ppa_do_scale_rotate_mirror(ppa_client_srm_handle, &srm_oper_config)); TEST_ESP_OK(ppa_do_scale_rotate_mirror(ppa_client_srm_handle, &srm_oper_config));
@@ -83,57 +78,48 @@ TEST_CASE("ppa_client_do_ppa_operation", "[PPA]")
// A non-SRM client can not request to do a SRM operation // A non-SRM client can not request to do a SRM operation
TEST_ESP_ERR(ESP_ERR_INVALID_ARG, ppa_do_scale_rotate_mirror(ppa_client_blend_handle, &srm_oper_config)); TEST_ESP_ERR(ESP_ERR_INVALID_ARG, ppa_do_scale_rotate_mirror(ppa_client_blend_handle, &srm_oper_config));
ppa_blend_oper_config_t blend_oper_config = { ppa_blend_oper_config_t blend_oper_config = {};
.in_bg.buffer = buf_1, blend_oper_config.in_bg.buffer = buf_1;
.in_bg.pic_w = w, blend_oper_config.in_bg.pic_w = w;
.in_bg.pic_h = h, blend_oper_config.in_bg.pic_h = h;
.in_bg.block_w = w, blend_oper_config.in_bg.block_w = w;
.in_bg.block_h = h, blend_oper_config.in_bg.block_h = h;
.in_bg.block_offset_x = 0, blend_oper_config.in_bg.block_offset_x = 0;
.in_bg.block_offset_y = 0, blend_oper_config.in_bg.block_offset_y = 0;
.in_bg.blend_cm = buf_1_color_type_id, blend_oper_config.in_bg.blend_cm = static_cast<ppa_blend_color_mode_t>(buf_1_color_type_id);
blend_oper_config.in_fg.buffer = buf_2;
.in_fg.buffer = buf_2, blend_oper_config.in_fg.pic_w = w;
.in_fg.pic_w = w, blend_oper_config.in_fg.pic_h = h;
.in_fg.pic_h = h, blend_oper_config.in_fg.block_w = w;
.in_fg.block_w = w, blend_oper_config.in_fg.block_h = h;
.in_fg.block_h = h, blend_oper_config.in_fg.block_offset_x = 0;
.in_fg.block_offset_x = 0, blend_oper_config.in_fg.block_offset_y = 0;
.in_fg.block_offset_y = 0, blend_oper_config.in_fg.blend_cm = static_cast<ppa_blend_color_mode_t>(buf_2_color_type_id);
.in_fg.blend_cm = buf_2_color_type_id, blend_oper_config.out.buffer = buf_1;
blend_oper_config.out.buffer_size = buf_1_size;
.out.buffer = buf_1, blend_oper_config.out.pic_w = w;
.out.buffer_size = buf_1_size, blend_oper_config.out.pic_h = h;
.out.pic_w = w, blend_oper_config.out.block_offset_x = 0;
.out.pic_h = h, blend_oper_config.out.block_offset_y = 0;
.out.block_offset_x = 0, blend_oper_config.out.blend_cm = static_cast<ppa_blend_color_mode_t>(buf_1_color_type_id);
.out.block_offset_y = 0, blend_oper_config.mode = PPA_TRANS_MODE_BLOCKING;
.out.blend_cm = buf_1_color_type_id,
.mode = PPA_TRANS_MODE_BLOCKING,
};
// A blend client can request to do a blend operation // A blend client can request to do a blend operation
TEST_ESP_OK(ppa_do_blend(ppa_client_blend_handle, &blend_oper_config)); TEST_ESP_OK(ppa_do_blend(ppa_client_blend_handle, &blend_oper_config));
// A non-blend client can not request to do a blend operation // A non-blend client can not request to do a blend operation
TEST_ESP_ERR(ESP_ERR_INVALID_ARG, ppa_do_blend(ppa_client_fill_handle_b, &blend_oper_config)); TEST_ESP_ERR(ESP_ERR_INVALID_ARG, ppa_do_blend(ppa_client_fill_handle_b, &blend_oper_config));
ppa_fill_oper_config_t fill_oper_config = { ppa_fill_oper_config_t fill_oper_config = {};
.out.buffer = buf_1, fill_oper_config.out.buffer = buf_1;
.out.buffer_size = buf_1_size, fill_oper_config.out.buffer_size = buf_1_size;
.out.pic_w = w, fill_oper_config.out.pic_w = w;
.out.pic_h = h, fill_oper_config.out.pic_h = h;
.out.block_offset_x = 0, fill_oper_config.out.block_offset_x = 0;
.out.block_offset_y = 0, fill_oper_config.out.block_offset_y = 0;
.out.fill_cm = buf_1_color_type_id, fill_oper_config.out.fill_cm = static_cast<ppa_fill_color_mode_t>(buf_1_color_type_id);
fill_oper_config.fill_block_w = w;
.fill_block_w = w, fill_oper_config.fill_block_h = h;
.fill_block_h = h, fill_oper_config.fill_argb_color.val = 0xFF00FF00;
.fill_argb_color = { fill_oper_config.mode = PPA_TRANS_MODE_NON_BLOCKING;
.val = 0xFF00FF00,
},
.mode = PPA_TRANS_MODE_NON_BLOCKING,
};
// A fill client can request to do a fill operation // A fill client can request to do a fill operation
TEST_ESP_OK(ppa_do_fill(ppa_client_fill_handle_a, &fill_oper_config)); TEST_ESP_OK(ppa_do_fill(ppa_client_fill_handle_a, &fill_oper_config));
// Another fill client can also request another fill operation at the same time // Another fill client can also request another fill operation at the same time
@@ -175,53 +161,47 @@ TEST_CASE("ppa_pending_transactions_in_queue", "[PPA]")
uint32_t buf_1_size = w * h * color_hal_pixel_format_fourcc_get_bit_depth(buf_1_color_type_id) / 8; uint32_t buf_1_size = w * h * color_hal_pixel_format_fourcc_get_bit_depth(buf_1_color_type_id) / 8;
uint32_t buf_2_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth(buf_2_color_type_id) / 8, 64); uint32_t buf_2_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth(buf_2_color_type_id) / 8, 64);
uint8_t *buf_1 = heap_caps_aligned_calloc(4, buf_1_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); uint8_t *buf_1 = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, buf_1_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(buf_1); TEST_ASSERT_NOT_NULL(buf_1);
uint8_t *buf_2 = heap_caps_aligned_calloc(4, buf_2_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); uint8_t *buf_2 = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, buf_2_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(buf_2); TEST_ASSERT_NOT_NULL(buf_2);
// Register two PPA SRM clients with different max_pending_trans_num // Register two PPA SRM clients with different max_pending_trans_num
ppa_client_handle_t ppa_client_a_handle; ppa_client_handle_t ppa_client_a_handle;
ppa_client_handle_t ppa_client_b_handle; ppa_client_handle_t ppa_client_b_handle;
ppa_client_config_t ppa_client_config = { ppa_client_config_t ppa_client_config = {};
.oper_type = PPA_OPERATION_SRM, ppa_client_config.oper_type = PPA_OPERATION_SRM;
};
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_a_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_a_handle));
ppa_client_config.max_pending_trans_num = 3; ppa_client_config.max_pending_trans_num = 3;
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_b_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_b_handle));
ppa_event_callbacks_t cbs = { ppa_event_callbacks_t cbs = {};
.on_trans_done = ppa_trans_done_cb, cbs.on_trans_done = ppa_trans_done_cb;
};
ppa_client_register_event_callbacks(ppa_client_a_handle, &cbs); ppa_client_register_event_callbacks(ppa_client_a_handle, &cbs);
SemaphoreHandle_t sem = xSemaphoreCreateBinary(); SemaphoreHandle_t sem = xSemaphoreCreateBinary();
ppa_srm_oper_config_t oper_config = { ppa_srm_oper_config_t oper_config = {};
.in.buffer = buf_1, oper_config.in.buffer = buf_1;
.in.pic_w = w, oper_config.in.pic_w = w;
.in.pic_h = h, oper_config.in.pic_h = h;
.in.block_w = w, oper_config.in.block_w = w;
.in.block_h = h, oper_config.in.block_h = h;
.in.block_offset_x = 0, oper_config.in.block_offset_x = 0;
.in.block_offset_y = 0, oper_config.in.block_offset_y = 0;
.in.srm_cm = buf_1_color_type_id, oper_config.in.srm_cm = static_cast<ppa_srm_color_mode_t>(buf_1_color_type_id);
oper_config.out.buffer = buf_2;
.out.buffer = buf_2, oper_config.out.buffer_size = buf_2_size;
.out.buffer_size = buf_2_size, oper_config.out.pic_w = w;
.out.pic_w = w, oper_config.out.pic_h = h;
.out.pic_h = h, oper_config.out.block_offset_x = 0;
.out.block_offset_x = 0, oper_config.out.block_offset_y = 0;
.out.block_offset_y = 0, oper_config.out.srm_cm = static_cast<ppa_srm_color_mode_t>(buf_2_color_type_id);
.out.srm_cm = buf_2_color_type_id, oper_config.rotation_angle = PPA_SRM_ROTATION_ANGLE_0;
oper_config.scale_x = 1.0;
.rotation_angle = PPA_SRM_ROTATION_ANGLE_0, oper_config.scale_y = 1.0;
.scale_x = 1.0, oper_config.user_data = (void *)sem;
.scale_y = 1.0, oper_config.mode = PPA_TRANS_MODE_NON_BLOCKING;
.user_data = (void *)sem,
.mode = PPA_TRANS_MODE_NON_BLOCKING,
};
TEST_ESP_OK(ppa_do_scale_rotate_mirror(ppa_client_a_handle, &oper_config)); TEST_ESP_OK(ppa_do_scale_rotate_mirror(ppa_client_a_handle, &oper_config));
// Another transaction cannot be accept since client_a can only hold one transaction // Another transaction cannot be accept since client_a can only hold one transaction
@@ -275,7 +255,7 @@ TEST_CASE("ppa_srm_basic_data_correctness_check", "[PPA]")
const uint32_t buf_len = w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)cm) / 8; // 32 const uint32_t buf_len = w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)cm) / 8; // 32
uint32_t out_buf_size = ALIGN_UP(buf_len, 64); uint32_t out_buf_size = ALIGN_UP(buf_len, 64);
uint8_t *out_buf = heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT | MALLOC_CAP_DMA); // located in internal RAM so even w/ flash encrypted, it won't be affected uint8_t *out_buf = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT | MALLOC_CAP_DMA)); // located in internal RAM so even w/ flash encrypted, it won't be affected
TEST_ASSERT_NOT_NULL(out_buf); TEST_ASSERT_NOT_NULL(out_buf);
esp_cache_msync((void *)out_buf, out_buf_size, ESP_CACHE_MSYNC_FLAG_DIR_C2M); esp_cache_msync((void *)out_buf, out_buf_size, ESP_CACHE_MSYNC_FLAG_DIR_C2M);
const uint16_t in_buf[16] = { const uint16_t in_buf[16] = {
@@ -297,39 +277,33 @@ TEST_CASE("ppa_srm_basic_data_correctness_check", "[PPA]")
}; };
ppa_client_handle_t ppa_client_handle; ppa_client_handle_t ppa_client_handle;
ppa_client_config_t ppa_client_config = { ppa_client_config_t ppa_client_config = {};
.oper_type = PPA_OPERATION_SRM, ppa_client_config.oper_type = PPA_OPERATION_SRM;
.max_pending_trans_num = 1, ppa_client_config.max_pending_trans_num = 1;
};
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle));
ppa_srm_oper_config_t oper_config = { ppa_srm_oper_config_t oper_config = {};
.in.buffer = in_buf, oper_config.in.buffer = in_buf;
.in.pic_w = w, oper_config.in.pic_w = w;
.in.pic_h = h, oper_config.in.pic_h = h;
.in.block_w = block_w, oper_config.in.block_w = block_w;
.in.block_h = block_h, oper_config.in.block_h = block_h;
.in.block_offset_x = in_block_offset_x, oper_config.in.block_offset_x = in_block_offset_x;
.in.block_offset_y = in_block_offset_y, oper_config.in.block_offset_y = in_block_offset_y;
.in.srm_cm = cm, oper_config.in.srm_cm = cm;
oper_config.out.buffer = out_buf;
.out.buffer = out_buf, oper_config.out.buffer_size = out_buf_size;
.out.buffer_size = out_buf_size, oper_config.out.pic_w = w;
.out.pic_w = w, oper_config.out.pic_h = h;
.out.pic_h = h, oper_config.out.block_offset_x = out_block_offset_x;
.out.block_offset_x = out_block_offset_x, oper_config.out.block_offset_y = out_block_offset_y;
.out.block_offset_y = out_block_offset_y, oper_config.out.srm_cm = cm;
.out.srm_cm = cm, oper_config.rotation_angle = rotation;
oper_config.scale_x = scale_x;
.rotation_angle = rotation, oper_config.scale_y = scale_y;
.scale_x = scale_x, oper_config.rgb_swap = 0;
.scale_y = scale_y, oper_config.byte_swap = 0;
oper_config.mode = PPA_TRANS_MODE_BLOCKING;
.rgb_swap = 0,
.byte_swap = 0,
.mode = PPA_TRANS_MODE_BLOCKING,
};
TEST_ESP_OK(ppa_do_scale_rotate_mirror(ppa_client_handle, &oper_config)); TEST_ESP_OK(ppa_do_scale_rotate_mirror(ppa_client_handle, &oper_config));
@@ -414,7 +388,7 @@ TEST_CASE("ppa_blend_basic_data_correctness_check", "[PPA]")
0xFF, 0xFF, 0xFF, 0xFF, /**/ 0x00, 0x80, 0x80, 0xC0, /**/ 0xFF, 0xFF, 0xFF, 0xFF, /**/ 0x00, 0x80, 0x80, 0xC0, /**/
// /* (B) (G) (R) (A) */ // /* (B) (G) (R) (A) */
// /*******************************/ // /*******************************/
[16 ... 63] = 0, // remaining bytes [16 ... 63] are value-initialized to 0
}; };
uint8_t *out_buf = in_fg_buf; uint8_t *out_buf = in_fg_buf;
// Expected blend output // Expected blend output
@@ -432,49 +406,41 @@ TEST_CASE("ppa_blend_basic_data_correctness_check", "[PPA]")
}; };
ppa_client_handle_t ppa_client_handle; ppa_client_handle_t ppa_client_handle;
ppa_client_config_t ppa_client_config = { ppa_client_config_t ppa_client_config = {};
.oper_type = PPA_OPERATION_BLEND, ppa_client_config.oper_type = PPA_OPERATION_BLEND;
.max_pending_trans_num = 1, ppa_client_config.max_pending_trans_num = 1;
};
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle));
ppa_blend_oper_config_t oper_config = { ppa_blend_oper_config_t oper_config = {};
.in_bg.buffer = in_bg_buf, oper_config.in_bg.buffer = in_bg_buf;
.in_bg.pic_w = w, oper_config.in_bg.pic_w = w;
.in_bg.pic_h = h, oper_config.in_bg.pic_h = h;
.in_bg.block_w = block_w, oper_config.in_bg.block_w = block_w;
.in_bg.block_h = block_h, oper_config.in_bg.block_h = block_h;
.in_bg.block_offset_x = block_offset_x, oper_config.in_bg.block_offset_x = block_offset_x;
.in_bg.block_offset_y = block_offset_y, oper_config.in_bg.block_offset_y = block_offset_y;
.in_bg.blend_cm = in_bg_cm, oper_config.in_bg.blend_cm = in_bg_cm;
oper_config.in_fg.buffer = in_fg_buf;
.in_fg.buffer = in_fg_buf, oper_config.in_fg.pic_w = w;
.in_fg.pic_w = w, oper_config.in_fg.pic_h = h;
.in_fg.pic_h = h, oper_config.in_fg.block_w = block_w;
.in_fg.block_w = block_w, oper_config.in_fg.block_h = block_h;
.in_fg.block_h = block_h, oper_config.in_fg.block_offset_x = block_offset_x;
.in_fg.block_offset_x = block_offset_x, oper_config.in_fg.block_offset_y = block_offset_y;
.in_fg.block_offset_y = block_offset_y, oper_config.in_fg.blend_cm = in_fg_cm;
.in_fg.blend_cm = in_fg_cm, oper_config.out.buffer = out_buf;
oper_config.out.buffer_size = out_buf_size;
.out.buffer = out_buf, oper_config.out.pic_w = w;
.out.buffer_size = out_buf_size, oper_config.out.pic_h = h;
.out.pic_w = w, oper_config.out.block_offset_x = block_offset_x;
.out.pic_h = h, oper_config.out.block_offset_y = block_offset_y;
.out.block_offset_x = block_offset_x, oper_config.out.blend_cm = out_cm;
.out.block_offset_y = block_offset_y, oper_config.bg_alpha_update_mode = PPA_ALPHA_SCALE;
.out.blend_cm = out_cm, oper_config.bg_alpha_scale_ratio = bg_alpha_scale_ratio;
oper_config.fg_alpha_update_mode = PPA_ALPHA_INVERT;
.bg_alpha_update_mode = PPA_ALPHA_SCALE, oper_config.bg_ck_en = false;
.bg_alpha_scale_ratio = bg_alpha_scale_ratio, oper_config.fg_ck_en = false;
oper_config.mode = PPA_TRANS_MODE_BLOCKING;
.fg_alpha_update_mode = PPA_ALPHA_INVERT,
.bg_ck_en = false,
.fg_ck_en = false,
.mode = PPA_TRANS_MODE_BLOCKING,
};
TEST_ESP_OK(ppa_do_blend(ppa_client_handle, &oper_config)); TEST_ESP_OK(ppa_do_blend(ppa_client_handle, &oper_config));
@@ -488,6 +454,84 @@ TEST_CASE("ppa_blend_basic_data_correctness_check", "[PPA]")
printf("\n"); printf("\n");
TEST_ASSERT_EQUAL_UINT8_ARRAY((void *)out_buf_expected, (void *)out_buf, out_buf_len); TEST_ASSERT_EQUAL_UINT8_ARRAY((void *)out_buf_expected, (void *)out_buf, out_buf_len);
#if !(CONFIG_IDF_TARGET_ESP32P4 && CONFIG_ESP32P4_SELECTS_REV_LESS_V3)
// Test YUV422/YUV420 blend
// A mid-grey image is achromatic (U = V = 128), so a correct RGB<->YUV path must round-trip
// it back to grey with R == G == B. For each format we run RGB->YUV (exercises YUV as the
// blend output) then YUV->RGB (exercises YUV as the blend background input); both must
// complete without hanging and yield achromatic grey
// 2 x 2 is the smallest valid YUV block: even w/h satisfies YUV422 (2x1) & YUV420 (2x2)
const uint8_t grey = 0x80; // mid-grey: Y arbitrary, U = V = 128 -> R == G == B after decode
// RGB888 mid-grey background (12B) and ARGB8888 foreground (16B). The foreground alpha is
// inverted to 0, so it contributes nothing and the blend output equals the background color.
uint8_t rgb_grey[12];
memset(rgb_grey, grey, sizeof(rgb_grey));
uint8_t fg_buf[16];
memset(fg_buf, 0xFF, sizeof(fg_buf));
// DMA outputs require cache-line alignment; yuv_mid is also reused as input for the YUV->RGB pass.
uint8_t yuv_mid[64] __attribute__((aligned(64))) = {};
uint8_t rgb_back[64] __attribute__((aligned(64)));
memset(rgb_back, 0xCC, sizeof(rgb_back));
const uint32_t yuv_buf_size = sizeof(yuv_mid);
const ppa_blend_color_mode_t yuv_cms[] = {
PPA_BLEND_COLOR_MODE_YUV422_UYVY,
PPA_BLEND_COLOR_MODE_YUV420,
};
for (int c = 0; c < 2; c++) {
const ppa_blend_color_mode_t yuv_cm = yuv_cms[c];
// Foreground contributes nothing: alpha 0xFF inverted to 0, so output == background.
ppa_blend_oper_config_t yuv_oper_config = {};
yuv_oper_config.in_fg.buffer = fg_buf;
yuv_oper_config.in_fg.pic_w = w;
yuv_oper_config.in_fg.pic_h = h;
yuv_oper_config.in_fg.block_w = w;
yuv_oper_config.in_fg.block_h = h;
yuv_oper_config.in_fg.blend_cm = PPA_BLEND_COLOR_MODE_ARGB8888;
yuv_oper_config.bg_alpha_update_mode = PPA_ALPHA_NO_CHANGE;
yuv_oper_config.fg_alpha_update_mode = PPA_ALPHA_INVERT;
yuv_oper_config.mode = PPA_TRANS_MODE_BLOCKING;
// 1) RGB888 grey -> YUV (exercises YUV as blend output; must not hang)
yuv_oper_config.in_bg.buffer = rgb_grey;
yuv_oper_config.in_bg.pic_w = w;
yuv_oper_config.in_bg.pic_h = h;
yuv_oper_config.in_bg.block_w = w;
yuv_oper_config.in_bg.block_h = h;
yuv_oper_config.in_bg.blend_cm = PPA_BLEND_COLOR_MODE_RGB888;
yuv_oper_config.out.buffer = yuv_mid;
yuv_oper_config.out.buffer_size = yuv_buf_size;
yuv_oper_config.out.pic_w = w;
yuv_oper_config.out.pic_h = h;
yuv_oper_config.out.blend_cm = yuv_cm;
TEST_ESP_OK(ppa_do_blend(ppa_client_handle, &yuv_oper_config));
// 2) YUV grey -> RGB888 (exercises YUV as blend background input; must not hang)
yuv_oper_config.in_bg.buffer = yuv_mid;
yuv_oper_config.in_bg.blend_cm = yuv_cm;
yuv_oper_config.out.buffer = rgb_back;
yuv_oper_config.out.blend_cm = PPA_BLEND_COLOR_MODE_RGB888;
TEST_ESP_OK(ppa_do_blend(ppa_client_handle, &yuv_oper_config));
// Check result
// Mid-grey is achromatic: every RGB888 pixel must stay near-grey, i.e. R ~= G ~= B
// (chroma preserved) and the level must remain mid-grey (luma not driven to
// black/white). A small tolerance covers the +-1 LSB rounding of two YUV conversions.
for (int p = 0; p < w * h; p++) {
const int b = rgb_back[p * 3 + 0];
const int g = rgb_back[p * 3 + 1];
const int r = rgb_back[p * 3 + 2];
TEST_ASSERT_INT_WITHIN(2, b, g); // achromatic: channels stay together
TEST_ASSERT_INT_WITHIN(2, g, r);
TEST_ASSERT_INT_WITHIN(16, grey, b); // round-trips back to ~mid-grey
}
}
#endif // !(CONFIG_IDF_TARGET_ESP32P4 && CONFIG_ESP32P4_SELECTS_REV_LESS_V3)
TEST_ESP_OK(ppa_unregister_client(ppa_client_handle)); TEST_ESP_OK(ppa_unregister_client(ppa_client_handle));
} }
@@ -500,52 +544,55 @@ TEST_CASE("ppa_fill_basic_data_correctness_check", "[PPA]")
const uint32_t block_offset_x = 0; const uint32_t block_offset_x = 0;
const uint32_t block_offset_y = 40; const uint32_t block_offset_y = 40;
const ppa_fill_color_mode_t out_cm = PPA_FILL_COLOR_MODE_RGB565; const ppa_fill_color_mode_t out_cm = PPA_FILL_COLOR_MODE_RGB565;
const color_pixel_argb8888_data_t fill_color = {.a = 0x80, .r = 0xFF, .g = 0x55, .b = 0xAA}; color_pixel_argb8888_data_t fill_color = {};
fill_color.a = 0x80;
fill_color.r = 0xFF;
fill_color.g = 0x55;
fill_color.b = 0xAA;
uint32_t out_pixel_depth = color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)out_cm); // bits uint32_t out_pixel_depth = color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)out_cm); // bits
uint32_t out_buf_len = w * h * out_pixel_depth / 8; uint32_t out_buf_len = w * h * out_pixel_depth / 8;
uint32_t out_buf_size = ALIGN_UP(out_buf_len, 64); uint32_t out_buf_size = ALIGN_UP(out_buf_len, 64);
uint8_t *out_buf = heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT | MALLOC_CAP_DMA); uint8_t *out_buf = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(out_buf); TEST_ASSERT_NOT_NULL(out_buf);
memset(out_buf, 0xFF, out_buf_len); memset(out_buf, 0xFF, out_buf_len);
ppa_client_handle_t ppa_client_handle; ppa_client_handle_t ppa_client_handle;
ppa_client_config_t ppa_client_config = { ppa_client_config_t ppa_client_config = {};
.oper_type = PPA_OPERATION_FILL, ppa_client_config.oper_type = PPA_OPERATION_FILL;
.max_pending_trans_num = 1, ppa_client_config.max_pending_trans_num = 1;
};
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle));
ppa_fill_oper_config_t oper_config = { ppa_fill_oper_config_t oper_config = {};
.out.buffer = out_buf, oper_config.out.buffer = out_buf;
.out.buffer_size = out_buf_size, oper_config.out.buffer_size = out_buf_size;
.out.pic_w = w, oper_config.out.pic_w = w;
.out.pic_h = h, oper_config.out.pic_h = h;
.out.block_offset_x = block_offset_x, oper_config.out.block_offset_x = block_offset_x;
.out.block_offset_y = block_offset_y, oper_config.out.block_offset_y = block_offset_y;
.out.fill_cm = out_cm, oper_config.out.fill_cm = out_cm;
oper_config.fill_block_w = block_w;
.fill_block_w = block_w, oper_config.fill_block_h = block_h;
.fill_block_h = block_h, oper_config.fill_argb_color = fill_color;
.fill_argb_color = fill_color, oper_config.mode = PPA_TRANS_MODE_BLOCKING;
.mode = PPA_TRANS_MODE_BLOCKING,
};
TEST_ESP_OK(ppa_do_fill(ppa_client_handle, &oper_config)); TEST_ESP_OK(ppa_do_fill(ppa_client_handle, &oper_config));
// Check result // Check result
const color_pixel_rgb565_data_t fill_pixel_expected = {.r = fill_color.r >> 3, color_pixel_rgb565_data_t fill_pixel_expected = {};
.g = fill_color.g >> 2, fill_pixel_expected.r = fill_color.r >> 3;
.b = fill_color.b >> 3, fill_pixel_expected.g = fill_color.g >> 2;
}; fill_pixel_expected.b = fill_color.b >> 3;
TEST_ASSERT_EACH_EQUAL_UINT16(fill_pixel_expected.val, (void *)((uint32_t)out_buf + w * block_offset_y * out_pixel_depth / 8), block_w * block_h); TEST_ASSERT_EACH_EQUAL_UINT16(fill_pixel_expected.val, (void *)((uint32_t)out_buf + w * block_offset_y * out_pixel_depth / 8), block_w * block_h);
#if !(CONFIG_IDF_TARGET_ESP32P4 && CONFIG_ESP32P4_SELECTS_REV_LESS_V3) #if !(CONFIG_IDF_TARGET_ESP32P4 && CONFIG_ESP32P4_SELECTS_REV_LESS_V3)
// Test a yuv color fill // Test a yuv color fill
oper_config.out.fill_cm = PPA_FILL_COLOR_MODE_YUV422_UYVY; // output YUV422 is with UYVY packed order oper_config.out.fill_cm = PPA_FILL_COLOR_MODE_YUV422_UYVY; // output YUV422 is with UYVY packed order
const color_macroblock_yuv_data_t fill_yuv_color = {.y = 0xFF, .u = 0x55, .v = 0xAA}; color_macroblock_yuv_data_t fill_yuv_color = {};
fill_yuv_color.y = 0xFF;
fill_yuv_color.u = 0x55;
fill_yuv_color.v = 0xAA;
oper_config.fill_yuv_color = fill_yuv_color; oper_config.fill_yuv_color = fill_yuv_color;
out_pixel_depth = color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)PPA_FILL_COLOR_MODE_YUV422_UYVY); // bits out_pixel_depth = color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)PPA_FILL_COLOR_MODE_YUV422_UYVY); // bits
TEST_ESP_OK(ppa_do_fill(ppa_client_handle, &oper_config)); TEST_ESP_OK(ppa_do_fill(ppa_client_handle, &oper_config));
@@ -591,9 +638,9 @@ TEST_CASE("ppa_srm_performance", "[PPA]")
uint32_t in_buf_size = w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)in_cm) / 8; uint32_t in_buf_size = w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)in_cm) / 8;
uint32_t out_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)out_cm) / 8, 64); uint32_t out_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)out_cm) / 8, 64);
uint8_t *out_buf = heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); uint8_t *out_buf = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(out_buf); TEST_ASSERT_NOT_NULL(out_buf);
uint8_t *in_buf = heap_caps_aligned_calloc(4, in_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); uint8_t *in_buf = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, in_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(in_buf); TEST_ASSERT_NOT_NULL(in_buf);
uint8_t *ptr = in_buf; uint8_t *ptr = in_buf;
@@ -602,41 +649,35 @@ TEST_CASE("ppa_srm_performance", "[PPA]")
} }
ppa_client_handle_t ppa_client_handle; ppa_client_handle_t ppa_client_handle;
ppa_client_config_t ppa_client_config = { ppa_client_config_t ppa_client_config = {};
.oper_type = PPA_OPERATION_SRM, ppa_client_config.oper_type = PPA_OPERATION_SRM;
.max_pending_trans_num = 1, ppa_client_config.max_pending_trans_num = 1;
};
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle));
uint32_t out_pic_w = (rotation == PPA_SRM_ROTATION_ANGLE_0 || rotation == PPA_SRM_ROTATION_ANGLE_180) ? w : h; uint32_t out_pic_w = (rotation == PPA_SRM_ROTATION_ANGLE_0 || rotation == PPA_SRM_ROTATION_ANGLE_180) ? w : h;
uint32_t out_pic_h = (rotation == PPA_SRM_ROTATION_ANGLE_0 || rotation == PPA_SRM_ROTATION_ANGLE_180) ? h : w; uint32_t out_pic_h = (rotation == PPA_SRM_ROTATION_ANGLE_0 || rotation == PPA_SRM_ROTATION_ANGLE_180) ? h : w;
ppa_srm_oper_config_t oper_config = { ppa_srm_oper_config_t oper_config = {};
.in.buffer = in_buf, oper_config.in.buffer = in_buf;
.in.pic_w = w, oper_config.in.pic_w = w;
.in.pic_h = h, oper_config.in.pic_h = h;
.in.block_w = block_w, oper_config.in.block_w = block_w;
.in.block_h = block_h, oper_config.in.block_h = block_h;
.in.block_offset_x = 0, oper_config.in.block_offset_x = 0;
.in.block_offset_y = 0, oper_config.in.block_offset_y = 0;
.in.srm_cm = in_cm, oper_config.in.srm_cm = in_cm;
oper_config.out.buffer = out_buf;
.out.buffer = out_buf, oper_config.out.buffer_size = out_buf_size;
.out.buffer_size = out_buf_size, oper_config.out.pic_w = out_pic_w;
.out.pic_w = out_pic_w, oper_config.out.pic_h = out_pic_h;
.out.pic_h = out_pic_h, oper_config.out.block_offset_x = 0;
.out.block_offset_x = 0, oper_config.out.block_offset_y = 0;
.out.block_offset_y = 0, oper_config.out.srm_cm = out_cm;
.out.srm_cm = out_cm, oper_config.rotation_angle = rotation;
oper_config.scale_x = scale_x;
.rotation_angle = rotation, oper_config.scale_y = scale_y;
.scale_x = scale_x, oper_config.rgb_swap = 0;
.scale_y = scale_y, oper_config.byte_swap = 0;
oper_config.mode = PPA_TRANS_MODE_BLOCKING;
.rgb_swap = 0,
.byte_swap = 0,
.mode = PPA_TRANS_MODE_BLOCKING,
};
ccomp_timer_start(); ccomp_timer_start();
@@ -675,11 +716,11 @@ TEST_CASE("ppa_blend_performance", "[PPA]")
uint32_t in_bg_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)in_bg_cm) / 8, in_buf_alignment); uint32_t in_bg_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)in_bg_cm) / 8, in_buf_alignment);
uint32_t in_fg_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)in_fg_cm) / 8, in_buf_alignment); uint32_t in_fg_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)in_fg_cm) / 8, in_buf_alignment);
uint32_t out_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)out_cm) / 8, 64); uint32_t out_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)out_cm) / 8, 64);
uint8_t *out_buf = heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); uint8_t *out_buf = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(out_buf); TEST_ASSERT_NOT_NULL(out_buf);
uint8_t *in_bg_buf = heap_caps_aligned_calloc(4, in_bg_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); uint8_t *in_bg_buf = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, in_bg_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(in_bg_buf); TEST_ASSERT_NOT_NULL(in_bg_buf);
uint8_t *in_fg_buf = heap_caps_aligned_calloc(4, in_fg_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); uint8_t *in_fg_buf = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, in_fg_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(in_fg_buf); TEST_ASSERT_NOT_NULL(in_fg_buf);
uint8_t *ptr = in_bg_buf; uint8_t *ptr = in_bg_buf;
@@ -692,44 +733,38 @@ TEST_CASE("ppa_blend_performance", "[PPA]")
} }
ppa_client_handle_t ppa_client_handle; ppa_client_handle_t ppa_client_handle;
ppa_client_config_t ppa_client_config = { ppa_client_config_t ppa_client_config = {};
.oper_type = PPA_OPERATION_BLEND, ppa_client_config.oper_type = PPA_OPERATION_BLEND;
.max_pending_trans_num = 1, ppa_client_config.max_pending_trans_num = 1;
};
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle));
ppa_blend_oper_config_t oper_config = { ppa_blend_oper_config_t oper_config = {};
.in_bg.buffer = in_bg_buf, oper_config.in_bg.buffer = in_bg_buf;
.in_bg.pic_w = w, oper_config.in_bg.pic_w = w;
.in_bg.pic_h = h, oper_config.in_bg.pic_h = h;
.in_bg.block_w = block_w, oper_config.in_bg.block_w = block_w;
.in_bg.block_h = block_h, oper_config.in_bg.block_h = block_h;
.in_bg.block_offset_x = 0, oper_config.in_bg.block_offset_x = 0;
.in_bg.block_offset_y = 0, oper_config.in_bg.block_offset_y = 0;
.in_bg.blend_cm = in_bg_cm, oper_config.in_bg.blend_cm = in_bg_cm;
oper_config.in_fg.buffer = in_fg_buf;
.in_fg.buffer = in_fg_buf, oper_config.in_fg.pic_w = w;
.in_fg.pic_w = w, oper_config.in_fg.pic_h = h;
.in_fg.pic_h = h, oper_config.in_fg.block_w = block_w;
.in_fg.block_w = block_w, oper_config.in_fg.block_h = block_h;
.in_fg.block_h = block_h, oper_config.in_fg.block_offset_x = 0;
.in_fg.block_offset_x = 0, oper_config.in_fg.block_offset_y = 0;
.in_fg.block_offset_y = 0, oper_config.in_fg.blend_cm = in_fg_cm;
.in_fg.blend_cm = in_fg_cm, oper_config.out.buffer = out_buf;
oper_config.out.buffer_size = out_buf_size;
.out.buffer = out_buf, oper_config.out.pic_w = w;
.out.buffer_size = out_buf_size, oper_config.out.pic_h = h;
.out.pic_w = w, oper_config.out.block_offset_x = 0;
.out.pic_h = h, oper_config.out.block_offset_y = 0;
.out.block_offset_x = 0, oper_config.out.blend_cm = out_cm;
.out.block_offset_y = 0, oper_config.bg_ck_en = false;
.out.blend_cm = out_cm, oper_config.fg_ck_en = false;
oper_config.mode = PPA_TRANS_MODE_BLOCKING;
.bg_ck_en = false,
.fg_ck_en = false,
.mode = PPA_TRANS_MODE_BLOCKING,
};
ccomp_timer_start(); ccomp_timer_start();
@@ -763,33 +798,27 @@ TEST_CASE("ppa_fill_performance", "[PPA]")
const ppa_fill_color_mode_t out_cm = PPA_FILL_COLOR_MODE_RGB565; const ppa_fill_color_mode_t out_cm = PPA_FILL_COLOR_MODE_RGB565;
uint32_t out_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)out_cm) / 8, 64); uint32_t out_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)out_cm) / 8, 64);
uint8_t *out_buf = heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); uint8_t *out_buf = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(out_buf); TEST_ASSERT_NOT_NULL(out_buf);
ppa_client_handle_t ppa_client_handle; ppa_client_handle_t ppa_client_handle;
ppa_client_config_t ppa_client_config = { ppa_client_config_t ppa_client_config = {};
.oper_type = PPA_OPERATION_FILL, ppa_client_config.oper_type = PPA_OPERATION_FILL;
.max_pending_trans_num = 1, ppa_client_config.max_pending_trans_num = 1;
};
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle));
ppa_fill_oper_config_t oper_config = { ppa_fill_oper_config_t oper_config = {};
.out.buffer = out_buf, oper_config.out.buffer = out_buf;
.out.buffer_size = out_buf_size, oper_config.out.buffer_size = out_buf_size;
.out.pic_w = w, oper_config.out.pic_w = w;
.out.pic_h = h, oper_config.out.pic_h = h;
.out.block_offset_x = 0, oper_config.out.block_offset_x = 0;
.out.block_offset_y = 0, oper_config.out.block_offset_y = 0;
.out.fill_cm = out_cm, oper_config.out.fill_cm = out_cm;
oper_config.fill_block_w = block_w;
.fill_block_w = block_w, oper_config.fill_block_h = block_h;
.fill_block_h = block_h, oper_config.fill_argb_color.val = 0xFF00FFFF;
.fill_argb_color = { oper_config.mode = PPA_TRANS_MODE_BLOCKING;
.val = 0xFF00FFFF,
},
.mode = PPA_TRANS_MODE_BLOCKING,
};
ccomp_timer_start(); ccomp_timer_start();
@@ -829,16 +858,15 @@ TEST_CASE("ppa_srm_stress_test", "[PPA]")
uint32_t in_buf_size = w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)in_cm) / 8; uint32_t in_buf_size = w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)in_cm) / 8;
uint32_t out_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)out_cm) / 8, 64); uint32_t out_buf_size = ALIGN_UP(w * h * color_hal_pixel_format_fourcc_get_bit_depth((esp_color_fourcc_t)out_cm) / 8, 64);
uint8_t *out_buf = heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA); uint8_t *out_buf = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, out_buf_size, sizeof(uint8_t), MALLOC_CAP_SPIRAM | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(out_buf); TEST_ASSERT_NOT_NULL(out_buf);
uint8_t *in_buf = heap_caps_aligned_calloc(4, in_buf_size, sizeof(uint8_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT | MALLOC_CAP_DMA); uint8_t *in_buf = static_cast<uint8_t *>(heap_caps_aligned_calloc(4, in_buf_size, sizeof(uint8_t), MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT | MALLOC_CAP_DMA));
TEST_ASSERT_NOT_NULL(in_buf); TEST_ASSERT_NOT_NULL(in_buf);
ppa_client_handle_t ppa_client_handle; ppa_client_handle_t ppa_client_handle;
ppa_client_config_t ppa_client_config = { ppa_client_config_t ppa_client_config = {};
.oper_type = PPA_OPERATION_SRM, ppa_client_config.oper_type = PPA_OPERATION_SRM;
.max_pending_trans_num = 1, ppa_client_config.max_pending_trans_num = 1;
};
TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle)); TEST_ESP_OK(ppa_register_client(&ppa_client_config, &ppa_client_handle));
// Test on different sizes of the block // Test on different sizes of the block
@@ -854,33 +882,28 @@ TEST_CASE("ppa_srm_stress_test", "[PPA]")
block_w = block_w_initial + i; block_w = block_w_initial + i;
block_h = block_h_initial + i; block_h = block_h_initial + i;
// printf("block_w = %ld, block_h = %ld\n", block_w, block_h); // printf("block_w = %ld, block_h = %ld\n", block_w, block_h);
ppa_srm_oper_config_t oper_config = { ppa_srm_oper_config_t oper_config = {};
.in.buffer = in_buf, oper_config.in.buffer = in_buf;
.in.pic_w = w, oper_config.in.pic_w = w;
.in.pic_h = h, oper_config.in.pic_h = h;
.in.block_w = block_w, oper_config.in.block_w = block_w;
.in.block_h = block_h, oper_config.in.block_h = block_h;
.in.block_offset_x = 0, oper_config.in.block_offset_x = 0;
.in.block_offset_y = 0, oper_config.in.block_offset_y = 0;
.in.srm_cm = in_cm, oper_config.in.srm_cm = in_cm;
oper_config.out.buffer = out_buf;
.out.buffer = out_buf, oper_config.out.buffer_size = out_buf_size;
.out.buffer_size = out_buf_size, oper_config.out.pic_w = block_w;
.out.pic_w = block_w, oper_config.out.pic_h = block_h;
.out.pic_h = block_h, oper_config.out.block_offset_x = 0;
.out.block_offset_x = 0, oper_config.out.block_offset_y = 0;
.out.block_offset_y = 0, oper_config.out.srm_cm = out_cm;
.out.srm_cm = out_cm, oper_config.rotation_angle = rotation;
oper_config.scale_x = scale_x;
.rotation_angle = rotation, oper_config.scale_y = scale_y;
.scale_x = scale_x, oper_config.rgb_swap = 0;
.scale_y = scale_y, oper_config.byte_swap = 0;
oper_config.mode = PPA_TRANS_MODE_BLOCKING;
.rgb_swap = 0,
.byte_swap = 0,
.mode = PPA_TRANS_MODE_BLOCKING,
};
TEST_ESP_OK(ppa_do_scale_rotate_mirror(ppa_client_handle, &oper_config)); TEST_ESP_OK(ppa_do_scale_rotate_mirror(ppa_client_handle, &oper_config));
} }
components/esp_hal_ppa/esp32p4/include/hal/ppa_ll.h
+14 -5
View File
@@ -1083,7 +1083,7 @@ static inline void ppa_ll_blend_configure_rx_fg_alpha(ppa_dev_t *dev, ppa_alpha_
} }
/** /**
* @brief Configure PPA blending pixel filling image block * @brief Configure PPA blending pixel filling image block color
* *
* The color to be filled is directly relying on the blend_tx_fix_pixel register field value. * The color to be filled is directly relying on the blend_tx_fix_pixel register field value.
* For fill operation, the data does not go through any color space conversion in the blending engine. * For fill operation, the data does not go through any color space conversion in the blending engine.
@@ -1091,12 +1091,9 @@ static inline void ppa_ll_blend_configure_rx_fg_alpha(ppa_dev_t *dev, ppa_alpha_
* @param dev Peripheral instance address * @param dev Peripheral instance address
* @param color_mode One of the values in ppa_fill_color_mode_t * @param color_mode One of the values in ppa_fill_color_mode_t
* @param data The point of the fix data to be filled to the image block pixels * @param data The point of the fix data to be filled to the image block pixels
* @param hb The horizontal width of image block that would be filled in fix pixel filling mode. The unit is pixel.
* @param vb The vertical height of image block that would be filled in fix pixel filling mode. The unit is pixel.
*/ */
static inline void ppa_ll_blend_configure_filling_block(ppa_dev_t *dev, ppa_fill_color_mode_t color_mode, void *data, uint32_t hb, uint32_t vb) static inline void ppa_ll_blend_configure_filling_block_color(ppa_dev_t *dev, ppa_fill_color_mode_t color_mode, void *data)
{ {
HAL_ASSERT(hb <= PPA_BLEND_HB_V && vb <= PPA_BLEND_VB_V);
uint32_t fill_color_data = 0; uint32_t fill_color_data = 0;
switch (color_mode) { switch (color_mode) {
case PPA_FILL_COLOR_MODE_ARGB8888: case PPA_FILL_COLOR_MODE_ARGB8888:
@@ -1123,6 +1120,18 @@ static inline void ppa_ll_blend_configure_filling_block(ppa_dev_t *dev, ppa_fill
abort(); abort();
} }
dev->blend_fix_pixel.blend_tx_fix_pixel = fill_color_data; dev->blend_fix_pixel.blend_tx_fix_pixel = fill_color_data;
}
/**
* @brief Set PPA blending block size
*
* @param dev Peripheral instance address
* @param hb The horizontal width of image block that would be filled in fix pixel filling mode or blend mode. The unit is pixel.
* @param vb The vertical height of image block that would be filled in fix pixel filling mode or blend mode. The unit is pixel.
*/
static inline void ppa_ll_blend_set_block_size(ppa_dev_t *dev, uint32_t hb, uint32_t vb)
{
HAL_ASSERT(hb <= PPA_BLEND_HB_V && vb <= PPA_BLEND_VB_V);
dev->blend_tx_size.blend_hb = hb; dev->blend_tx_size.blend_hb = hb;
dev->blend_tx_size.blend_vb = vb; dev->blend_tx_size.blend_vb = vb;
} }