Fix Camera Example (#3202)

* Update app_httpd.cpp * Stop LWIP from using PSRAM and enable OV7725
espressif · Sep 12, 2019 · 0739015 · 0739015
1 parent bab3a70
commit 0739015
Show file tree

Hide file tree

Showing 73 changed files with 14 additions and 7 deletions.
diff --git a/libraries/ESP32/examples/Camera/CameraWebServer/app_httpd.cpp b/libraries/ESP32/examples/Camera/CameraWebServer/app_httpd.cpp
@@ -229,6 +229,7 @@ static esp_err_t capture_handler(httpd_req_t *req){
 
     httpd_resp_set_type(req, "image/jpeg");
     httpd_resp_set_hdr(req, "Content-Disposition", "inline; filename=capture.jpg");
+    httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
 
     size_t out_len, out_width, out_height;
     uint8_t * out_buf;
@@ -282,6 +283,7 @@ static esp_err_t capture_handler(httpd_req_t *req){
             face_id = run_face_recognition(image_matrix, net_boxes);
         }
         draw_face_boxes(image_matrix, net_boxes, face_id);
+        free(net_boxes->score);
         free(net_boxes->box);
         free(net_boxes->landmark);
         free(net_boxes);
@@ -325,6 +327,8 @@ static esp_err_t stream_handler(httpd_req_t *req){
         return res;
     }
 
+    httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
+
     while(true){
         detected = false;
         face_id = 0;
@@ -378,6 +382,7 @@ static esp_err_t stream_handler(httpd_req_t *req){
                                 }
                                 fr_recognize = esp_timer_get_time();
                                 draw_face_boxes(image_matrix, net_boxes, face_id);
+                                free(net_boxes->score);
                                 free(net_boxes->box);
                                 free(net_boxes->landmark);
                                 free(net_boxes);
@@ -624,15 +629,18 @@ void startCameraServer(){
 
     ra_filter_init(&ra_filter, 20);
 
+    mtmn_config.type = FAST;
     mtmn_config.min_face = 80;
-    mtmn_config.pyramid = 0.7;
+    mtmn_config.pyramid = 0.707;
+    mtmn_config.pyramid_times = 4;
     mtmn_config.p_threshold.score = 0.6;
     mtmn_config.p_threshold.nms = 0.7;
+    mtmn_config.p_threshold.candidate_number = 20;
     mtmn_config.r_threshold.score = 0.7;
     mtmn_config.r_threshold.nms = 0.7;
-    mtmn_config.r_threshold.candidate_number = 4;
+    mtmn_config.r_threshold.candidate_number = 10;
     mtmn_config.o_threshold.score = 0.7;
-    mtmn_config.o_threshold.nms = 0.4;
+    mtmn_config.o_threshold.nms = 0.7;
     mtmn_config.o_threshold.candidate_number = 1;
 
     face_id_init(&id_list, FACE_ID_SAVE_NUMBER, ENROLL_CONFIRM_TIMES);

diff --git a/tools/sdk/bin/bootloader_dio_80m.bin b/tools/sdk/bin/bootloader_dio_80m.bin
diff --git a/tools/sdk/bin/bootloader_qio_40m.bin b/tools/sdk/bin/bootloader_qio_40m.bin
diff --git a/tools/sdk/bin/bootloader_qout_40m.bin b/tools/sdk/bin/bootloader_qout_40m.bin
diff --git a/tools/sdk/include/config/sdkconfig.h b/tools/sdk/include/config/sdkconfig.h
@@ -130,6 +130,7 @@
 #define CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO 1
 #define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
 #define CONFIG_SPIFFS_USE_MAGIC 1
+#define CONFIG_OV7725_SUPPORT 1
 #define CONFIG_TCPIP_TASK_STACK_SIZE 2560
 #define CONFIG_BLUEDROID_PINNED_TO_CORE_0 1
 #define CONFIG_FATFS_CODEPAGE_850 1
@@ -291,7 +292,6 @@
 #define CONFIG_ESP32_DEBUG_STUBS_ENABLE 1
 #define CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT 30
 #define CONFIG_TCPIP_LWIP 1
-#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST 1
 #define CONFIG_REDUCE_PHY_TX_POWER 1
 #define CONFIG_BOOTLOADER_WDT_TIME_MS 9000
 #define CONFIG_FREERTOS_CORETIMER_0 1

diff --git a/tools/sdk/lib/libapp_trace.a b/tools/sdk/lib/libapp_trace.a
diff --git a/tools/sdk/lib/libapp_update.a b/tools/sdk/lib/libapp_update.a
diff --git a/tools/sdk/lib/libasio.a b/tools/sdk/lib/libasio.a
diff --git a/tools/sdk/lib/libbootloader_support.a b/tools/sdk/lib/libbootloader_support.a
diff --git a/tools/sdk/lib/libbt.a b/tools/sdk/lib/libbt.a
diff --git a/tools/sdk/lib/libcoap.a b/tools/sdk/lib/libcoap.a
diff --git a/tools/sdk/lib/libcoexist.a b/tools/sdk/lib/libcoexist.a
diff --git a/tools/sdk/lib/libconsole.a b/tools/sdk/lib/libconsole.a
diff --git a/tools/sdk/lib/libcore.a b/tools/sdk/lib/libcore.a
diff --git a/tools/sdk/lib/libcxx.a b/tools/sdk/lib/libcxx.a
diff --git a/tools/sdk/lib/libdriver.a b/tools/sdk/lib/libdriver.a
diff --git a/tools/sdk/lib/libesp-tls.a b/tools/sdk/lib/libesp-tls.a
diff --git a/tools/sdk/lib/libesp32-camera.a b/tools/sdk/lib/libesp32-camera.a
diff --git a/tools/sdk/lib/libesp32.a b/tools/sdk/lib/libesp32.a
diff --git a/tools/sdk/lib/libesp_adc_cal.a b/tools/sdk/lib/libesp_adc_cal.a
diff --git a/tools/sdk/lib/libesp_event.a b/tools/sdk/lib/libesp_event.a
diff --git a/tools/sdk/lib/libesp_http_client.a b/tools/sdk/lib/libesp_http_client.a
diff --git a/tools/sdk/lib/libesp_http_server.a b/tools/sdk/lib/libesp_http_server.a
diff --git a/tools/sdk/lib/libesp_https_ota.a b/tools/sdk/lib/libesp_https_ota.a
diff --git a/tools/sdk/lib/libesp_ringbuf.a b/tools/sdk/lib/libesp_ringbuf.a
diff --git a/tools/sdk/lib/libespnow.a b/tools/sdk/lib/libespnow.a
diff --git a/tools/sdk/lib/libethernet.a b/tools/sdk/lib/libethernet.a
diff --git a/tools/sdk/lib/libexpat.a b/tools/sdk/lib/libexpat.a
diff --git a/tools/sdk/lib/libface_detection.a b/tools/sdk/lib/libface_detection.a
diff --git a/tools/sdk/lib/libface_recognition.a b/tools/sdk/lib/libface_recognition.a
diff --git a/tools/sdk/lib/libfatfs.a b/tools/sdk/lib/libfatfs.a
diff --git a/tools/sdk/lib/libfb_gfx.a b/tools/sdk/lib/libfb_gfx.a
diff --git a/tools/sdk/lib/libfreemodbus.a b/tools/sdk/lib/libfreemodbus.a
diff --git a/tools/sdk/lib/libfreertos.a b/tools/sdk/lib/libfreertos.a
diff --git a/tools/sdk/lib/libheap.a b/tools/sdk/lib/libheap.a
diff --git a/tools/sdk/lib/libimage_util.a b/tools/sdk/lib/libimage_util.a
diff --git a/tools/sdk/lib/libjsmn.a b/tools/sdk/lib/libjsmn.a
diff --git a/tools/sdk/lib/libjson.a b/tools/sdk/lib/libjson.a
diff --git a/tools/sdk/lib/liblibsodium.a b/tools/sdk/lib/liblibsodium.a
diff --git a/tools/sdk/lib/liblog.a b/tools/sdk/lib/liblog.a
diff --git a/tools/sdk/lib/liblwip.a b/tools/sdk/lib/liblwip.a
diff --git a/tools/sdk/lib/libmbedtls.a b/tools/sdk/lib/libmbedtls.a
diff --git a/tools/sdk/lib/libmdns.a b/tools/sdk/lib/libmdns.a
diff --git a/tools/sdk/lib/libmesh.a b/tools/sdk/lib/libmesh.a
diff --git a/tools/sdk/lib/libmicro-ecc.a b/tools/sdk/lib/libmicro-ecc.a
diff --git a/tools/sdk/lib/libmqtt.a b/tools/sdk/lib/libmqtt.a
diff --git a/tools/sdk/lib/libnet80211.a b/tools/sdk/lib/libnet80211.a
diff --git a/tools/sdk/lib/libnewlib.a b/tools/sdk/lib/libnewlib.a
diff --git a/tools/sdk/lib/libnghttp.a b/tools/sdk/lib/libnghttp.a
diff --git a/tools/sdk/lib/libnvs_flash.a b/tools/sdk/lib/libnvs_flash.a
diff --git a/tools/sdk/lib/libopenssl.a b/tools/sdk/lib/libopenssl.a
diff --git a/tools/sdk/lib/libpp.a b/tools/sdk/lib/libpp.a
diff --git a/tools/sdk/lib/libprotobuf-c.a b/tools/sdk/lib/libprotobuf-c.a
diff --git a/tools/sdk/lib/libprotocomm.a b/tools/sdk/lib/libprotocomm.a
diff --git a/tools/sdk/lib/libpthread.a b/tools/sdk/lib/libpthread.a
diff --git a/tools/sdk/lib/libsdmmc.a b/tools/sdk/lib/libsdmmc.a
diff --git a/tools/sdk/lib/libsmartconfig.a b/tools/sdk/lib/libsmartconfig.a
diff --git a/tools/sdk/lib/libsmartconfig_ack.a b/tools/sdk/lib/libsmartconfig_ack.a
diff --git a/tools/sdk/lib/libsoc.a b/tools/sdk/lib/libsoc.a
diff --git a/tools/sdk/lib/libspi_flash.a b/tools/sdk/lib/libspi_flash.a
diff --git a/tools/sdk/lib/libspiffs.a b/tools/sdk/lib/libspiffs.a
diff --git a/tools/sdk/lib/libtcp_transport.a b/tools/sdk/lib/libtcp_transport.a
diff --git a/tools/sdk/lib/libtcpip_adapter.a b/tools/sdk/lib/libtcpip_adapter.a
diff --git a/tools/sdk/lib/libulp.a b/tools/sdk/lib/libulp.a
diff --git a/tools/sdk/lib/libvfs.a b/tools/sdk/lib/libvfs.a
diff --git a/tools/sdk/lib/libwear_levelling.a b/tools/sdk/lib/libwear_levelling.a
diff --git a/tools/sdk/lib/libwifi_provisioning.a b/tools/sdk/lib/libwifi_provisioning.a
diff --git a/tools/sdk/lib/libwpa.a b/tools/sdk/lib/libwpa.a
diff --git a/tools/sdk/lib/libwpa2.a b/tools/sdk/lib/libwpa2.a
diff --git a/tools/sdk/lib/libwpa_supplicant.a b/tools/sdk/lib/libwpa_supplicant.a
diff --git a/tools/sdk/lib/libwps.a b/tools/sdk/lib/libwps.a
diff --git a/tools/sdk/lib/libxtensa-debug-module.a b/tools/sdk/lib/libxtensa-debug-module.a
diff --git a/tools/sdk/sdkconfig b/tools/sdk/sdkconfig
@@ -293,7 +293,7 @@ CONFIG_SPIRAM_SPEED_40M=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
 CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
-CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=y
+CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=
 
 #
@@ -430,7 +430,7 @@ CONFIG_PM_ENABLE=
 # Camera configuration
 #
 CONFIG_OV2640_SUPPORT=y
-CONFIG_OV7725_SUPPORT=
+CONFIG_OV7725_SUPPORT=y
 CONFIG_OV3660_SUPPORT=y
 CONFIG_SCCB_HARDWARE_I2C=y
 CONFIG_CAMERA_CORE0=
@@ -630,7 +630,6 @@ CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES=
 CONFIG_TCP_OVERSIZE_MSS=y
 CONFIG_TCP_OVERSIZE_QUARTER_MSS=
 CONFIG_TCP_OVERSIZE_DISABLE=
-CONFIG_LWIP_WND_SCALE=
 
 #
 # UDP