This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new a57e3f365a video.c: modify set_buf call seqence in start_capture
function.
a57e3f365a is described below
commit a57e3f365ad51c195007cced6992c29508a46922
Author: yaojingwei <[email protected]>
AuthorDate: Wed Nov 22 16:05:00 2023 +0800
video.c: modify set_buf call seqence in start_capture function.
To avoid losing the first frame, the set_buf needs to excute first. At the
same time, imgdata->start_capture should excuted before the
imgsensor->start_capture.
Signed-off-by: yaojingwei <[email protected]>
---
arch/arm/src/cxd56xx/cxd56_cisif.c | 4 ++++
arch/sim/src/sim/sim_camera.c | 4 ++++
drivers/video/goldfish_camera.c | 4 ++++
drivers/video/video.c | 20 +++++++++++++++++---
include/nuttx/video/imgdata.h | 6 ++++--
5 files changed, 33 insertions(+), 5 deletions(-)
diff --git a/arch/arm/src/cxd56xx/cxd56_cisif.c
b/arch/arm/src/cxd56xx/cxd56_cisif.c
index 5d7007ad5f..651e625bf0 100644
--- a/arch/arm/src/cxd56xx/cxd56_cisif.c
+++ b/arch/arm/src/cxd56xx/cxd56_cisif.c
@@ -223,6 +223,8 @@ static int cxd56_cisif_stop_capture(struct imgdata_s *data);
static int cxd56_cisif_validate_buf(struct imgdata_s *data,
uint8_t *addr, uint32_t size);
static int cxd56_cisif_set_buf(struct imgdata_s *data,
+ uint8_t nr_datafmt,
+ imgdata_format_t *datafmt,
uint8_t *addr, uint32_t size);
static const intc_func_table g_intcomp_func[] =
@@ -977,6 +979,8 @@ static int cxd56_cisif_validate_buf(struct imgdata_s *data,
}
static int cxd56_cisif_set_buf(struct imgdata_s *data,
+ uint8_t nr_datafmts,
+ FAR imgdata_format_t *datafmts,
uint8_t *addr, uint32_t size)
{
int ret;
diff --git a/arch/sim/src/sim/sim_camera.c b/arch/sim/src/sim/sim_camera.c
index ffd3dcc132..4818f25e52 100644
--- a/arch/sim/src/sim/sim_camera.c
+++ b/arch/sim/src/sim/sim_camera.c
@@ -91,6 +91,8 @@ static int sim_camera_data_start_capture(struct imgdata_s
*data,
void *arg);
static int sim_camera_data_stop_capture(struct imgdata_s *data);
static int sim_camera_data_set_buf(struct imgdata_s *data,
+ uint8_t nr_datafmts,
+ FAR imgdata_format_t *datafmts,
uint8_t *addr, uint32_t size);
/****************************************************************************
@@ -258,6 +260,8 @@ static int sim_camera_data_validate_buf(uint8_t *addr,
uint32_t size)
}
static int sim_camera_data_set_buf(struct imgdata_s *data,
+ uint8_t nr_datafmts,
+ FAR imgdata_format_t *datafmts,
uint8_t *addr, uint32_t size)
{
sim_camera_priv_t *priv = (sim_camera_priv_t *)data;
diff --git a/drivers/video/goldfish_camera.c b/drivers/video/goldfish_camera.c
index ad04c63204..a397b6e996 100644
--- a/drivers/video/goldfish_camera.c
+++ b/drivers/video/goldfish_camera.c
@@ -119,6 +119,8 @@ goldfish_camera_data_start_capture(FAR struct imgdata_s
*data,
FAR void *arg);
static int goldfish_camera_data_stop_capture(FAR struct imgdata_s *data);
static int goldfish_camera_data_set_buf(FAR struct imgdata_s *data,
+ uint8_t nr_datafmts,
+ FAR imgdata_format_t *datafmts,
FAR uint8_t *addr,
uint32_t size);
@@ -653,6 +655,8 @@ static int goldfish_camera_data_validate_buf(FAR uint8_t
*addr,
}
static int goldfish_camera_data_set_buf(FAR struct imgdata_s *data,
+ uint8_t nr_datafmts,
+ FAR imgdata_format_t *datafmts,
FAR uint8_t *addr,
uint32_t size)
{
diff --git a/drivers/video/video.c b/drivers/video/video.c
index c322bb895d..96ac3636dd 100644
--- a/drivers/video/video.c
+++ b/drivers/video/video.c
@@ -631,13 +631,14 @@ static int start_capture(FAR video_mng_t *vmng,
convert_to_imgsensorfmt(&fmt[VIDEO_FMT_SUB], &sf[IMGSENSOR_FMT_SUB]);
convert_to_imgsensorinterval(interval, &si);
+ IMGDATA_SET_BUF(vmng->imgdata,
+ nr_fmt, df, (FAR uint8_t *)bufaddr, bufsize);
+ IMGDATA_START_CAPTURE(vmng->imgdata,
+ nr_fmt, df, &di, video_complete_capture, vmng);
IMGSENSOR_START_CAPTURE(vmng->imgsensor,
type == V4L2_BUF_TYPE_VIDEO_CAPTURE ?
IMGSENSOR_STREAM_TYPE_VIDEO : IMGSENSOR_STREAM_TYPE_STILL,
nr_fmt, sf, &si);
- IMGDATA_START_CAPTURE(vmng->imgdata,
- nr_fmt, df, &di, video_complete_capture, vmng);
- IMGDATA_SET_BUF(vmng->imgdata, (FAR uint8_t *)bufaddr, bufsize);
return OK;
}
@@ -3311,6 +3312,8 @@ static int video_complete_capture(uint8_t err_code,
uint32_t datasize,
FAR vbuf_container_t *container = NULL;
enum v4l2_buf_type buf_type;
irqstate_t flags;
+ imgdata_format_t df[MAX_VIDEO_FMT];
+ video_format_t c_fmt[MAX_VIDEO_FMT];
flags = enter_critical_section();
@@ -3385,7 +3388,18 @@ static int video_complete_capture(uint8_t err_code,
uint32_t datasize,
}
else
{
+ get_clipped_format(type_inf->nr_fmt,
+ type_inf->fmt,
+ &type_inf->clip,
+ c_fmt);
+
+ convert_to_imgdatafmt(&c_fmt[VIDEO_FMT_MAIN],
+ &df[IMGDATA_FMT_MAIN]);
+ convert_to_imgdatafmt(&c_fmt[VIDEO_FMT_SUB], &df[IMGDATA_FMT_SUB]);
+
IMGDATA_SET_BUF(vmng->imgdata,
+ type_inf->nr_fmt,
+ df,
(FAR uint8_t *)container->buf.m.userptr,
container->buf.length);
container->buf.sequence = type_inf->seqnum++;
diff --git a/include/nuttx/video/imgdata.h b/include/nuttx/video/imgdata.h
index 105b97f6e1..03e03f7070 100644
--- a/include/nuttx/video/imgdata.h
+++ b/include/nuttx/video/imgdata.h
@@ -53,8 +53,8 @@
((d)->ops->init ? (d)->ops->init(d) : -ENOTTY)
#define IMGDATA_UNINIT(d) \
((d)->ops->uninit ? (d)->ops->uninit(d) : -ENOTTY)
-#define IMGDATA_SET_BUF(d, a, s) \
- ((d)->ops->set_buf ? (d)->ops->set_buf(d, a, s) : NULL)
+#define IMGDATA_SET_BUF(d, n, f, a, s) \
+ ((d)->ops->set_buf ? (d)->ops->set_buf(d, n, f, a, s) : NULL)
#define IMGDATA_VALIDATE_FRAME_SETTING(d, n, f, i) \
((d)->ops->validate_frame_setting ? \
(d)->ops->validate_frame_setting(d, n, f, i) : -ENOTTY)
@@ -96,6 +96,8 @@ struct imgdata_ops_s
CODE int (*uninit)(FAR struct imgdata_s *data);
CODE int (*set_buf)(FAR struct imgdata_s *data,
+ uint8_t nr_datafmts,
+ FAR imgdata_format_t *datafmts,
uint8_t *addr, uint32_t size);
CODE int (*validate_frame_setting)(FAR struct imgdata_s *data,
