diff --git a/main/boards/sensecap-watcher/sscma_camera.cc b/main/boards/sensecap-watcher/sscma_camera.cc index eeb3a57a..e56f1c0b 100644 --- a/main/boards/sensecap-watcher/sscma_camera.cc +++ b/main/boards/sensecap-watcher/sscma_camera.cc @@ -109,9 +109,10 @@ SscmaCamera::SscmaCamera(esp_io_expander_handle_t io_exp_handle) { } //初始化JPEG解码 - jpeg_dec_config_t config = { .output_type = JPEG_RAW_TYPE_RGB565_LE, .rotate = JPEG_ROTATE_0D }; - jpeg_dec_ = jpeg_dec_open(&config); - if (!jpeg_dec_) { + jpeg_error_t err; + jpeg_dec_config_t config = { .output_type = JPEG_PIXEL_FORMAT_RGB565_LE, .rotate = JPEG_ROTATE_0D }; + err = jpeg_dec_open(&config, &jpeg_dec_); + if ( err != JPEG_ERR_OK ) { ESP_LOGE(TAG, "Failed to open JPEG decoder"); return; } diff --git a/main/boards/sensecap-watcher/sscma_camera.h b/main/boards/sensecap-watcher/sscma_camera.h index 45ebc4f8..731b8da0 100644 --- a/main/boards/sensecap-watcher/sscma_camera.h +++ b/main/boards/sensecap-watcher/sscma_camera.h @@ -32,7 +32,7 @@ private: sscma_client_handle_t sscma_client_handle_; QueueHandle_t sscma_data_queue_; JpegData jpeg_data_; - jpeg_dec_handle_t *jpeg_dec_; + jpeg_dec_handle_t jpeg_dec_; jpeg_dec_io_t *jpeg_io_; jpeg_dec_header_info_t *jpeg_out_; public: diff --git a/main/idf_component.yml b/main/idf_component.yml index f0577152..653618d1 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -38,10 +38,6 @@ dependencies: espressif/adc_battery_estimation: ^0.2.0 # SenseCAP Watcher Board - wvirgil123/esp_jpeg_simd: - version: 1.0.0 - rules: - - if: target in [esp32s3] wvirgil123/sscma_client: version: 1.0.2 rules: