From 07a8a1c484115db040936f725d55e32bfd178f21 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Thu, 5 Mar 2020 22:47:16 +1100
Subject: [PATCH] imagefreeze: properly ignore setting caps failures

Ignore the return value of gst_pad_set_caps() so that setcaps will set a
framerate that is usable.

Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/issues/705
---
 gst/imagefreeze/gstimagefreeze.c | 49 +++++++++++++++++---------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/gst/imagefreeze/gstimagefreeze.c b/gst/imagefreeze/gstimagefreeze.c
index 9dc8c474e4..20ca3035e4 100644
--- a/gst/imagefreeze/gstimagefreeze.c
+++ b/gst/imagefreeze/gstimagefreeze.c
@@ -221,9 +221,9 @@ gst_image_freeze_sink_setcaps (GstImageFreeze * self, GstCaps * caps)
     gst_caps_set_simple (caps, "framerate", GST_TYPE_FRACTION, self->fps_n,
         self->fps_d, NULL);
     GST_DEBUG_OBJECT (pad, "Setting caps %" GST_PTR_FORMAT, caps);
-    ret = gst_pad_set_caps (self->srcpad, caps);
+    gst_pad_set_caps (self->srcpad, caps);
     gst_caps_unref (caps);
-    return ret;
+    return TRUE;
   }
 
   /* Else negotiate a framerate with downstream */
@@ -267,17 +267,16 @@ gst_image_freeze_sink_setcaps (GstImageFreeze * self, GstCaps * caps)
         gst_structure_fixate_field_nearest_fraction (s, "framerate", 25, 1)) {
       gst_structure_get_fraction (s, "framerate", &fps_n, &fps_d);
       if (fps_d != 0) {
-        if (gst_pad_set_caps (self->srcpad, candidate)) {
-          g_mutex_lock (&self->lock);
-          self->fps_n = fps_n;
-          self->fps_d = fps_d;
-          g_mutex_unlock (&self->lock);
-          self->negotiated_framerate = TRUE;
-          GST_DEBUG_OBJECT (pad, "Setting caps %" GST_PTR_FORMAT, candidate);
-          ret = TRUE;
-          gst_caps_unref (candidate);
-          break;
-        }
+        gst_pad_set_caps (self->srcpad, candidate);
+        g_mutex_lock (&self->lock);
+        self->fps_n = fps_n;
+        self->fps_d = fps_d;
+        g_mutex_unlock (&self->lock);
+        self->negotiated_framerate = TRUE;
+        GST_DEBUG_OBJECT (pad, "Setting caps %" GST_PTR_FORMAT, candidate);
+        ret = TRUE;
+        gst_caps_unref (candidate);
+        break;
       } else {
         GST_WARNING_OBJECT (pad, "Invalid caps with framerate %d/%d", fps_n,
             fps_d);
@@ -823,6 +822,19 @@ gst_image_freeze_src_loop (GstPad * pad)
     goto pause_task;
   }
 
+  if (self->buffer_caps_updated) {
+    GstCaps *buffer_caps = gst_caps_ref (self->buffer_caps);
+    self->buffer_caps_updated = FALSE;
+    g_mutex_unlock (&self->lock);
+    if (!gst_image_freeze_sink_setcaps (self, buffer_caps)) {
+      gst_caps_unref (buffer_caps);
+      flow_ret = GST_FLOW_NOT_NEGOTIATED;
+      goto pause_task;
+    }
+    gst_caps_unref (buffer_caps);
+    g_mutex_lock (&self->lock);
+  }
+
   /* normally we don't count buffers */
   if (G_UNLIKELY (self->num_buffers_left >= 0)) {
     GST_DEBUG_OBJECT (pad, "Buffers left %d", self->num_buffers_left);
@@ -835,16 +847,7 @@ gst_image_freeze_src_loop (GstPad * pad)
     }
   }
   buffer = gst_buffer_copy (self->buffer);
-
-  if (self->buffer_caps_updated) {
-    GstCaps *buffer_caps = gst_caps_ref (self->buffer_caps);
-    self->buffer_caps_updated = FALSE;
-    g_mutex_unlock (&self->lock);
-    gst_image_freeze_sink_setcaps (self, buffer_caps);
-    gst_caps_unref (buffer_caps);
-  } else {
-    g_mutex_unlock (&self->lock);
-  }
+  g_mutex_unlock (&self->lock);
 
   if (self->need_segment) {
     GstEvent *e;