MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/v4l2_context: remove reinit variable 

Cleanup after commit 3fc72c9fc1.
Fixes coverity ticket #1497095.

Reviewed-by: Andriy Gelman <andriy.gelman@gmail.com>
Signed-off-by: Ming Qian <ming.qian@nxp.com>
This commit is contained in:
Ming Qian 2022-01-04 17:08:34 +08:00 committed by Andriy Gelman
parent 9c58fd2226
commit 35a9307beb
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libavcodec/v4l2_context.c
View File

@ -178,7 +178,7 @@ static int v4l2_handle_event(V4L2Context *ctx)
V4L2m2mContext *s = ctx_to_m2mctx(ctx); V4L2m2mContext *s = ctx_to_m2mctx(ctx);
struct v4l2_format cap_fmt = s->capture.format; struct v4l2_format cap_fmt = s->capture.format;
struct v4l2_event evt = { 0 }; struct v4l2_event evt = { 0 };
int reinit, ret; int ret;
ret = ioctl(s->fd, VIDIOC_DQEVENT, &evt); ret = ioctl(s->fd, VIDIOC_DQEVENT, &evt);
if (ret < 0) { if (ret < 0) {
@ -200,8 +200,7 @@ static int v4l2_handle_event(V4L2Context *ctx)
return 0; return 0;
} }
reinit = v4l2_resolution_changed(&s->capture, &cap_fmt); if (v4l2_resolution_changed(&s->capture, &cap_fmt)) {
if (reinit) {
s->capture.height = v4l2_get_height(&cap_fmt); s->capture.height = v4l2_get_height(&cap_fmt);
s->capture.width = v4l2_get_width(&cap_fmt); s->capture.width = v4l2_get_width(&cap_fmt);
s->capture.sample_aspect_ratio = v4l2_get_sar(&s->capture); s->capture.sample_aspect_ratio = v4l2_get_sar(&s->capture);
@ -210,28 +209,20 @@ static int v4l2_handle_event(V4L2Context *ctx)
return 0; return 0;
} }
if (reinit) s->reinit = 1;
s->reinit = 1;
if (reinit) { if (s->avctx)
if (s->avctx) ret = ff_set_dimensions(s->avctx, s->capture.width, s->capture.height);
ret = ff_set_dimensions(s->avctx, s->capture.width, s->capture.height); if (ret < 0)
if (ret < 0) av_log(logger(ctx), AV_LOG_WARNING, "update avcodec height and width\n");
av_log(logger(ctx), AV_LOG_WARNING, "update avcodec height and width\n");
ret = ff_v4l2_m2m_codec_reinit(s); ret = ff_v4l2_m2m_codec_reinit(s);
if (ret) { if (ret) {
av_log(logger(ctx), AV_LOG_ERROR, "v4l2_m2m_codec_reinit\n"); av_log(logger(ctx), AV_LOG_ERROR, "v4l2_m2m_codec_reinit\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);
}
goto reinit_run;
} }
/* dummy event received */
return 0;
/* reinit executed */ /* reinit executed */
reinit_run:
return 1; return 1;
} }