From 17dfc1c8c70ef3bfb5269d088db8399048da7d42 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sat, 29 Dec 2012 11:14:26 +0100 Subject: [PATCH] gstreamer-1.0: Update to 1.0.4 --- vapi/gstreamer-1.0.vapi | 32 +++++++++++------------------ vapi/gstreamer-app-1.0.vapi | 2 +- vapi/gstreamer-pbutils-1.0.vapi | 2 +- vapi/gstreamer-rtsp-1.0.vapi | 36 ++++++++++++++++----------------- vapi/gstreamer-video-1.0.vapi | 1 + 5 files changed, 33 insertions(+), 40 deletions(-) diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi index f9e8ce78e..b66cb30c9 100644 --- a/vapi/gstreamer-1.0.vapi +++ b/vapi/gstreamer-1.0.vapi @@ -994,7 +994,7 @@ namespace Gst { public void parse_segment_done (out Gst.Format format, out int64 position); public void parse_sink_message (out Gst.Message msg); public void parse_step (out Gst.Format format, out uint64 amount, out double rate, out bool flush, out bool intermediate); - public void parse_stream_start (out string stream_id); + public void parse_stream_start (out unowned string stream_id); public void parse_tag (out unowned Gst.TagList taglist); public void parse_toc (out Gst.Toc toc, out bool updated); public void parse_toc_select (out string uid); @@ -2465,7 +2465,17 @@ namespace Gst { QUERY_DOWNSTREAM, QUERY_UPSTREAM, PUSH, - PULL + PULL, + BLOCKING, + DATA_DOWNSTREAM, + DATA_UPSTREAM, + DATA_BOTH, + BLOCK_DOWNSTREAM, + BLOCK_UPSTREAM, + EVENT_BOTH, + QUERY_BOTH, + ALL_BOTH, + SCHEDULING } [CCode (cheader_filename = "gst/gst.h", cprefix = "GST_PAD_TEMPLATE_FLAG_", has_type_id = false)] [Flags] @@ -2939,24 +2949,6 @@ namespace Gst { public const int MSECOND; [CCode (cheader_filename = "gst/gst.h", cname = "GST_NSECOND")] public const int NSECOND; - [CCode (cheader_filename = "gst/gst.h", cname = "GST_PAD_PROBE_TYPE_ALL_BOTH")] - public const int PAD_PROBE_TYPE_ALL_BOTH; - [CCode (cheader_filename = "gst/gst.h", cname = "GST_PAD_PROBE_TYPE_BLOCKING")] - public const int PAD_PROBE_TYPE_BLOCKING; - [CCode (cheader_filename = "gst/gst.h", cname = "GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM")] - public const int PAD_PROBE_TYPE_BLOCK_DOWNSTREAM; - [CCode (cheader_filename = "gst/gst.h", cname = "GST_PAD_PROBE_TYPE_BLOCK_UPSTREAM")] - public const int PAD_PROBE_TYPE_BLOCK_UPSTREAM; - [CCode (cheader_filename = "gst/gst.h", cname = "GST_PAD_PROBE_TYPE_DATA_BOTH")] - public const int PAD_PROBE_TYPE_DATA_BOTH; - [CCode (cheader_filename = "gst/gst.h", cname = "GST_PAD_PROBE_TYPE_DATA_DOWNSTREAM")] - public const int PAD_PROBE_TYPE_DATA_DOWNSTREAM; - [CCode (cheader_filename = "gst/gst.h", cname = "GST_PAD_PROBE_TYPE_EVENT_BOTH")] - public const int PAD_PROBE_TYPE_EVENT_BOTH; - [CCode (cheader_filename = "gst/gst.h", cname = "GST_PAD_PROBE_TYPE_QUERY_BOTH")] - public const int PAD_PROBE_TYPE_QUERY_BOTH; - [CCode (cheader_filename = "gst/gst.h", cname = "GST_PAD_PROBE_TYPE_SCHEDULING")] - public const int PAD_PROBE_TYPE_SCHEDULING; [CCode (cheader_filename = "gst/gst.h", cname = "GST_PARAM_CONTROLLABLE")] public const int PARAM_CONTROLLABLE; [CCode (cheader_filename = "gst/gst.h", cname = "GST_PARAM_MUTABLE_PAUSED")] diff --git a/vapi/gstreamer-app-1.0.vapi b/vapi/gstreamer-app-1.0.vapi index 464763848..18c1e58e1 100644 --- a/vapi/gstreamer-app-1.0.vapi +++ b/vapi/gstreamer-app-1.0.vapi @@ -44,7 +44,7 @@ namespace Gst { public uint64 get_max_bytes (); public int64 get_size (); public Gst.App.StreamType get_stream_type (); - public virtual Gst.FlowReturn push_buffer (Gst.Buffer buffer); + public virtual Gst.FlowReturn push_buffer (owned Gst.Buffer buffer); public void set_caps (Gst.Caps caps); public void set_emit_signals (bool emit); public void set_latency (uint64 min, uint64 max); diff --git a/vapi/gstreamer-pbutils-1.0.vapi b/vapi/gstreamer-pbutils-1.0.vapi index 20482fb69..8c32a1c98 100644 --- a/vapi/gstreamer-pbutils-1.0.vapi +++ b/vapi/gstreamer-pbutils-1.0.vapi @@ -229,7 +229,7 @@ namespace Gst { [CCode (cname = "gst_encoding_profile_set_preset")] public void set_preset (string preset); [CCode (cname = "gst_encoding_profile_set_restriction")] - public void set_restriction (Gst.Caps restriction); + public void set_restriction (owned Gst.Caps restriction); } [CCode (cheader_filename = "gst/pbutils/codec-utils.h,gst/pbutils/descriptions.h,gst/pbutils/encoding-profile.h,gst/pbutils/encoding-target.h,gst/pbutils/gstdiscoverer.h,gst/pbutils/gstpluginsbaseversion.h,gst/pbutils/install-plugins.h,gst/pbutils/missing-plugins.h,gst/pbutils/pbutils-enumtypes.h,gst/pbutils/pbutils.h", cname = "GstEncodingTarget", type_id = "gst_encoding_target_get_type ()")] [GIR (name = "EncodingTarget")] diff --git a/vapi/gstreamer-rtsp-1.0.vapi b/vapi/gstreamer-rtsp-1.0.vapi index aa9a72bc4..0cc9bfed7 100644 --- a/vapi/gstreamer-rtsp-1.0.vapi +++ b/vapi/gstreamer-rtsp-1.0.vapi @@ -56,9 +56,9 @@ namespace Gst { public class Watch { public uint attach (GLib.MainContext context); public void reset (); - public Gst.RTSP.Result send_message (Gst.RTSP.Message message, uint id); + public Gst.RTSP.Result send_message (Gst.RTSP.Message message, out uint id); public void unref (); - public Gst.RTSP.Result write_data (uint8 data, uint size, uint id); + public Gst.RTSP.Result write_data (uint8 data, uint size, out uint id); } [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h", type_id = "gst_rtsp_extension_get_type ()")] [GIR (name = "RTSPExtension")] @@ -97,20 +97,20 @@ namespace Gst { public Gst.RTSP.Result append_headers (GLib.StringBuilder str); public Gst.RTSP.Result dump (); public Gst.RTSP.Result free (); - public Gst.RTSP.Result get_body (uint8 data, uint size); - public Gst.RTSP.Result get_header (Gst.RTSP.HeaderField field, string value, int indx); + public Gst.RTSP.Result get_body ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "guint")] out unowned uint8[] data); + public Gst.RTSP.Result get_header (Gst.RTSP.HeaderField field, out unowned string value, int indx); public Gst.RTSP.MsgType get_type (); public Gst.RTSP.Result init (); public Gst.RTSP.Result init_data (uint8 channel); public Gst.RTSP.Result init_request (Gst.RTSP.Method method, string uri); - public Gst.RTSP.Result init_response (Gst.RTSP.StatusCode code, string reason, Gst.RTSP.Message request); - public Gst.RTSP.Result parse_data (uint8 channel); - public Gst.RTSP.Result parse_request (Gst.RTSP.Method method, string uri, Gst.RTSP.Version version); - public Gst.RTSP.Result parse_response (Gst.RTSP.StatusCode code, string reason, Gst.RTSP.Version version); + public Gst.RTSP.Result init_response (Gst.RTSP.StatusCode code, string? reason, Gst.RTSP.Message? request); + public Gst.RTSP.Result parse_data (out uint8 channel); + public Gst.RTSP.Result parse_request (out Gst.RTSP.Method method, out string uri, out Gst.RTSP.Version version); + public Gst.RTSP.Result parse_response (out Gst.RTSP.StatusCode code, out string reason, out Gst.RTSP.Version version); public Gst.RTSP.Result remove_header (Gst.RTSP.HeaderField field, int indx); - public Gst.RTSP.Result set_body (uint8 data, uint size); - public Gst.RTSP.Result steal_body (uint8 data, uint size); - public Gst.RTSP.Result take_body (uint8 data, uint size); + public Gst.RTSP.Result set_body ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "guint")] uint8[] data); + public Gst.RTSP.Result steal_body ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "guint")] out uint8[] data); + public Gst.RTSP.Result take_body ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "guint")] owned uint8[] data); public Gst.RTSP.Result take_header (Gst.RTSP.HeaderField field, string value); public Gst.RTSP.Result unset (); } @@ -426,11 +426,11 @@ namespace Gst { [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h", cname = "GST_RTSP_DEFAULT_PORT")] public const int _DEFAULT_PORT; [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] - public static Gst.RTSP.Result connection_accept (GLib.Socket socket, Gst.RTSP.Connection conn, GLib.Cancellable? cancellable = null); + public static Gst.RTSP.Result connection_accept (GLib.Socket socket, out Gst.RTSP.Connection conn, GLib.Cancellable? cancellable = null); [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] - public static Gst.RTSP.Result connection_create (Gst.RTSP.Url url, Gst.RTSP.Connection conn); + public static Gst.RTSP.Result connection_create (Gst.RTSP.Url url, out Gst.RTSP.Connection conn); [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] - public static Gst.RTSP.Result connection_create_from_socket (GLib.Socket socket, string ip, uint16 port, string initial_buffer, Gst.RTSP.Connection conn); + public static Gst.RTSP.Result connection_create_from_socket (GLib.Socket socket, string ip, uint16 port, string initial_buffer, out Gst.RTSP.Connection conn); [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] public static Gst.RTSP.HeaderField find_header_field (string header); [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] @@ -440,13 +440,13 @@ namespace Gst { [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] public static unowned string header_as_text (Gst.RTSP.HeaderField field); [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] - public static Gst.RTSP.Result message_new (Gst.RTSP.Message msg); + public static Gst.RTSP.Result message_new (out Gst.RTSP.Message msg); [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] - public static Gst.RTSP.Result message_new_data (Gst.RTSP.Message msg, uint8 channel); + public static Gst.RTSP.Result message_new_data (out Gst.RTSP.Message msg, uint8 channel); [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] - public static Gst.RTSP.Result message_new_request (Gst.RTSP.Message msg, Gst.RTSP.Method method, string uri); + public static Gst.RTSP.Result message_new_request (out Gst.RTSP.Message msg, Gst.RTSP.Method method, string uri); [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] - public static Gst.RTSP.Result message_new_response (Gst.RTSP.Message msg, Gst.RTSP.StatusCode code, string reason, Gst.RTSP.Message request); + public static Gst.RTSP.Result message_new_response (out Gst.RTSP.Message msg, Gst.RTSP.StatusCode code, string? reason, Gst.RTSP.Message? request); [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] public static unowned string method_as_text (Gst.RTSP.Method method); [CCode (cheader_filename = "gst/rtsp/gstrtsp-enumtypes.h,gst/rtsp/gstrtspconnection.h,gst/rtsp/gstrtspdefs.h,gst/rtsp/gstrtspextension.h,gst/rtsp/gstrtspmessage.h,gst/rtsp/gstrtsprange.h,gst/rtsp/gstrtsptransport.h,gst/rtsp/gstrtspurl.h")] diff --git a/vapi/gstreamer-video-1.0.vapi b/vapi/gstreamer-video-1.0.vapi index 4d23e955d..c0f974930 100644 --- a/vapi/gstreamer-video-1.0.vapi +++ b/vapi/gstreamer-video-1.0.vapi @@ -73,6 +73,7 @@ namespace Gst { public Gst.Video.CodecFrame get_oldest_frame (); public Gst.Video.CodecState get_output_state (); public bool get_packetized (); + public double get_qos_proportion (); [NoWrapper] public virtual Gst.FlowReturn handle_frame (Gst.Video.CodecFrame frame); public Gst.FlowReturn have_frame (); -- 2.47.2