Skip to content

Commit 845b760

Browse files
authored
fix: Delete the esp_jpeg_simd component to resolve function conflicts (#1049)
1 parent f86637c commit 845b760

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

main/boards/sensecap-watcher/sscma_camera.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,10 @@ SscmaCamera::SscmaCamera(esp_io_expander_handle_t io_exp_handle) {
109109
}
110110

111111
//初始化JPEG解码
112-
jpeg_dec_config_t config = { .output_type = JPEG_RAW_TYPE_RGB565_LE, .rotate = JPEG_ROTATE_0D };
113-
jpeg_dec_ = jpeg_dec_open(&config);
114-
if (!jpeg_dec_) {
112+
jpeg_error_t err;
113+
jpeg_dec_config_t config = { .output_type = JPEG_PIXEL_FORMAT_RGB565_LE, .rotate = JPEG_ROTATE_0D };
114+
err = jpeg_dec_open(&config, &jpeg_dec_);
115+
if ( err != JPEG_ERR_OK ) {
115116
ESP_LOGE(TAG, "Failed to open JPEG decoder");
116117
return;
117118
}

main/boards/sensecap-watcher/sscma_camera.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class SscmaCamera : public Camera {
3232
sscma_client_handle_t sscma_client_handle_;
3333
QueueHandle_t sscma_data_queue_;
3434
JpegData jpeg_data_;
35-
jpeg_dec_handle_t *jpeg_dec_;
35+
jpeg_dec_handle_t jpeg_dec_;
3636
jpeg_dec_io_t *jpeg_io_;
3737
jpeg_dec_header_info_t *jpeg_out_;
3838
public:

main/idf_component.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@ dependencies:
3838
espressif/adc_battery_estimation: ^0.2.0
3939

4040
# SenseCAP Watcher Board
41-
wvirgil123/esp_jpeg_simd:
42-
version: 1.0.0
43-
rules:
44-
- if: target in [esp32s3]
4541
wvirgil123/sscma_client:
4642
version: 1.0.2
4743
rules:

0 commit comments

Comments
 (0)