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

fix(jpeg): Modify jpeg deocde/encode error handling logic, fix if one picture wrong, all picture wrong issue

Browse Source
This commit is contained in:
C.S.M
2024-05-28 12:28:32 +08:00
parent 06cc3419d8
commit c620a2fa39
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/esp_driver_jpeg/jpeg_decode.c
View File

@ -242,15 +242,14 @@ esp_err_t jpeg_decoder_process(jpeg_decoder_handle_t decoder_engine, const jpeg_
while (1) { while (1) {
jpeg_dma2d_dec_evt_t jpeg_dma2d_event; jpeg_dma2d_dec_evt_t jpeg_dma2d_event;
BaseType_t ret_val = xQueueReceive(decoder_engine->evt_queue, &jpeg_dma2d_event, decoder_engine->timeout_tick); BaseType_t ret_val = xQueueReceive(decoder_engine->evt_queue, &jpeg_dma2d_event, decoder_engine->timeout_tick);
ESP_GOTO_ON_FALSE(ret_val == pdTRUE, ESP_ERR_TIMEOUT, err, TAG, "jpeg-dma2d handle jpeg decode timeout, please check `timeout_ms` "); ESP_GOTO_ON_FALSE(ret_val == pdTRUE, ESP_ERR_TIMEOUT, err, TAG, "jpeg-dma2d handle jpeg decode timeout, please check image accuracy and `timeout_ms` ");
// Dealing with JPEG event // Dealing with JPEG event
if (jpeg_dma2d_event.jpgd_status != 0) { if (jpeg_dma2d_event.jpgd_status != 0) {
uint32_t status = jpeg_dma2d_event.jpgd_status; uint32_t status = jpeg_dma2d_event.jpgd_status;
s_decoder_error_log_print(status); s_decoder_error_log_print(status);
dma2d_force_end(decoder_engine->trans_desc, &need_yield); ret = ESP_ERR_INVALID_STATE;
xSemaphoreGive(decoder_engine->codec_base->codec_mutex); goto err;
return ESP_ERR_INVALID_STATE;
} }
if (jpeg_dma2d_event.dma_evt & JPEG_DMA2D_RX_EOF) { if (jpeg_dma2d_event.dma_evt & JPEG_DMA2D_RX_EOF) {
@ -260,11 +259,18 @@ esp_err_t jpeg_decoder_process(jpeg_decoder_handle_t decoder_engine, const jpeg_
} }
} }
err:
xSemaphoreGive(decoder_engine->codec_base->codec_mutex); xSemaphoreGive(decoder_engine->codec_base->codec_mutex);
if (decoder_engine->codec_base->pm_lock) { if (decoder_engine->codec_base->pm_lock) {
ESP_RETURN_ON_ERROR(esp_pm_lock_release(decoder_engine->codec_base->pm_lock), TAG, "release pm_lock failed"); ESP_RETURN_ON_ERROR(esp_pm_lock_release(decoder_engine->codec_base->pm_lock), TAG, "release pm_lock failed");
} }
return ESP_OK;
err:
dma2d_force_end(decoder_engine->trans_desc, &need_yield);
xSemaphoreGive(decoder_engine->codec_base->codec_mutex);
if (decoder_engine->codec_base->pm_lock) {
esp_pm_lock_release(decoder_engine->codec_base->pm_lock);
}
return ret; return ret;
} }

13
components/esp_driver_jpeg/jpeg_encode.c
View File

@ -249,11 +249,11 @@ esp_err_t jpeg_encoder_process(jpeg_encoder_handle_t encoder_engine, const jpeg_
}; };
ESP_GOTO_ON_ERROR(dma2d_enqueue(encoder_engine->dma2d_group_handle, &trans_desc, encoder_engine->trans_desc), err, TAG, "DMA2D enqueue failed"); ESP_GOTO_ON_ERROR(dma2d_enqueue(encoder_engine->dma2d_group_handle, &trans_desc, encoder_engine->trans_desc), err, TAG, "DMA2D enqueue failed");
bool need_yield;
while (1) { while (1) {
jpeg_enc_dma2d_evt_t s_rcv_event; jpeg_enc_dma2d_evt_t s_rcv_event;
BaseType_t ret_val = xQueueReceive(encoder_engine->evt_queue, &s_rcv_event, encoder_engine->timeout_tick); BaseType_t ret_val = xQueueReceive(encoder_engine->evt_queue, &s_rcv_event, encoder_engine->timeout_tick);
ESP_GOTO_ON_FALSE(ret_val == pdTRUE, ESP_ERR_TIMEOUT, err, TAG, "jpeg-dma2d handle jpeg decode timeout, please check `timeout_ms`"); ESP_GOTO_ON_FALSE(ret_val == pdTRUE, ESP_ERR_TIMEOUT, err, TAG, "jpeg-dma2d handle jpeg decode timeout, please check image accuracy and `timeout_ms`");
if (s_rcv_event.encoder_status != 0) { if (s_rcv_event.encoder_status != 0) {
s_encoder_error_log_print(s_rcv_event.encoder_status); s_encoder_error_log_print(s_rcv_event.encoder_status);
@ -273,11 +273,18 @@ esp_err_t jpeg_encoder_process(jpeg_encoder_handle_t encoder_engine, const jpeg_
compressed_size += encoder_engine->header_info->header_len; compressed_size += encoder_engine->header_info->header_len;
*out_size = compressed_size; *out_size = compressed_size;
err:
xSemaphoreGive(encoder_engine->codec_base->codec_mutex); xSemaphoreGive(encoder_engine->codec_base->codec_mutex);
if (encoder_engine->codec_base->pm_lock) { if (encoder_engine->codec_base->pm_lock) {
ESP_RETURN_ON_ERROR(esp_pm_lock_release(encoder_engine->codec_base->pm_lock), TAG, "release pm_lock failed"); ESP_RETURN_ON_ERROR(esp_pm_lock_release(encoder_engine->codec_base->pm_lock), TAG, "release pm_lock failed");
} }
return ESP_OK;
err:
dma2d_force_end(encoder_engine->trans_desc, &need_yield);
xSemaphoreGive(encoder_engine->codec_base->codec_mutex);
if (encoder_engine->codec_base->pm_lock) {
esp_pm_lock_release(encoder_engine->codec_base->pm_lock);
}
return ret; return ret;
} }