RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-21 15:00:27 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/v4l2_context: don't reinit output queue on dynamic resolution change event

Browse Source 
Reference:
linux/Documentation/userspace-api/media/v4l/dev-decoder.rst
    "During the resolution change sequence, the OUTPUT queue must remain
     streaming. Calling VIDIOC_STREAMOFF() on the OUTPUT queue would
     abort the sequence and initiate a seek.

     In principle, the OUTPUT queue operates separately from the CAPTURE
     queue and this remains true for the duration of the entire
     resolution change sequence as well."

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:30 +08:00 committed by Andriy Gelman
parent ebf1d0f4bb
commit df701ed0b5
1 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/v4l2_context.c
View File

@ -162,9 +162,8 @@ 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_format out_fmt = s->output.format;
struct v4l2_event evt = { 0 }; struct v4l2_event evt = { 0 };
int full_reinit, reinit, ret; int reinit, ret;
ret = ioctl(s->fd, VIDIOC_DQEVENT, &evt); ret = ioctl(s->fd, VIDIOC_DQEVENT, &evt);
if (ret < 0) { if (ret < 0) {
@ -180,25 +179,12 @@ static int v4l2_handle_event(V4L2Context *ctx)
if (evt.type != V4L2_EVENT_SOURCE_CHANGE) if (evt.type != V4L2_EVENT_SOURCE_CHANGE)
return 0; return 0;
ret = ioctl(s->fd, VIDIOC_G_FMT, &out_fmt);
if (ret) {
av_log(logger(ctx), AV_LOG_ERROR, "%s VIDIOC_G_FMT\n", s->output.name);
return 0;
}
ret = ioctl(s->fd, VIDIOC_G_FMT, &cap_fmt); ret = ioctl(s->fd, VIDIOC_G_FMT, &cap_fmt);
if (ret) { if (ret) {
av_log(logger(ctx), AV_LOG_ERROR, "%s VIDIOC_G_FMT\n", s->capture.name); av_log(logger(ctx), AV_LOG_ERROR, "%s VIDIOC_G_FMT\n", s->capture.name);
return 0; return 0;
} }
full_reinit = v4l2_resolution_changed(&s->output, &out_fmt);
if (full_reinit) {
s->output.height = v4l2_get_height(&out_fmt);
s->output.width = v4l2_get_width(&out_fmt);
s->output.sample_aspect_ratio = v4l2_get_sar(&s->output);
}
reinit = v4l2_resolution_changed(&s->capture, &cap_fmt); reinit = v4l2_resolution_changed(&s->capture, &cap_fmt);
if (reinit) { if (reinit) {
s->capture.height = v4l2_get_height(&cap_fmt); s->capture.height = v4l2_get_height(&cap_fmt);
@ -206,18 +192,9 @@ static int v4l2_handle_event(V4L2Context *ctx)
s->capture.sample_aspect_ratio = v4l2_get_sar(&s->capture); s->capture.sample_aspect_ratio = v4l2_get_sar(&s->capture);
} }
if (full_reinit || reinit) if (reinit)
s->reinit = 1; s->reinit = 1;
if (full_reinit) {
ret = ff_v4l2_m2m_codec_full_reinit(s);
if (ret) {
av_log(logger(ctx), AV_LOG_ERROR, "v4l2_m2m_codec_full_reinit\n");
return AVERROR(EINVAL);
}
goto reinit_run;
}
if (reinit) { 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);