OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drivers/video: Add stop_capture function 

and ensure imgsensor_ops_s::stop_capture get called

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-12-05 03:10:15 +08:00 committed by archer
parent eb4dabaac6
commit 21e35362a3
1 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/video/video.c
View File

@ -694,6 +694,24 @@ static int start_capture(enum v4l2_buf_type type,
return OK;
}
static int stop_capture(enum v4l2_buf_type type)
{
ASSERT(g_video_sensor_ops && g_video_data_ops);
if (g_video_data_ops->stop_capture == NULL ||
g_video_sensor_ops->stop_capture == NULL)
{
return -ENOTTY;
}
g_video_data_ops->stop_capture();
g_video_sensor_ops->stop_capture(
type == V4L2_BUF_TYPE_VIDEO_CAPTURE ?
IMGSENSOR_STREAM_TYPE_VIDEO : IMGSENSOR_STREAM_TYPE_STILL);
return OK;
}
static void change_video_state(FAR video_mng_t *vmng,
enum video_state_e next_state)
{
@ -726,7 +744,7 @@ static void change_video_state(FAR video_mng_t *vmng,
if ((current_state == VIDEO_STATE_CAPTURE) &&
(next_state != VIDEO_STATE_CAPTURE))
{
g_video_data_ops->stop_capture();
stop_capture(V4L2_BUF_TYPE_VIDEO_CAPTURE);
}
}
@ -975,16 +993,20 @@ static void cleanup_scenes_parameter(void)
static void cleanup_resources(FAR video_mng_t *vmng)
{
/* clean up resource */
/* If in capture, stop */
if ((vmng->video_inf.state == VIDEO_STATE_CAPTURE) ||
(vmng->still_inf.state == VIDEO_STATE_CAPTURE))
if (vmng->video_inf.state == VIDEO_STATE_CAPTURE)
{
/* If in capture, stop */
g_video_data_ops->stop_capture();
stop_capture(V4L2_BUF_TYPE_VIDEO_CAPTURE);
}
if (vmng->still_inf.state == VIDEO_STATE_CAPTURE)
{
stop_capture(V4L2_BUF_TYPE_STILL_CAPTURE);
}
/* clean up resource */
cleanup_streamresources(&vmng->video_inf);
cleanup_streamresources(&vmng->still_inf);
cleanup_scenes_parameter();
@ -2025,7 +2047,7 @@ static int video_takepict_stop(FAR struct video_mng_s *vmng, bool halfpush)
flags = enter_critical_section();
if (vmng->still_inf.state == VIDEO_STATE_CAPTURE)
{
g_video_data_ops->stop_capture();
stop_capture(V4L2_BUF_TYPE_STILL_CAPTURE);
}
leave_critical_section(flags);
@ -3412,7 +3434,7 @@ static int video_complete_capture(uint8_t err_code, uint32_t datasize)
if (type_inf->remaining_capnum == 0)
{
g_video_data_ops->stop_capture();
stop_capture(buf_type);
type_inf->state = VIDEO_STATE_STREAMOFF;
/* If stop still stream, notify it to video stream */
@ -3430,7 +3452,7 @@ static int video_complete_capture(uint8_t err_code, uint32_t datasize)
container = video_framebuff_get_vacant_container(&type_inf->bufinf);
if (!container)
{
g_video_data_ops->stop_capture();
stop_capture(buf_type);
type_inf->state = VIDEO_STATE_STREAMON;
}
else