feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'bugfix/fix_some_minor_issue_in_i2s_and_isp' into 'master'

Browse Source 
fix: fix minor issues in isp and i2s

See merge request espressif/esp-idf!33224
This commit is contained in:
Kevin (Lao Kaiyao)
2024-09-02 15:29:34 +08:00
parent d3631b3afa 7ac567df96
commit 9a5a94e75d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_driver_i2s/i2s_common.c
View File

@@ -371,7 +371,7 @@ uint32_t i2s_get_buf_size(i2s_chan_handle_t handle, uint32_t data_bit_width, uin
for (int sign = 1; bufsize % alignment != 0; aligned_frame_num += sign) { for (int sign = 1; bufsize % alignment != 0; aligned_frame_num += sign) {
bufsize = aligned_frame_num * bytes_per_frame; bufsize = aligned_frame_num * bytes_per_frame;
/* If the buffer size exceed the max dma size */ /* If the buffer size exceed the max dma size */
if (bufsize > I2S_DMA_BUFFER_MAX_SIZE) { if (bufsize > I2S_DMA_BUFFER_MAX_SIZE && sign == 1) {
sign = -1; // toggle the search sign sign = -1; // toggle the search sign
aligned_frame_num = dma_frame_num; // Reset the frame num aligned_frame_num = dma_frame_num; // Reset the frame num
bufsize = aligned_frame_num * bytes_per_frame; // Reset the bufsize bufsize = aligned_frame_num * bytes_per_frame; // Reset the bufsize

2
components/esp_driver_isp/include/driver/isp_hist.h
View File

@@ -143,7 +143,7 @@ typedef struct {
/** /**
* @brief Prototype of ISP hist event callback * @brief Prototype of ISP hist event callback
* *
* @param[in] handle ISP hist controller handle * @param[in] hist_ctlr ISP hist controller handle
* @param[in] edata ISP hist event data * @param[in] edata ISP hist event data
* @param[in] user_data User registered context, registered when in `esp_isp_hist_register_event_callbacks()` * @param[in] user_data User registered context, registered when in `esp_isp_hist_register_event_callbacks()`
* *