h264parse: fix caps handling in _update_src_caps.

1 files changed, 6 insertions, 13 deletions

diff --git a/gst/h264parse/gsth264parse.c b/gst/h264parse/gsth264parse.c
index 736b6ecc0..43696dab6 100644
--- a/gst/h264parse/gsth264parse.c
+++ b/gst/h264parse/gsth264parse.c
@@ -1181,32 +1181,30 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
   }
   /* failing that, we'll take most recent SPS we can get */
   if (!sps) {
     sps = h264parse->sps;
   }
 
-  src_caps = h264parse->src_caps;
-  if (G_UNLIKELY (src_caps == NULL))
-    src_caps = caps;
+  if (G_UNLIKELY (h264parse->src_caps == NULL))
+    src_caps = gst_caps_copy (caps);
+  else
+    src_caps = gst_caps_ref (h264parse->src_caps);
+  src_caps = gst_caps_make_writable (src_caps);
 
   g_return_val_if_fail (src_caps != NULL, FALSE);
-  gst_caps_ref (src_caps);
-  caps = src_caps;
 
   /* if some upstream metadata missing, fill in from parsed stream */
   /* width / height */
   if (sps && (sps->width > 0 && sps->height > 0) &&
       (h264parse->width != sps->width || h264parse->height != sps->height)) {
     gint width, height;
 
     width = h264parse->width = sps->width;
     height = h264parse->height = sps->height;
 
     GST_DEBUG_OBJECT (h264parse, "updating caps w/h %dx%d", width, height);
-    gst_caps_replace (&src_caps, gst_caps_copy (src_caps));
-    gst_caps_unref (src_caps);
     gst_caps_set_simple (src_caps, "width", G_TYPE_INT, width,
         "height", G_TYPE_INT, height, NULL);
   }
 
   /* framerate */
   if (sps && (sps->time_scale > 0 && sps->num_units_in_tick > 0) &&
@@ -1216,40 +1214,35 @@ gst_h264_parse_update_src_caps (GstH264Parse * h264parse, GstCaps * caps)
 
     fps_num = h264parse->fps_num = sps->time_scale;
     fps_den = h264parse->fps_den = sps->num_units_in_tick;
 
     /* FIXME verify / also handle other cases */
     if (sps->fixed_frame_rate_flag && sps->frame_mbs_only_flag) {
-      src_caps = gst_caps_copy (caps);
       GST_DEBUG_OBJECT (h264parse, "updating caps fps %d/%d", fps_num, fps_den);
-      gst_caps_replace (&src_caps, gst_caps_copy (src_caps));
-      gst_caps_unref (src_caps);
       gst_caps_set_simple (src_caps,
           "framerate", GST_TYPE_FRACTION, fps_num, fps_den, NULL);
     }
   }
 
   /* transforming to non-bytestream needs to make codec-data */
   if (h264parse->format == GST_H264_PARSE_FORMAT_SAMPLE) {
     GstBuffer *buf;
     GstStructure *structure;
     const GValue *value = NULL;
     const GstBuffer *codec_data = NULL;
 
-    structure = gst_caps_get_structure (caps, 0);
+    structure = gst_caps_get_structure (src_caps, 0);
     value = gst_structure_get_value (structure, "codec_data");
     if (value != NULL)
       codec_data = gst_value_get_buffer (value);
     buf = gst_h264_parse_make_codec_data (h264parse);
     if (buf) {
       if (!codec_data || GST_BUFFER_SIZE (buf) != GST_BUFFER_SIZE (codec_data)
           || memcmp (GST_BUFFER_DATA (buf), GST_BUFFER_DATA (codec_data),
               GST_BUFFER_SIZE (buf))) {
         GST_DEBUG_OBJECT (h264parse, "setting new codec_data");
-        gst_caps_replace (&src_caps, gst_caps_copy (src_caps));
-        gst_caps_unref (src_caps);
         gst_caps_set_simple (src_caps, "codec_data", GST_TYPE_BUFFER, buf,
             NULL);
         gst_buffer_unref (buf);
       }
     } else {
       GST_DEBUG_OBJECT (h264parse, "no codec_data yet");