[vala] gstreamer-1.0: Backport some fixes from gstreamer 1.5/1.6 git
- From: Rico Tzschichholz <ricotz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] gstreamer-1.0: Backport some fixes from gstreamer 1.5/1.6 git
- Date: Fri, 20 Mar 2015 19:14:18 +0000 (UTC)
commit 5863943e78cd2d39f1ba1e3876c9b9d71a8e8718
Author: Rico Tzschichholz <ricotz ubuntu com>
Date: Fri Mar 20 20:12:38 2015 +0100
gstreamer-1.0: Backport some fixes from gstreamer 1.5/1.6 git
vapi/gstreamer-1.0.vapi | 6 +++---
vapi/gstreamer-pbutils-1.0.vapi | 2 +-
vapi/gstreamer-video-1.0.vapi | 2 +-
vapi/metadata/Gst-1.0.metadata | 5 +++++
vapi/metadata/GstPbutils-1.0.metadata | 4 ++++
vapi/metadata/GstVideo-1.0.metadata | 6 +++++-
6 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi
index 2f3dfeb..e4f539c 100644
--- a/vapi/gstreamer-1.0.vapi
+++ b/vapi/gstreamer-1.0.vapi
@@ -3144,11 +3144,11 @@ namespace Gst {
[CCode (cheader_filename = "gst/gst.h", has_target = false)]
public delegate bool PadActivateModeFunction (Gst.Pad pad, Gst.Object parent, Gst.PadMode mode, bool
active);
[CCode (cheader_filename = "gst/gst.h", has_target = false)]
- public delegate Gst.FlowReturn PadChainFunction (Gst.Pad pad, Gst.Object? parent, Gst.Buffer buffer);
+ public delegate Gst.FlowReturn PadChainFunction (Gst.Pad pad, Gst.Object? parent, owned Gst.Buffer
buffer);
[CCode (cheader_filename = "gst/gst.h", has_target = false)]
- public delegate Gst.FlowReturn PadChainListFunction (Gst.Pad pad, Gst.Object? parent, Gst.BufferList
list);
+ public delegate Gst.FlowReturn PadChainListFunction (Gst.Pad pad, Gst.Object? parent, owned
Gst.BufferList list);
[CCode (cheader_filename = "gst/gst.h", has_target = false)]
- public delegate bool PadEventFunction (Gst.Pad pad, Gst.Object? parent, Gst.Event event);
+ public delegate bool PadEventFunction (Gst.Pad pad, Gst.Object? parent, owned Gst.Event event);
[CCode (cheader_filename = "gst/gst.h", instance_pos = 1.9)]
public delegate bool PadForwardFunction (Gst.Pad pad);
[CCode (cheader_filename = "gst/gst.h", has_target = false)]
diff --git a/vapi/gstreamer-pbutils-1.0.vapi b/vapi/gstreamer-pbutils-1.0.vapi
index dd211cf..8140c7b 100644
--- a/vapi/gstreamer-pbutils-1.0.vapi
+++ b/vapi/gstreamer-pbutils-1.0.vapi
@@ -82,7 +82,7 @@ namespace Gst {
[Deprecated]
public unowned Gst.Structure get_misc ();
[CCode (array_length = false, array_null_terminated = true)]
- public string[] get_missing_elements_installer_details ();
+ public unowned string[] get_missing_elements_installer_details ();
public Gst.PbUtils.DiscovererResult get_result ();
public bool get_seekable ();
public Gst.PbUtils.DiscovererStreamInfo get_stream_info ();
diff --git a/vapi/gstreamer-video-1.0.vapi b/vapi/gstreamer-video-1.0.vapi
index b09e609..82dce62 100644
--- a/vapi/gstreamer-video-1.0.vapi
+++ b/vapi/gstreamer-video-1.0.vapi
@@ -851,7 +851,7 @@ namespace Gst {
[CCode (cheader_filename = "gst/video/video.h")]
public static bool blend (Gst.Video.Frame dest, Gst.Video.Frame src, int x, int y, float
global_alpha);
[CCode (cheader_filename = "gst/video/video.h")]
- public static void blend_scale_linear_RGBA (Gst.Video.Info src, Gst.Buffer src_buffer, int
dest_height, int dest_width, Gst.Video.Info dest, Gst.Buffer dest_buffer);
+ public static void blend_scale_linear_RGBA (Gst.Video.Info src, Gst.Buffer src_buffer, int
dest_height, int dest_width, out Gst.Video.Info dest, out Gst.Buffer dest_buffer);
[CCode (cheader_filename = "gst/video/video.h", cname =
"gst_buffer_pool_config_get_video_alignment")]
public static bool buffer_pool_config_get_video_alignment (Gst.Structure config,
Gst.Video.Alignment align);
[CCode (cheader_filename = "gst/video/video.h", cname =
"gst_buffer_pool_config_set_video_alignment")]
diff --git a/vapi/metadata/Gst-1.0.metadata b/vapi/metadata/Gst-1.0.metadata
index edac546..2b59f05 100644
--- a/vapi/metadata/Gst-1.0.metadata
+++ b/vapi/metadata/Gst-1.0.metadata
@@ -220,5 +220,10 @@ Structure.new_from_string skip
// Upstream
///////////
+// Upstream backports from 1.5/1.6
+PadChainFunction.buffer owned
+PadChainListFunction.list owned
+PadEventFunction.event owned
+
// Bug #730957:
ElementFactory.get_metadata_keys nullable
diff --git a/vapi/metadata/GstPbutils-1.0.metadata b/vapi/metadata/GstPbutils-1.0.metadata
index 3042a12..453b986 100644
--- a/vapi/metadata/GstPbutils-1.0.metadata
+++ b/vapi/metadata/GstPbutils-1.0.metadata
@@ -6,3 +6,7 @@ pb_utils_* name="pb_utils_(.+)"
codec_utils_aac_* parent="Gst.PbUtils.Codec.AAC" name="codec_utils_aac_(.+)"
codec_utils_h264_* parent="Gst.PbUtils.Codec.H264" name="codec_utils_h264_(.+)"
codec_utils_mpeg4video_* parent="Gst.PbUtils.Codec.MPEG4Video" name="codec_utils_mpeg4video_(.+)"
+
+// Upstream backports from 1.5/1.6
+DiscovererInfo
+ .get_missing_elements_installer_details unowned
diff --git a/vapi/metadata/GstVideo-1.0.metadata b/vapi/metadata/GstVideo-1.0.metadata
index ce0d956..62b130f 100644
--- a/vapi/metadata/GstVideo-1.0.metadata
+++ b/vapi/metadata/GstVideo-1.0.metadata
@@ -26,4 +26,8 @@ VideoInfo
.finfo nullable
VideoChromaResample skip
-video_chroma_resample skip
\ No newline at end of file
+video_chroma_resample skip
+
+// Upstream backports from 1.5/1.6
+video_blend_scale_linear_RGBA.dest out
+video_blend_scale_linear_RGBA.dest_buffer out unowned=false
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]