MrUnknownDE/OpenIris-ESPIDF
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/OpenIris-ESPIDF.git synced 2026-04-19 06:23:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup UVC implementation

Browse Source
This commit is contained in:
Lorow
2024-10-22 23:42:03 +02:00
parent 23bb930255
commit 19a2c25ce3
4 changed files with 11 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/UVCStream/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
idf_component_register(SRCS "UVCStream/UVCStream.cpp"
INCLUDE_DIRS "UVCStream"
REQUIRES esp_timer esp32-camera StateManager usb_device_uvc
REQUIRES esp_timer esp32-camera StateManager usb_device_uvc CameraManager
)

116
components/UVCStream/UVCStream/UVCStream.cpp
View File

@@ -3,114 +3,6 @@ constexpr int UVC_MAX_FRAMESIZE_SIZE(75 * 1024);
static const char *UVC_STREAM_TAG = "[UVC DEVICE]";
// debug only
static esp_err_t camera_init(int xclk_freq_hz, pixformat_t pixel_format, framesize_t frame_size, int jpeg_quality, uint8_t fb_count)
{
static bool inited = false;
static int cur_xclk_freq_hz = 20000000;
static pixformat_t cur_pixel_format = PIXFORMAT_JPEG;
static framesize_t cur_frame_size = FRAMESIZE_96X96;
static int cur_jpeg_quality = 0;
static uint8_t cur_fb_count = 0;
if ((inited && cur_xclk_freq_hz == xclk_freq_hz && cur_pixel_format == pixel_format && cur_frame_size == frame_size && cur_fb_count == fb_count && cur_jpeg_quality == jpeg_quality))
{
ESP_LOGD(UVC_STREAM_TAG, "camera already inited");
return ESP_OK;
}
else if (inited)
{
esp_camera_return_all();
esp_camera_deinit();
inited = false;
ESP_LOGI(UVC_STREAM_TAG, "camera RESTART");
}
camera_config_t camera_config = {
.pin_pwdn = -1, // CAM_PIN_PWDN,
.pin_reset = -1, // CAM_PIN_RESET,
.pin_xclk = 10, // CAM_PIN_XCLK,
.pin_sccb_sda = 40, // CAM_PIN_SIOD,
.pin_sccb_scl = 39, // CAM_PIN_SIOC,
.pin_d7 = 48, /// CAM_PIN_D7,
.pin_d6 = 11, /// CAM_PIN_D6,
.pin_d5 = 12, // CAM_PIN_D5,
.pin_d4 = 14, // CAM_PIN_D4,
.pin_d3 = 16, // CAM_PIN_D3,
.pin_d2 = 18, // CAM_PIN_D2,
.pin_d1 = 17, // CAM_PIN_D1,
.pin_d0 = 15, // CAM_PIN_D0,
.pin_vsync = 38, // CAM_PIN_VSYNC,
.pin_href = 47, // CAM_PIN_HREF,
.pin_pclk = 13, // CAM_PIN_PCLK,
.xclk_freq_hz = xclk_freq_hz,
.ledc_timer = LEDC_TIMER_0,
.ledc_channel = LEDC_CHANNEL_0,
.pixel_format = pixel_format,
.frame_size = frame_size,
.jpeg_quality = jpeg_quality,
.fb_count = fb_count,
.fb_location = CAMERA_FB_IN_PSRAM,
.grab_mode = CAMERA_GRAB_WHEN_EMPTY,
};
// initialize the camera sensor
esp_err_t ret = esp_camera_init(&camera_config);
if (ret != ESP_OK)
{
return ret;
}
// Get the sensor object, and then use some of its functions to adjust the parameters when taking a photo.
// Note: Do not call functions that set resolution, set picture format and PLL clock,
// If you need to reset the appeal parameters, please reinitialize the sensor.
sensor_t *s = esp_camera_sensor_get();
s->set_vflip(s, 1); // flip it back
// initial sensors are flipped vertically and colors are a bit saturated
if (s->id.PID == OV3660_PID)
{
s->set_brightness(s, 1); // up the blightness just a bit
s->set_saturation(s, -2); // lower the saturation
}
if (s->id.PID == OV3660_PID || s->id.PID == OV2640_PID)
{
s->set_vflip(s, 1); // flip it back
}
else if (s->id.PID == GC0308_PID)
{
s->set_hmirror(s, 0);
}
else if (s->id.PID == GC032A_PID)
{
s->set_vflip(s, 1);
}
// Get the basic information of the sensor.
camera_sensor_info_t *s_info = esp_camera_sensor_get_info(&(s->id));
if (ESP_OK == ret && PIXFORMAT_JPEG == pixel_format && s_info->support_jpeg == true)
{
cur_xclk_freq_hz = xclk_freq_hz;
cur_pixel_format = pixel_format;
cur_frame_size = frame_size;
cur_jpeg_quality = jpeg_quality;
cur_fb_count = fb_count;
inited = true;
}
else
{
ESP_LOGE(UVC_STREAM_TAG, "JPEG format is not supported");
return ESP_ERR_NOT_SUPPORTED;
}
return ret;
}
static esp_err_t UVCStreamHelpers::camera_start_cb(uvc_format_t format, int width, int height, int rate, void *cb_ctx)
{
(void)cb_ctx;
@@ -136,12 +28,8 @@ static esp_err_t UVCStreamHelpers::camera_start_cb(uvc_format_t format, int widt
return ESP_ERR_NOT_SUPPORTED;
}
esp_err_t ret = camera_init(20000000, PIXFORMAT_JPEG, frame_size, jpeg_quality, 2);
if (ret != ESP_OK)
{
ESP_LOGE(UVC_STREAM_TAG, "camera init failed");
return ret;
}
cameraHandler.setCameraResolution(frame_size);
cameraHandler.resetCamera(0);
return ESP_OK;
}

5
components/UVCStream/UVCStream/UVCStream.hpp
View File

@@ -3,9 +3,14 @@
#define UVCSTREAM_HPP
#include "esp_timer.h"
#include "esp_camera.h"
#include <CameraManager.hpp>
#include "esp_log.h"
#include "usb_device_uvc.h"
// we need access to the camera manager
// in order to update the frame settings
extern CameraManager cameraHandler;
namespace UVCStreamHelpers
{
// TODO move the camera handling code to the camera manager and have the uvc maanger initialize it in wired mode