gstreamer-1.0: Update from 1.13+ git master

7 files changed, 183 insertions, 74 deletions

diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi
index d47c72fe0..a2fee307c 100644
--- a/vapi/gstreamer-1.0.vapi
+++ b/vapi/gstreamer-1.0.vapi
@@ -1293,7 +1293,7 @@ namespace Gst {
 		[NoWrapper]
 		public virtual void release_pad (Gst.Pad pad);
 		public void release_request_pad (Gst.Pad pad);
-		public bool remove_pad (owned Gst.Pad pad);
+		public bool remove_pad (Gst.Pad pad);
 		[Version (since = "1.10")]
 		public void remove_property_notify_watch (ulong watch_id);
 		[CCode (vfunc_name = "request_new_pad")]
@@ -1376,7 +1376,7 @@ namespace Gst {
 		[Version (since = "1.4")]
 		public int64 get_running_time_offset ();
 		public uint32 get_seqnum ();
-		public unowned Gst.Structure get_structure ();
+		public unowned Gst.Structure? get_structure ();
 		public bool has_name (string name);
 		[CCode (has_construct_function = false)]
 		public Event.latency (Gst.ClockTime latency);
@@ -1588,7 +1588,7 @@ namespace Gst {
 		public size_t get_num_redirect_entries ();
 		public uint32 get_seqnum ();
 		public unowned GLib.Value? get_stream_status_object ();
-		public unowned Gst.Structure get_structure ();
+		public unowned Gst.Structure? get_structure ();
 		public bool has_name (string name);
 		[CCode (has_construct_function = false)]
 		[Version (since = "1.2")]
@@ -2093,7 +2093,7 @@ namespace Gst {
 		public uint get_n_allocation_pools ();
 		public uint get_n_buffering_ranges ();
 		public uint get_n_scheduling_modes ();
-		public unowned Gst.Structure get_structure ();
+		public unowned Gst.Structure? get_structure ();
 		public bool has_scheduling_mode (Gst.PadMode mode);
 		public bool has_scheduling_mode_with_flags (Gst.PadMode mode, Gst.SchedulingFlags flags);
 		[CCode (has_construct_function = false)]
@@ -3933,6 +3933,9 @@ namespace Gst {
 	public const int64 FORMAT_PERCENT_SCALE;
 	[CCode (cheader_filename = "gst/gst.h", cname = "GST_FOURCC_FORMAT")]
 	public const string FOURCC_FORMAT;
+	[CCode (cheader_filename = "gst/gst.h", cname = "GST_GROUP_ID_INVALID")]
+	[Version (since = "1.14")]
+	public const int GROUP_ID_INVALID;
 	[CCode (cheader_filename = "gst/gst.h", cname = "GST_LICENSE_UNKNOWN")]
 	public const string LICENSE_UNKNOWN;
 	[CCode (cheader_filename = "gst/gst.h", cname = "GST_LOCK_FLAG_READWRITE")]
@@ -3970,6 +3973,7 @@ namespace Gst {
 	[CCode (cheader_filename = "gst/gst.h", cname = "GST_SEGMENT_FORMAT")]
 	public const string SEGMENT_FORMAT;
 	[CCode (cheader_filename = "gst/gst.h", cname = "GST_SEQNUM_INVALID")]
+	[Version (since = "1.14")]
 	public const int SEQNUM_INVALID;
 	[CCode (cheader_filename = "gst/gst.h", cname = "GST_STIME_FORMAT")]
 	[Version (since = "1.6")]
diff --git a/vapi/gstreamer-app-1.0.vapi b/vapi/gstreamer-app-1.0.vapi
index e00f042ff..98b51b40f 100644
--- a/vapi/gstreamer-app-1.0.vapi
+++ b/vapi/gstreamer-app-1.0.vapi
@@ -94,6 +94,9 @@ namespace Gst {
 			[HasEmitter]
 			public virtual signal Gst.FlowReturn push_buffer (Gst.Buffer buffer);
 			[HasEmitter]
+			[Version (since = "1.14")]
+			public virtual signal Gst.FlowReturn push_buffer_list (Gst.BufferList buffer_list);
+			[HasEmitter]
 			[Version (since = "1.6")]
 			public virtual signal Gst.FlowReturn push_sample (Gst.Sample sample);
 			public virtual signal bool seek_data (uint64 offset);
diff --git a/vapi/gstreamer-base-1.0.vapi b/vapi/gstreamer-base-1.0.vapi
index 7cb1308c9..2b2a7ed32 100644
--- a/vapi/gstreamer-base-1.0.vapi
+++ b/vapi/gstreamer-base-1.0.vapi
@@ -53,6 +53,71 @@ namespace Gst {
 			public GLib.List<Gst.Buffer>? take_list (size_t nbytes);
 			public void unmap ();
 		}
+		[CCode (cheader_filename = "gst/base/base.h", cname = "GstAggregator", lower_case_cprefix = "gst_aggregator_", type_id = "gst_aggregator_get_type ()")]
+		[GIR (name = "Aggregator")]
+		public abstract class Aggregator : Gst.Element {
+			public weak Gst.Segment segment;
+			public weak Gst.Pad srcpad;
+			[CCode (has_construct_function = false)]
+			protected Aggregator ();
+			[NoWrapper]
+			public virtual Gst.FlowReturn aggregate (bool timeout);
+			[NoWrapper]
+			public virtual Gst.Buffer clip (Gst.Base.AggregatorPad aggregator_pad, Gst.Buffer buf);
+			[NoWrapper]
+			public virtual bool decide_allocation (Gst.Query query);
+			public virtual Gst.FlowReturn finish_buffer (owned Gst.Buffer buffer);
+			[NoWrapper]
+			public virtual Gst.Caps fixate_src_caps (Gst.Caps caps);
+			[NoWrapper]
+			public virtual Gst.FlowReturn flush ();
+			public void get_allocator (out Gst.Allocator allocator, out Gst.AllocationParams @params);
+			public Gst.BufferPool get_buffer_pool ();
+			public Gst.ClockTime get_latency ();
+			[NoWrapper]
+			public virtual Gst.ClockTime get_next_time ();
+			[NoWrapper]
+			public virtual bool negotiated_src_caps (Gst.Caps caps);
+			[NoWrapper]
+			public virtual bool propose_allocation (Gst.Base.AggregatorPad pad, Gst.Query decide_query, Gst.Query query);
+			public void set_latency (Gst.ClockTime min_latency, Gst.ClockTime max_latency);
+			public void set_src_caps (Gst.Caps caps);
+			[NoWrapper]
+			public virtual bool sink_event (Gst.Base.AggregatorPad aggregator_pad, Gst.Event event);
+			[NoWrapper]
+			public virtual bool sink_query (Gst.Base.AggregatorPad aggregator_pad, Gst.Query query);
+			[NoWrapper]
+			public virtual bool src_activate (Gst.PadMode mode, bool active);
+			[NoWrapper]
+			public virtual bool src_event (Gst.Event event);
+			[NoWrapper]
+			public virtual bool src_query (Gst.Query query);
+			[NoWrapper]
+			public virtual bool start ();
+			[NoWrapper]
+			public virtual bool stop ();
+			[NoWrapper]
+			public virtual Gst.FlowReturn update_src_caps (Gst.Caps caps, Gst.Caps ret);
+			[NoAccessorMethod]
+			public uint64 latency { get; set; }
+			[NoAccessorMethod]
+			public uint64 start_time { get; set; }
+		}
+		[CCode (cheader_filename = "gst/base/base.h", cname = "GstAggregatorPad", lower_case_cprefix = "gst_aggregator_pad_", type_id = "gst_aggregator_pad_get_type ()")]
+		[GIR (name = "AggregatorPad")]
+		public class AggregatorPad : Gst.Pad {
+			[CCode (array_length = false)]
+			public weak void* _gst_reserved[4];
+			public weak Gst.Segment segment;
+			[CCode (has_construct_function = false)]
+			protected AggregatorPad ();
+			public bool drop_buffer ();
+			[NoWrapper]
+			public virtual Gst.FlowReturn flush (Gst.Base.Aggregator aggregator);
+			public Gst.Buffer get_buffer ();
+			public bool is_eos ();
+			public Gst.Buffer steal_buffer ();
+		}
 		[CCode (cheader_filename = "gst/base/gstadapter.h,gst/base/gstbaseparse.h,gst/base/gstbasesink.h,gst/base/gstbasesrc.h,gst/base/gstbasetransform.h,gst/base/gstbitreader.h,gst/base/gstbytereader.h,gst/base/gstbytewriter.h,gst/base/gstcollectpads.h,gst/base/gstpushsrc.h,gst/base/gsttypefindhelper.h", cname = "GstBitReader", has_type_id = false)]
 		[Compact]
 		[GIR (name = "BitReader")]
@@ -648,6 +713,8 @@ namespace Gst {
 			public Gst.FlowReturn start_wait ();
 			[NoWrapper]
 			public virtual bool stop ();
+			[Version (since = "1.14")]
+			public void submit_buffer_list (owned Gst.BufferList buffer_list);
 			[NoWrapper]
 			public virtual bool unlock ();
 			[NoWrapper]
diff --git a/vapi/gstreamer-check-1.0.vapi b/vapi/gstreamer-check-1.0.vapi
index 87d404892..381d04aff 100644
--- a/vapi/gstreamer-check-1.0.vapi
+++ b/vapi/gstreamer-check-1.0.vapi
@@ -162,6 +162,12 @@ namespace Gst {
 			public Gst.FlowReturn src_crank_and_push_many (int cranks, int pushes);
 			[CCode (cname = "gst_harness_src_push_event")]
 			public bool src_push_event ();
+			[CCode (cname = "gst_harness_take_all_data_as_buffer")]
+			[Version (since = "1.14")]
+			public Gst.Buffer take_all_data_as_buffer ();
+			[CCode (cname = "gst_harness_take_all_data_as_bytes")]
+			[Version (since = "1.14")]
+			public GLib.Bytes take_all_data_as_bytes ();
 			[CCode (cname = "gst_harness_teardown")]
 			public void teardown ();
 			[CCode (cname = "gst_harness_try_pull")]
diff --git a/vapi/gstreamer-pbutils-1.0.vapi b/vapi/gstreamer-pbutils-1.0.vapi
index b8afe7638..36be75cbd 100644
--- a/vapi/gstreamer-pbutils-1.0.vapi
+++ b/vapi/gstreamer-pbutils-1.0.vapi
@@ -6,37 +6,37 @@ namespace Gst {
 		namespace Codec {
 			namespace AAC {
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_aac_caps_set_level_and_profile")]
-				public static bool caps_set_level_and_profile (Gst.Caps caps, uint8 audio_config, uint len);
+				public static bool caps_set_level_and_profile (Gst.Caps caps, [CCode (array_length_cname = "len", array_length_pos = 2.1, array_length_type = "guint")] uint8[] audio_config);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_aac_get_channels")]
-				public static uint get_channels (uint8 audio_config, uint len);
+				public static uint get_channels ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] audio_config);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_aac_get_index_from_sample_rate")]
 				public static int get_index_from_sample_rate (uint rate);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_aac_get_level")]
-				public static unowned string get_level (uint8 audio_config, uint len);
+				public static unowned string get_level ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] audio_config);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_aac_get_profile")]
-				public static unowned string get_profile (uint8 audio_config, uint len);
+				public static unowned string get_profile ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] audio_config);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_aac_get_sample_rate")]
-				public static uint get_sample_rate (uint8 audio_config, uint len);
+				public static uint get_sample_rate ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] audio_config);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_aac_get_sample_rate_from_index")]
 				public static uint get_sample_rate_from_index (uint sr_idx);
 			}
 			namespace H264 {
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_h264_caps_set_level_and_profile")]
-				public static bool caps_set_level_and_profile (Gst.Caps caps, uint8 sps, uint len);
+				public static bool caps_set_level_and_profile (Gst.Caps caps, [CCode (array_length_cname = "len", array_length_pos = 2.1, array_length_type = "guint")] uint8[] sps);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_h264_get_level")]
-				public static unowned string get_level (uint8 sps, uint len);
+				public static unowned string get_level ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] sps);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_h264_get_level_idc")]
 				public static uint8 get_level_idc (string level);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_h264_get_profile")]
-				public static unowned string get_profile (uint8 sps, uint len);
+				public static unowned string get_profile ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] sps);
 			}
 			namespace MPEG4Video {
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_mpeg4video_caps_set_level_and_profile")]
-				public static bool caps_set_level_and_profile (Gst.Caps caps, uint8 vis_obj_seq, uint len);
+				public static bool caps_set_level_and_profile (Gst.Caps caps, [CCode (array_length_cname = "len", array_length_pos = 2.1, array_length_type = "guint")] uint8[] vis_obj_seq);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_mpeg4video_get_level")]
-				public static unowned string get_level (uint8 vis_obj_seq, uint len);
+				public static unowned string get_level ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] vis_obj_seq);
 				[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_mpeg4video_get_profile")]
-				public static unowned string get_profile (uint8 vis_obj_seq, uint len);
+				public static unowned string get_profile ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] vis_obj_seq);
 			}
 		}
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "GstAudioVisualizer", lower_case_cprefix = "gst_audio_visualizer_", type_id = "gst_audio_visualizer_get_type ()")]
@@ -331,30 +331,30 @@ namespace Gst {
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h")]
 		public static bool add_codec_description_to_tag_list (Gst.TagList taglist, string? codec_tag, Gst.Caps caps);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_h265_caps_set_level_tier_and_profile")]
-		public static bool codec_utils_h265_caps_set_level_tier_and_profile (Gst.Caps caps, uint8 profile_tier_level, uint len);
+		public static bool codec_utils_h265_caps_set_level_tier_and_profile (Gst.Caps caps, [CCode (array_length_cname = "len", array_length_pos = 2.1, array_length_type = "guint")] uint8[] profile_tier_level);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_h265_get_level")]
-		public static unowned string codec_utils_h265_get_level (uint8 profile_tier_level, uint len);
+		public static unowned string codec_utils_h265_get_level ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] profile_tier_level);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_h265_get_level_idc")]
 		public static uint8 codec_utils_h265_get_level_idc (string level);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_h265_get_profile")]
-		public static unowned string codec_utils_h265_get_profile (uint8 profile_tier_level, uint len);
+		public static unowned string codec_utils_h265_get_profile ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] profile_tier_level);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_h265_get_tier")]
-		public static unowned string codec_utils_h265_get_tier (uint8 profile_tier_level, uint len);
+		public static unowned string codec_utils_h265_get_tier ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] profile_tier_level);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_opus_create_caps")]
 		[Version (since = "1.8")]
-		public static Gst.Caps codec_utils_opus_create_caps (uint32 rate, uint8 channels, uint8 channel_mapping_family, uint8 stream_count, uint8 coupled_count, uint8? channel_mapping);
+		public static Gst.Caps codec_utils_opus_create_caps (uint32 rate, uint8 channels, uint8 channel_mapping_family, uint8 stream_count, uint8 coupled_count, [CCode (array_length = false)] uint8[]? channel_mapping);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_opus_create_caps_from_header")]
 		[Version (since = "1.8")]
 		public static Gst.Caps codec_utils_opus_create_caps_from_header (Gst.Buffer header, Gst.Buffer? comments);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_opus_create_header")]
 		[Version (since = "1.8")]
-		public static Gst.Buffer codec_utils_opus_create_header (uint32 rate, uint8 channels, uint8 channel_mapping_family, uint8 stream_count, uint8 coupled_count, uint8? channel_mapping, uint16 pre_skip, int16 output_gain);
+		public static Gst.Buffer codec_utils_opus_create_header (uint32 rate, uint8 channels, uint8 channel_mapping_family, uint8 stream_count, uint8 coupled_count, [CCode (array_length = false)] uint8[]? channel_mapping, uint16 pre_skip, int16 output_gain);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_opus_parse_caps")]
 		[Version (since = "1.8")]
-		public static bool codec_utils_opus_parse_caps (Gst.Caps caps, uint32 rate, uint8 channels, uint8 channel_mapping_family, uint8 stream_count, uint8 coupled_count, uint8 channel_mapping);
+		public static bool codec_utils_opus_parse_caps (Gst.Caps caps, out uint32 rate, out uint8 channels, out uint8 channel_mapping_family, out uint8 stream_count, out uint8 coupled_count, [CCode (array_length = false)] out uint8[] channel_mapping);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_opus_parse_header")]
 		[Version (since = "1.8")]
-		public static bool codec_utils_opus_parse_header (Gst.Buffer header, uint32 rate, uint8 channels, uint8 channel_mapping_family, uint8 stream_count, uint8 coupled_count, uint8 channel_mapping, uint16 pre_skip, int16 output_gain);
+		public static bool codec_utils_opus_parse_header (Gst.Buffer header, out uint32 rate, out uint8 channels, out uint8 channel_mapping_family, out uint8 stream_count, out uint8 coupled_count, [CCode (array_length = false)] out uint8[] channel_mapping, out uint16 pre_skip, out int16 output_gain);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_encoding_list_all_targets")]
 		public static GLib.List<Gst.PbUtils.EncodingTarget> encoding_list_all_targets (string? categoryname);
 		[CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_encoding_list_available_categories")]
diff --git a/vapi/gstreamer-rtsp-1.0.vapi b/vapi/gstreamer-rtsp-1.0.vapi
index d59dc793f..49b82af5b 100644
--- a/vapi/gstreamer-rtsp-1.0.vapi
+++ b/vapi/gstreamer-rtsp-1.0.vapi
@@ -70,6 +70,84 @@ namespace Gst {
 			public void set_tunneled (bool tunneled);
 			public Gst.RTSP.Result write (uint8 data, uint size, GLib.TimeVal timeout);
 		}
+		[CCode (cheader_filename = "gst/rtsp/rtsp.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", lower_case_cprefix = "gst_rtsp_msg_", type_id = "gst_rtsp_msg_get_type ()")]
+		[Compact]
+		[GIR (name = "RTSPMessage")]
+		public class Message {
+			public Gst.RTSP.MsgType type;
+			[CCode (cname = "type_data.data.channel")]
+			public uint8 type_data_data_channel;
+			[CCode (cname = "type_data.request.method")]
+			public Gst.RTSP.Method type_data_request_method;
+			[CCode (cname = "type_data.request.uri")]
+			public weak string type_data_request_uri;
+			[CCode (cname = "type_data.request.version")]
+			public Gst.RTSP.Version type_data_request_version;
+			[CCode (cname = "type_data.response.code")]
+			public Gst.RTSP.StatusCode type_data_response_code;
+			[CCode (cname = "type_data.response.reason")]
+			public weak string type_data_response_reason;
+			[CCode (cname = "type_data.response.version")]
+			public Gst.RTSP.Version type_data_response_version;
+			[CCode (cname = "gst_rtsp_message_add_header")]
+			public Gst.RTSP.Result add_header (Gst.RTSP.HeaderField field, string value);
+			[CCode (cname = "gst_rtsp_message_add_header_by_name")]
+			[Version (since = "1.6")]
+			public Gst.RTSP.Result add_header_by_name (string header, string value);
+			[CCode (cname = "gst_rtsp_message_append_headers")]
+			public Gst.RTSP.Result append_headers (GLib.StringBuilder str);
+			[CCode (cname = "gst_rtsp_message_copy")]
+			[Version (since = "1.14")]
+			public Gst.RTSP.Result copy (out Gst.RTSP.Message copy);
+			[CCode (cname = "gst_rtsp_message_dump")]
+			public Gst.RTSP.Result dump ();
+			[CCode (cname = "gst_rtsp_message_free")]
+			public Gst.RTSP.Result free ();
+			[CCode (cname = "gst_rtsp_message_get_body")]
+			public Gst.RTSP.Result get_body ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "guint")] out unowned uint8[] data);
+			[CCode (cname = "gst_rtsp_message_get_header")]
+			public Gst.RTSP.Result get_header (Gst.RTSP.HeaderField field, out unowned string value, int indx);
+			[CCode (cname = "gst_rtsp_message_get_header_by_name")]
+			[Version (since = "1.6")]
+			public Gst.RTSP.Result get_header_by_name (string header, out unowned string value, int index);
+			[CCode (cname = "gst_rtsp_message_get_type")]
+			public Gst.RTSP.MsgType get_type ();
+			[CCode (cname = "gst_rtsp_message_init")]
+			public Gst.RTSP.Result init ();
+			[CCode (cname = "gst_rtsp_message_init_data")]
+			public Gst.RTSP.Result init_data (uint8 channel);
+			[CCode (cname = "gst_rtsp_message_init_request")]
+			public Gst.RTSP.Result init_request (Gst.RTSP.Method method, string uri);
+			[CCode (cname = "gst_rtsp_message_init_response")]
+			public Gst.RTSP.Result init_response (Gst.RTSP.StatusCode code, string? reason, Gst.RTSP.Message? request);
+			[CCode (cname = "gst_rtsp_message_parse_auth_credentials")]
+			[Version (since = "1.12")]
+			public Gst.RTSP.AuthCredential parse_auth_credentials (Gst.RTSP.HeaderField field);
+			[CCode (cname = "gst_rtsp_message_parse_data")]
+			public Gst.RTSP.Result parse_data (out uint8 channel);
+			[CCode (cname = "gst_rtsp_message_parse_request")]
+			public Gst.RTSP.Result parse_request (out Gst.RTSP.Method method, out string uri, out Gst.RTSP.Version version);
+			[CCode (cname = "gst_rtsp_message_parse_response")]
+			public Gst.RTSP.Result parse_response (out Gst.RTSP.StatusCode code, out string reason, out Gst.RTSP.Version version);
+			[CCode (cname = "gst_rtsp_message_remove_header")]
+			public Gst.RTSP.Result remove_header (Gst.RTSP.HeaderField field, int indx);
+			[CCode (cname = "gst_rtsp_message_remove_header_by_name")]
+			[Version (since = "1.6")]
+			public Gst.RTSP.Result remove_header_by_name (string header, int index);
+			[CCode (cname = "gst_rtsp_message_set_body")]
+			public Gst.RTSP.Result set_body ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "guint")] uint8[] data);
+			[CCode (cname = "gst_rtsp_message_steal_body")]
+			public Gst.RTSP.Result steal_body ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "guint")] out uint8[] data);
+			[CCode (cname = "gst_rtsp_message_take_body")]
+			public Gst.RTSP.Result take_body ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "guint")] owned uint8[] data);
+			[CCode (cname = "gst_rtsp_message_take_header")]
+			public Gst.RTSP.Result take_header (Gst.RTSP.HeaderField field, owned string value);
+			[CCode (cname = "gst_rtsp_message_take_header_by_name")]
+			[Version (since = "1.6")]
+			public Gst.RTSP.Result take_header_by_name (string header, owned string value);
+			[CCode (cname = "gst_rtsp_message_unset")]
+			public Gst.RTSP.Result unset ();
+		}
 		[CCode (cheader_filename = "gst/rtsp/rtsp.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gst_rtsp_url_get_type ()")]
 		[Compact]
 		[GIR (name = "RTSPUrl")]
@@ -124,55 +202,6 @@ namespace Gst {
 			public virtual signal Gst.RTSP.Result send (void* req, void* resp);
 		}
 		[CCode (cheader_filename = "gst/rtsp/rtsp.h", has_type_id = false)]
-		[GIR (name = "RTSPMessage")]
-		public struct Message {
-			public Gst.RTSP.MsgType type;
-			[CCode (cname = "type_data.request.method")]
-			public Gst.RTSP.Method type_data_request_method;
-			[CCode (cname = "type_data.request.uri")]
-			public weak string type_data_request_uri;
-			[CCode (cname = "type_data.request.version")]
-			public Gst.RTSP.Version type_data_request_version;
-			[CCode (cname = "type_data.response.code")]
-			public Gst.RTSP.StatusCode type_data_response_code;
-			[CCode (cname = "type_data.response.reason")]
-			public weak string type_data_response_reason;
-			[CCode (cname = "type_data.response.version")]
-			public Gst.RTSP.Version type_data_response_version;
-			[CCode (cname = "type_data.data.channel")]
-			public uint8 type_data_data_channel;
-			public Gst.RTSP.Result add_header (Gst.RTSP.HeaderField field, string value);
-			[Version (since = "1.6")]
-			public Gst.RTSP.Result add_header_by_name (string header, string value);
-			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 ([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);
-			[Version (since = "1.6")]
-			public Gst.RTSP.Result get_header_by_name (string header, out unowned string value, int index);
-			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);
-			[Version (since = "1.12")]
-			public Gst.RTSP.AuthCredential parse_auth_credentials (Gst.RTSP.HeaderField field);
-			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);
-			[Version (since = "1.6")]
-			public Gst.RTSP.Result remove_header_by_name (string header, int index);
-			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, owned string value);
-			[Version (since = "1.6")]
-			public Gst.RTSP.Result take_header_by_name (string header, owned string value);
-			public Gst.RTSP.Result unset ();
-		}
-		[CCode (cheader_filename = "gst/rtsp/rtsp.h", has_type_id = false)]
 		[GIR (name = "RTSPRange")]
 		public struct Range {
 			public int min;
diff --git a/vapi/gstreamer-rtsp-server-1.0.vapi b/vapi/gstreamer-rtsp-server-1.0.vapi
index b27da7444..3305cadd0 100644
--- a/vapi/gstreamer-rtsp-server-1.0.vapi
+++ b/vapi/gstreamer-rtsp-server-1.0.vapi
@@ -498,7 +498,7 @@ namespace Gst {
 			public weak Gst.RTSPServer.Server server;
 			public weak Gst.RTSP.Connection conn;
 			public weak Gst.RTSPServer.Client client;
-			public Gst.RTSP.Message request;
+			public weak Gst.RTSP.Message request;
 			public weak Gst.RTSP.Url uri;
 			public Gst.RTSP.Method method;
 			public weak Gst.RTSPServer.Auth auth;
@@ -508,7 +508,7 @@ namespace Gst {
 			public weak Gst.RTSPServer.MediaFactory factory;
 			public weak Gst.RTSPServer.Media media;
 			public weak Gst.RTSPServer.Stream stream;
-			public Gst.RTSP.Message response;
+			public weak Gst.RTSP.Message response;
 			[CCode (cname = "gst_rtsp_context_pop_current")]
 			public void pop_current ();
 			[CCode (cname = "gst_rtsp_context_push_current")]