mirror of
https://github.com/openmv/openmv.git
synced 2025-11-04 14:49:50 +08:00
Add disable_fb.
Allow user control to disable the frame buffer. Necessary for high speed frame streaming.
This commit is contained in:
parent
0f0ff4b247
commit
98e1a1e51d
@ -18,6 +18,16 @@ framebuffer_t *fb_framebuffer = (framebuffer_t *) &_fb_base;
|
|||||||
extern char _jpeg_buf;
|
extern char _jpeg_buf;
|
||||||
jpegbuffer_t *jpeg_fb_framebuffer = (jpegbuffer_t *) &_jpeg_buf;
|
jpegbuffer_t *jpeg_fb_framebuffer = (jpegbuffer_t *) &_jpeg_buf;
|
||||||
|
|
||||||
|
void set_fb_streaming_disabled(bool en)
|
||||||
|
{
|
||||||
|
MAIN_FB()->fb_streaming_disable = en;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool is_fb_streaming_disabled()
|
||||||
|
{
|
||||||
|
return MAIN_FB()->fb_streaming_disable;
|
||||||
|
}
|
||||||
|
|
||||||
int encode_for_ide_new_size(image_t *img)
|
int encode_for_ide_new_size(image_t *img)
|
||||||
{
|
{
|
||||||
return (((img->bpp * 8) + 5) / 6) + 2;
|
return (((img->bpp * 8) + 5) / 6) + 2;
|
||||||
@ -82,7 +92,8 @@ void fb_update_jpeg_buffer()
|
|||||||
{
|
{
|
||||||
static int overflow_count = 0;
|
static int overflow_count = 0;
|
||||||
|
|
||||||
if ((MAIN_FB()->bpp > 3) && JPEG_FB()->enabled) {
|
if ((!MAIN_FB()->fb_streaming_disable) && JPEG_FB()->enabled) {
|
||||||
|
if (MAIN_FB()->bpp > 3) {
|
||||||
bool does_not_fit = false;
|
bool does_not_fit = false;
|
||||||
// Lock FB
|
// Lock FB
|
||||||
if (mutex_try_lock(&JPEG_FB()->lock, MUTEX_TID_OMV)) {
|
if (mutex_try_lock(&JPEG_FB()->lock, MUTEX_TID_OMV)) {
|
||||||
@ -107,7 +118,7 @@ void fb_update_jpeg_buffer()
|
|||||||
(MP_PYTHON_PRINTER)->print_strn((MP_PYTHON_PRINTER)->data, (const char *) temp, new_size);
|
(MP_PYTHON_PRINTER)->print_strn((MP_PYTHON_PRINTER)->data, (const char *) temp, new_size);
|
||||||
fb_alloc_free_till_mark();
|
fb_alloc_free_till_mark();
|
||||||
}
|
}
|
||||||
} else if ((MAIN_FB()->bpp >= 0) && JPEG_FB()->enabled) {
|
} else if (MAIN_FB()->bpp >= 0) {
|
||||||
// Lock FB
|
// Lock FB
|
||||||
if (mutex_try_lock(&JPEG_FB()->lock, MUTEX_TID_OMV)) {
|
if (mutex_try_lock(&JPEG_FB()->lock, MUTEX_TID_OMV)) {
|
||||||
// Set JPEG src and dst images.
|
// Set JPEG src and dst images.
|
||||||
@ -142,4 +153,5 @@ void fb_update_jpeg_buffer()
|
|||||||
mutex_unlock(&JPEG_FB()->lock, MUTEX_TID_OMV);
|
mutex_unlock(&JPEG_FB()->lock, MUTEX_TID_OMV);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,7 +19,7 @@ typedef struct framebuffer {
|
|||||||
int32_t w,h;
|
int32_t w,h;
|
||||||
int32_t u,v;
|
int32_t u,v;
|
||||||
int32_t bpp;
|
int32_t bpp;
|
||||||
int32_t padding;
|
int32_t fb_streaming_disable;
|
||||||
// NOTE: This buffer must be aligned on a 16 byte boundary
|
// NOTE: This buffer must be aligned on a 16 byte boundary
|
||||||
uint8_t pixels[];
|
uint8_t pixels[];
|
||||||
} framebuffer_t;
|
} framebuffer_t;
|
||||||
@ -47,6 +47,10 @@ extern jpegbuffer_t *jpeg_fb_framebuffer;
|
|||||||
// Use this macro to get a pointer to the free SRAM area located after the framebuffer.
|
// Use this macro to get a pointer to the free SRAM area located after the framebuffer.
|
||||||
#define JPEG_FB_PIXELS() (JPEG_FB()->pixels + JPEG_FB()->size)
|
#define JPEG_FB_PIXELS() (JPEG_FB()->pixels + JPEG_FB()->size)
|
||||||
|
|
||||||
|
// Force fb streaming to the IDE off.
|
||||||
|
void set_fb_streaming_disabled(bool en);
|
||||||
|
bool is_fb_streaming_disabled();
|
||||||
|
|
||||||
// Encode jpeg data for transmission over a text channel.
|
// Encode jpeg data for transmission over a text channel.
|
||||||
int encode_for_ide_new_size(image_t *img);
|
int encode_for_ide_new_size(image_t *img);
|
||||||
void encode_for_ide(uint8_t *ptr, image_t *img);
|
void encode_for_ide(uint8_t *ptr, image_t *img);
|
||||||
|
|||||||
@ -10,6 +10,7 @@
|
|||||||
*/
|
*/
|
||||||
#include <mp.h>
|
#include <mp.h>
|
||||||
#include "usbdbg.h"
|
#include "usbdbg.h"
|
||||||
|
#include "framebuffer.h"
|
||||||
#include "omv_boardconfig.h"
|
#include "omv_boardconfig.h"
|
||||||
|
|
||||||
static mp_obj_t py_omv_version_string()
|
static mp_obj_t py_omv_version_string()
|
||||||
@ -48,6 +49,16 @@ static mp_obj_t py_omv_board_id()
|
|||||||
}
|
}
|
||||||
STATIC MP_DEFINE_CONST_FUN_OBJ_0(py_omv_board_id_obj, py_omv_board_id);
|
STATIC MP_DEFINE_CONST_FUN_OBJ_0(py_omv_board_id_obj, py_omv_board_id);
|
||||||
|
|
||||||
|
static mp_obj_t py_omv_disable_fb(uint n_args, const mp_obj_t *args)
|
||||||
|
{
|
||||||
|
if (!n_args) {
|
||||||
|
return mp_obj_new_bool(is_fb_streaming_disabled());
|
||||||
|
}
|
||||||
|
set_fb_streaming_disabled(mp_obj_get_int(args[0]));
|
||||||
|
return mp_const_none;
|
||||||
|
}
|
||||||
|
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(py_omv_disable_fb_obj, 0, 1, py_omv_disable_fb);
|
||||||
|
|
||||||
static const mp_rom_map_elem_t globals_dict_table[] = {
|
static const mp_rom_map_elem_t globals_dict_table[] = {
|
||||||
{ MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_omv) },
|
{ MP_ROM_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_omv) },
|
||||||
{ MP_ROM_QSTR(MP_QSTR_version_major), MP_ROM_INT(FIRMWARE_VERSION_MAJOR) },
|
{ MP_ROM_QSTR(MP_QSTR_version_major), MP_ROM_INT(FIRMWARE_VERSION_MAJOR) },
|
||||||
@ -56,7 +67,8 @@ static const mp_rom_map_elem_t globals_dict_table[] = {
|
|||||||
{ MP_ROM_QSTR(MP_QSTR_version_string), MP_ROM_PTR(&py_omv_version_string_obj) },
|
{ MP_ROM_QSTR(MP_QSTR_version_string), MP_ROM_PTR(&py_omv_version_string_obj) },
|
||||||
{ MP_ROM_QSTR(MP_QSTR_arch), MP_ROM_PTR(&py_omv_arch_obj) },
|
{ MP_ROM_QSTR(MP_QSTR_arch), MP_ROM_PTR(&py_omv_arch_obj) },
|
||||||
{ MP_ROM_QSTR(MP_QSTR_board_type), MP_ROM_PTR(&py_omv_board_type_obj) },
|
{ MP_ROM_QSTR(MP_QSTR_board_type), MP_ROM_PTR(&py_omv_board_type_obj) },
|
||||||
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&py_omv_board_id_obj) }
|
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&py_omv_board_id_obj) },
|
||||||
|
{ MP_ROM_QSTR(MP_QSTR_disable_fb), MP_ROM_PTR(&py_omv_disable_fb_obj) }
|
||||||
};
|
};
|
||||||
|
|
||||||
STATIC MP_DEFINE_CONST_DICT(globals_dict, globals_dict_table);
|
STATIC MP_DEFINE_CONST_DICT(globals_dict, globals_dict_table);
|
||||||
|
|||||||
@ -18,6 +18,7 @@ Q(version_string)
|
|||||||
Q(arch)
|
Q(arch)
|
||||||
Q(board_type)
|
Q(board_type)
|
||||||
Q(board_id)
|
Q(board_id)
|
||||||
|
Q(disable_fb)
|
||||||
|
|
||||||
// Image module
|
// Image module
|
||||||
Q(image)
|
Q(image)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user