commit cf5d14d3835ca026ab82b59c2f735d8ec3db6137
author Lyon Wang <lyon.wang@nxp.com> Wed Apr 18 16:18:28 2018 +0800
committer Lyon Wang <lyon.wang@nxp.com> Wed Apr 18 17:22:59 2018 +0800
tree e99aa1e2bb4a215de92fb7161390bc46cd56dac4
parent 26af172753cbc824125adc7fa97b890104ad941d

[GST1.14] imxcompositor update for gst1.14

- Fix imxcompositor update for gst1.14

Signed-off-by: Lyon Wang <lyon.wang@nxp.com>

plugins/compositor/gstimxcompositor.c

diff --git a/plugins/compositor/gstimxcompositor.c b/plugins/compositor/gstimxcompositor.c
index ac08932..321d997 100755
--- a/plugins/compositor/gstimxcompositor.c
+++ b/plugins/compositor/gstimxcompositor.c
@@ -1600,8 +1600,13 @@
     GST_ERROR ("Couldn't create caps for device '%s'", in_plugin->name);
     caps = gst_caps_new_empty_simple ("video/x-raw");
   }
+#if GST_CHECK_VERSION(1, 14, 0)
+   gst_element_class_add_pad_template (gstelement_class,
+      gst_pad_template_new_with_gtype ("sink_%u", GST_PAD_SINK, GST_PAD_REQUEST, caps, GST_TYPE_IMXCOMPOSITOR_PAD));
+#else
   gst_element_class_add_pad_template (gstelement_class,
       gst_pad_template_new ("sink_%u", GST_PAD_SINK, GST_PAD_REQUEST, caps));
+#endif
 
   list = dev->get_supported_out_fmts(dev);
   caps = imx_compositor_caps_from_fmt_list(list);
@@ -1617,14 +1622,18 @@
   klass->in_plugin = in_plugin;
   in_plugin->destroy(dev);
 
+#if GST_CHECK_VERSION(1, 14, 0)
+  agg_class->negotiated_src_caps = gst_imxcompositor_negotiated_caps;
+#else
   agg_class->sinkpads_type = GST_TYPE_IMXCOMPOSITOR_PAD;
+  videoaggregator_class->negotiated_caps = gst_imxcompositor_negotiated_caps;
+#endif
   agg_class->sink_query = gst_imxcompositor_sink_query;
   agg_class->src_query = gst_imxcompositor_src_query;
 
   videoaggregator_class->find_best_format = gst_imxcompositor_find_best_format;
   videoaggregator_class->update_caps = gst_imxcompositor_update_caps;
   videoaggregator_class->aggregate_frames = gst_imxcompositor_aggregate_frames;
-  videoaggregator_class->negotiated_caps = gst_imxcompositor_negotiated_caps;
   videoaggregator_class->get_output_buffer=gst_imxcompositor_get_output_buffer;
 
   g_object_class_install_property (gobject_class,

plugins/compositor/gstimxcompositorpad.c

diff --git a/plugins/compositor/gstimxcompositorpad.c b/plugins/compositor/gstimxcompositorpad.c
index 5d88bdb..11e5d6c 100755
--- a/plugins/compositor/gstimxcompositorpad.c
+++ b/plugins/compositor/gstimxcompositorpad.c
@@ -473,8 +473,13 @@
 
   frame = g_slice_new0 (GstVideoFrame);
 
+#if GST_CHECK_VERSION(1, 14, 0)
+  if (!gst_video_frame_map (frame, &pad->info, pad->buffer,
+#else
   if (!gst_video_frame_map (frame, &pad->buffer_vinfo, pad->buffer,
+#endif
           GST_MAP_READ)) {
+
     GST_WARNING_OBJECT (vagg, "Could not map input buffer");
     g_slice_free (GstVideoFrame, frame);
     return FALSE;