mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Remove JPEG enable/disable USBDBG command.
This commit is contained in:
parent
37ec0095fc
commit
4211e37c53
@ -736,7 +736,7 @@ int ov2640_init(sensor_t *sensor)
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_HSYNC, 0);
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 1);
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 0);
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_HW_JPEG, 1);
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -408,6 +408,7 @@ int ov7725_init(sensor_t *sensor)
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_HSYNC, 0);
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 1);
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 1);
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -418,6 +418,7 @@ int ov9650_init(sensor_t *sensor)
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_HSYNC, 0);
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_PIXCK, 1);
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_FSYNC, 0);
|
||||
SENSOR_HW_FLAGS_SET(sensor, SENSOR_HW_FLAGS_JPEGE, 0);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -288,9 +288,6 @@ int sensor_init()
|
||||
return -5;
|
||||
}
|
||||
|
||||
// Enable framebuffer JPEG compression by default
|
||||
sensor_enable_jpeg(true);
|
||||
|
||||
/* All good! */
|
||||
return 0;
|
||||
}
|
||||
@ -321,13 +318,6 @@ int sensor_get_id()
|
||||
return sensor.id.PID;
|
||||
}
|
||||
|
||||
int sensor_enable_jpeg(bool enable)
|
||||
{
|
||||
SENSOR_HW_FLAGS_CLR(&sensor, SENSOR_HW_FLAGS_SW_JPEG);
|
||||
SENSOR_HW_FLAGS_SET(&sensor, SENSOR_HW_FLAGS_SW_JPEG, enable);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int sensor_read_reg(uint8_t reg)
|
||||
{
|
||||
return SCCB_Read(sensor.slv_addr, reg);
|
||||
@ -623,8 +613,7 @@ int sensor_snapshot(image_t *image, line_filter_t line_filter_func, void *line_f
|
||||
// Compress the framebuffer for the IDE preview, only if it's not the first frame,
|
||||
// the framebuffer is enabled and the image sensor does not support JPEG encoding.
|
||||
// Note: This doesn't run unless the IDE is connected and the framebuffer is enabled.
|
||||
if ((fb->bpp == 1 || fb->bpp == 2) && JPEG_FB()->enabled && sensor.pixformat
|
||||
!= PIXFORMAT_JPEG && SENSOR_HW_FLAGS_GET(&sensor, SENSOR_HW_FLAGS_SW_JPEG)) {
|
||||
if ((fb->bpp == 1 || fb->bpp == 2) && JPEG_FB()->enabled && sensor.pixformat != PIXFORMAT_JPEG) {
|
||||
// Lock FB
|
||||
if (mutex_try_lock(&JPEG_FB()->lock, MUTEX_TID_OMV)) {
|
||||
// Set JPEG src and dst images.
|
||||
|
||||
@ -87,8 +87,7 @@ typedef void (*line_filter_t) (uint8_t *src, int src_stride, uint8_t *dst, int d
|
||||
#define SENSOR_HW_FLAGS_HSYNC (1) // horizontal sync polarity.
|
||||
#define SENSOR_HW_FLAGS_PIXCK (2) // pixel clock edge.
|
||||
#define SENSOR_HW_FLAGS_FSYNC (3) // hardware frame sync.
|
||||
#define SENSOR_HW_FLAGS_HW_JPEG (4) // hardware JPEG encoder.
|
||||
#define SENSOR_HW_FLAGS_SW_JPEG (5) // software JPEG encoder enable/disable.
|
||||
#define SENSOR_HW_FLAGS_JPEGE (4) // hardware JPEG encoder.
|
||||
#define SENSOR_HW_FLAGS_GET(s, x) ((s)->hw_flags & (1<<x))
|
||||
#define SENSOR_HW_FLAGS_SET(s, x, v) ((s)->hw_flags |= (v<<x))
|
||||
#define SENSOR_HW_FLAGS_CLR(s, x) ((s)->hw_flags &= ~(1<<x))
|
||||
@ -152,10 +151,6 @@ int sensor_read_reg(uint8_t reg);
|
||||
// Write a sensor register.
|
||||
int sensor_write_reg(uint8_t reg, uint8_t val);
|
||||
|
||||
// Enable/disable framebuffer JPEG compression.
|
||||
// Note: Has nothing to do with HW JPEG.
|
||||
int sensor_enable_jpeg(bool enable);
|
||||
|
||||
// Set the sensor pixel format.
|
||||
int sensor_set_pixformat(pixformat_t pixformat);
|
||||
|
||||
|
||||
@ -302,13 +302,6 @@ void usbdbg_control(void *buffer, uint8_t request, uint32_t length)
|
||||
break;
|
||||
}
|
||||
|
||||
case USBDBG_JPEG_ENABLE: {
|
||||
int16_t enable = *((int16_t*)buffer);
|
||||
sensor_enable_jpeg(enable);
|
||||
cmd = USBDBG_NONE;
|
||||
break;
|
||||
}
|
||||
|
||||
case USBDBG_TX_BUF:
|
||||
case USBDBG_TX_BUF_LEN:
|
||||
xfer_bytes = 0;
|
||||
|
||||
@ -44,7 +44,6 @@ enum usbdbg_cmd {
|
||||
USBDBG_ATTR_WRITE =0x0B,
|
||||
USBDBG_SYS_RESET =0x0C,
|
||||
USBDBG_FB_ENABLE =0x0D,
|
||||
USBDBG_JPEG_ENABLE =0x0E,
|
||||
USBDBG_TX_BUF_LEN =0x8E,
|
||||
USBDBG_TX_BUF =0x8F
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user