devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

fix: Delete the esp_jpeg_simd component to resolve function conflicts (#1049)

Browse Source
This commit is contained in:
virgil
2025-08-08 21:00:34 +08:00
committed by GitHub
parent f86637cf1c
commit 845b760db3
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
main/boards/sensecap-watcher/sscma_camera.cc
View File

@@ -109,9 +109,10 @@ SscmaCamera::SscmaCamera(esp_io_expander_handle_t io_exp_handle) {
} }
//初始化JPEG解码 //初始化JPEG解码
jpeg_dec_config_t config = { .output_type = JPEG_RAW_TYPE_RGB565_LE, .rotate = JPEG_ROTATE_0D }; jpeg_error_t err;
jpeg_dec_ = jpeg_dec_open(&config); jpeg_dec_config_t config = { .output_type = JPEG_PIXEL_FORMAT_RGB565_LE, .rotate = JPEG_ROTATE_0D };
if (!jpeg_dec_) { err = jpeg_dec_open(&config, &jpeg_dec_);
if ( err != JPEG_ERR_OK ) {
ESP_LOGE(TAG, "Failed to open JPEG decoder"); ESP_LOGE(TAG, "Failed to open JPEG decoder");
return; return;
} }

2
main/boards/sensecap-watcher/sscma_camera.h
View File

@@ -32,7 +32,7 @@ private:
sscma_client_handle_t sscma_client_handle_; sscma_client_handle_t sscma_client_handle_;
QueueHandle_t sscma_data_queue_; QueueHandle_t sscma_data_queue_;
JpegData jpeg_data_; JpegData jpeg_data_;
jpeg_dec_handle_t *jpeg_dec_; jpeg_dec_handle_t jpeg_dec_;
jpeg_dec_io_t *jpeg_io_; jpeg_dec_io_t *jpeg_io_;
jpeg_dec_header_info_t *jpeg_out_; jpeg_dec_header_info_t *jpeg_out_;
public: public:

4
main/idf_component.yml
View File

@@ -38,10 +38,6 @@ dependencies:
espressif/adc_battery_estimation: ^0.2.0 espressif/adc_battery_estimation: ^0.2.0
# SenseCAP Watcher Board # SenseCAP Watcher Board
wvirgil123/esp_jpeg_simd:
version: 1.0.0
rules:
- if: target in [esp32s3]
wvirgil123/sscma_client: wvirgil123/sscma_client:
version: 1.0.2 version: 1.0.2
rules: rules: