Skip to content

Commit e903dce

Browse files
committed
Remove unused code for camera thanks @tom2199 as no FR used
1 parent 248ce51 commit e903dce

File tree

2 files changed

+10
-40
lines changed

2 files changed

+10
-40
lines changed

esp3d/src/include/version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define _VERSION_ESP3D_H
2323

2424
//version and sources location
25-
#define FW_VERSION "3.0.0.a105"
25+
#define FW_VERSION "3.0.0.a106"
2626
#define REPOSITORY "https://github.com/luc-github/ESP3D/tree/3.0"
2727

2828
#endif //_VERSION_ESP3D_H

esp3d/src/modules/camera/camera.cpp

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include "../../core/esp3doutput.h"
2525
#include "../../core/esp3d.h"
2626
#include <esp_camera.h>
27-
#include "fd_forward.h"
2827
#include <soc/soc.h> //not sure this one is needed
2928
#include <soc/rtc_cntl_reg.h>
3029

@@ -33,7 +32,6 @@
3332

3433
#define DEFAULT_FRAME_SIZE FRAMESIZE_SVGA
3534
#define JPEG_COMPRESSION 80
36-
#define MIN_WIDTH_COMPRESSION 400
3735

3836
Camera esp3d_camera;
3937

@@ -67,7 +65,6 @@ void Camera::handle_snap(WebServer * webserver)
6765
bool res_error = false;
6866
size_t _jpg_buf_len = 0;
6967
uint8_t * _jpg_buf = NULL;
70-
dl_matrix3du_t *image_matrix = NULL;
7168
webserver->sendHeader(String(F("Content-Type")), String(F("image/jpeg")),true);
7269
webserver->sendHeader(String(F("Content-Disposition")), String(F("inline; filename=capture.jpg")),true);
7370
webserver->setContentLength(CONTENT_LENGTH_UNKNOWN);
@@ -78,44 +75,17 @@ void Camera::handle_snap(WebServer * webserver)
7875
log_esp3d("Camera capture failed");
7976
webserver->send (500, "text/plain", "Capture failed");
8077
} else {
81-
if(fb->width > MIN_WIDTH_COMPRESSION) {
82-
if(fb->format != PIXFORMAT_JPEG) {
83-
bool jpeg_converted = frame2jpg(fb, JPEG_COMPRESSION, &_jpg_buf, &_jpg_buf_len);
84-
esp_camera_fb_return(fb);
85-
fb = NULL;
86-
if(!jpeg_converted) {
87-
log_esp3d("JPEG compression failed");
88-
res_error = true;
89-
}
90-
} else {
91-
_jpg_buf_len = fb->len;
92-
_jpg_buf = fb->buf;
93-
}
94-
} else {
95-
image_matrix = dl_matrix3du_alloc(1, fb->width, fb->height, 3);
96-
97-
if (!image_matrix) {
98-
log_esp3d("dl_matrix3du_alloc failed");
78+
if(fb->format != PIXFORMAT_JPEG) {
79+
bool jpeg_converted = frame2jpg(fb, JPEG_COMPRESSION, &_jpg_buf, &_jpg_buf_len);
80+
esp_camera_fb_return(fb);
81+
fb = NULL;
82+
if(!jpeg_converted) {
83+
log_esp3d("JPEG compression failed");
9984
res_error = true;
100-
} else {
101-
if(!fmt2rgb888(fb->buf, fb->len, fb->format, image_matrix->item)) {
102-
log_esp3d("fmt2rgb888 failed");
103-
res_error = true;
104-
} else {
105-
if (fb->format != PIXFORMAT_JPEG) {
106-
if(!fmt2jpg(image_matrix->item, fb->width*fb->height*3, fb->width, fb->height, PIXFORMAT_RGB888, 90, &_jpg_buf, &_jpg_buf_len)) {
107-
log_esp3d("fmt2jpg failed");
108-
res_error = true;
109-
}
110-
esp_camera_fb_return(fb);
111-
fb = NULL;
112-
} else {
113-
_jpg_buf = fb->buf;
114-
_jpg_buf_len = fb->len;
115-
}
116-
}
117-
dl_matrix3du_free(image_matrix);
11885
}
86+
} else {
87+
_jpg_buf_len = fb->len;
88+
_jpg_buf = fb->buf;
11989
}
12090
}
12191
if (!res_error) {

0 commit comments

Comments
 (0)