mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-06 06:22:29 +00:00
Code Issues 1 Projects Releases Wiki Activity

v4l2src: handle resolution change when buffers are copied

Browse source 
When buffers are copied then GST_V4L2_FLOW_RESOLUTION_CHANGE is returned by
gst_v4l2_buffer_pool_process() so do renegotiation here as well.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4985>
This commit is contained in:
Michael Olbrich 2023-07-06 14:27:42 +02:00 committed by Tim-Philipp Müller
parent cdff561a76
commit 841902889b
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
subprojects/gst-plugins-good/sys/v4l2/gstv4l2src.c
View file

@ -1148,6 +1148,23 @@ gst_v4l2src_change_state (GstElement * element, GstStateChange transition)
return ret; return ret;
} }
static gboolean
gst_v4l2src_handle_resolution_change (GstV4l2Src * v4l2src)
{
GST_INFO_OBJECT (v4l2src, "Resolution change detected.");
/* It is required to always cycle through streamoff, we also need to
* streamoff in order to allow locking a new DV_TIMING which will
* influence the output of TRY_FMT */
gst_v4l2src_stop (GST_BASE_SRC (v4l2src));
/* Force renegotiation */
v4l2src->renegotiation_adjust = v4l2src->offset + 1;
v4l2src->pending_set_fmt = TRUE;
return gst_base_src_negotiate (GST_BASE_SRC (v4l2src));
}
static GstFlowReturn static GstFlowReturn
gst_v4l2src_create (GstPushSrc * src, GstBuffer ** buf) gst_v4l2src_create (GstPushSrc * src, GstBuffer ** buf)
{ {
@ -1166,18 +1183,7 @@ gst_v4l2src_create (GstPushSrc * src, GstBuffer ** buf)
if (G_UNLIKELY (ret != GST_FLOW_OK)) { if (G_UNLIKELY (ret != GST_FLOW_OK)) {
if (ret == GST_V4L2_FLOW_RESOLUTION_CHANGE) { if (ret == GST_V4L2_FLOW_RESOLUTION_CHANGE) {
GST_INFO_OBJECT (v4l2src, "Resolution change detected."); if (!gst_v4l2src_handle_resolution_change (v4l2src)) {
/* It is required to always cycle through streamoff, we also need to
* streamoff in order to allow locking a new DV_TIMING which will
* influence the output of TRY_FMT */
gst_v4l2src_stop (GST_BASE_SRC (src));
/* Force renegotiation */
v4l2src->renegotiation_adjust = v4l2src->offset + 1;
v4l2src->pending_set_fmt = TRUE;
if (!gst_base_src_negotiate (GST_BASE_SRC (src))) {
ret = GST_FLOW_NOT_NEGOTIATED; ret = GST_FLOW_NOT_NEGOTIATED;
goto error; goto error;
} }
@ -1193,6 +1199,13 @@ gst_v4l2src_create (GstPushSrc * src, GstBuffer ** buf)
ret = gst_v4l2_buffer_pool_process (obj_pool, buf, NULL); ret = gst_v4l2_buffer_pool_process (obj_pool, buf, NULL);
if (obj_pool) if (obj_pool)
gst_object_unref (obj_pool); gst_object_unref (obj_pool);
if (G_UNLIKELY (ret == GST_V4L2_FLOW_RESOLUTION_CHANGE)) {
if (!gst_v4l2src_handle_resolution_change (v4l2src)) {
ret = GST_FLOW_NOT_NEGOTIATED;
goto error;
}
}
} }
} while (ret == GST_V4L2_FLOW_CORRUPTED_BUFFER || } while (ret == GST_V4L2_FLOW_CORRUPTED_BUFFER ||