From ad65257abb0d149b03fc71d6cd6fd1a787e253a1 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Fri, 9 Jul 2021 14:19:02 +0200 Subject: [PATCH] gstreamer: Update from 1.19.0+ git master --- vapi/gst-editing-services-1.0.vapi | 10 ++++++ vapi/gstreamer-1.0.vapi | 8 ++--- vapi/gstreamer-audio-1.0.vapi | 3 ++ vapi/gstreamer-base-1.0.vapi | 6 ++-- vapi/gstreamer-rtp-1.0.vapi | 8 +++-- vapi/gstreamer-rtsp-server-1.0.vapi | 2 ++ vapi/gstreamer-video-1.0.vapi | 22 +++++++++++-- vapi/gstreamer-webrtc-1.0.vapi | 51 ++++------------------------- 8 files changed, 54 insertions(+), 56 deletions(-) diff --git a/vapi/gst-editing-services-1.0.vapi b/vapi/gst-editing-services-1.0.vapi index 252bba44f..df798325f 100644 --- a/vapi/gst-editing-services-1.0.vapi +++ b/vapi/gst-editing-services-1.0.vapi @@ -304,6 +304,9 @@ namespace GES { public bool move (GES.Marker marker, Gst.ClockTime position); public bool remove (GES.Marker marker); public uint size (); + [NoAccessorMethod] + [Version (since = "1.20")] + public GES.MarkerFlags flags { get; set construct; } public signal void marker_added (uint64 position, GES.Marker marker); public signal void marker_moved (uint64 previous_position, uint64 new_position, GES.Marker marker); public signal void marker_removed (GES.Marker marker); @@ -1045,6 +1048,13 @@ namespace GES { INVALID_OVERLAP_IN_TRACK, INVALID_EFFECT_BIN_DESCRIPTION } + [CCode (cheader_filename = "ges/ges.h", cprefix = "GES_MARKER_FLAG_", type_id = "ges_marker_flags_get_type ()")] + [Flags] + [Version (since = "1.20")] + public enum MarkerFlags { + NONE, + SNAPPABLE + } [CCode (cheader_filename = "ges/ges.h", cprefix = "GES_META_", type_id = "ges_meta_flag_get_type ()")] [Flags] public enum MetaFlag { diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi index 466420c97..074b43f5b 100644 --- a/vapi/gstreamer-1.0.vapi +++ b/vapi/gstreamer-1.0.vapi @@ -636,7 +636,7 @@ namespace Gst { [Version (since = "1.10")] public Gst.ElementFlags get_suppressed_flags (); [NoWrapper] - public virtual void handle_message (Gst.Message message); + public virtual void handle_message (owned Gst.Message message); [Version (since = "1.18")] public Gst.Iterator? iterate_all_by_element_factory_name (string factory_name); public Gst.Iterator? iterate_all_by_interface (GLib.Type iface); @@ -698,9 +698,6 @@ namespace Gst { public void append_memory (owned Gst.Memory mem); [DestroysInstance] public Gst.Buffer append_region (owned Gst.Buffer buf2, ssize_t offset, ssize_t size); - [CCode (has_construct_function = false)] - [Version (since = "1.20")] - public Buffer.copy ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "gsize")] uint8[] data); [Version (since = "1.6")] public Gst.Buffer copy_deep (); [CCode (instance_pos = 1.9)] @@ -739,6 +736,9 @@ namespace Gst { public bool map (out Gst.MapInfo info, Gst.MapFlags flags); public bool map_range (uint idx, int length, out Gst.MapInfo info, Gst.MapFlags flags); public int memcmp (size_t offset, [CCode (array_length_cname = "size", array_length_pos = 2.1, array_length_type = "gsize")] uint8[] mem); + [CCode (has_construct_function = false)] + [Version (since = "1.20")] + public Buffer.memdup ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "gsize")] uint8[] data); public size_t memset (size_t offset, uint8 val, size_t size); public uint n_memory (); [CCode (has_construct_function = false, simple_generics = true)] diff --git a/vapi/gstreamer-audio-1.0.vapi b/vapi/gstreamer-audio-1.0.vapi index 6951c5963..a98c6211f 100644 --- a/vapi/gstreamer-audio-1.0.vapi +++ b/vapi/gstreamer-audio-1.0.vapi @@ -45,6 +45,9 @@ namespace Gst { public virtual Gst.Buffer convert_buffer (Gst.Audio.Info in_info, Gst.Audio.Info out_info, Gst.Buffer buffer); [NoWrapper] public virtual void update_conversion_info (); + [NoAccessorMethod] + [Version (since = "1.20")] + public bool qos_messages { get; set; } } [CCode (cheader_filename = "gst/audio/audio.h", type_id = "gst_audio_base_sink_get_type ()")] [GIR (name = "AudioBaseSink")] diff --git a/vapi/gstreamer-base-1.0.vapi b/vapi/gstreamer-base-1.0.vapi index 55de7ff70..e7ab05888 100644 --- a/vapi/gstreamer-base-1.0.vapi +++ b/vapi/gstreamer-base-1.0.vapi @@ -801,7 +801,7 @@ namespace Gst { [NoWrapper] public virtual bool filter_meta (Gst.Query query, GLib.Type api, Gst.Structure @params); [NoWrapper] - public virtual Gst.Caps fixate_caps (Gst.PadDirection direction, Gst.Caps caps, Gst.Caps othercaps); + public virtual Gst.Caps fixate_caps (Gst.PadDirection direction, Gst.Caps caps, owned Gst.Caps othercaps); [NoWrapper] public virtual Gst.FlowReturn generate_output (out Gst.Buffer outbuf); public void get_allocator (out Gst.Allocator? allocator, out unowned Gst.AllocationParams @params); @@ -830,9 +830,9 @@ namespace Gst { public void set_prefer_passthrough (bool prefer_passthrough); public void set_qos_enabled (bool enabled); [NoWrapper] - public virtual bool sink_event (Gst.Event event); + public virtual bool sink_event (owned Gst.Event event); [NoWrapper] - public virtual bool src_event (Gst.Event event); + public virtual bool src_event (owned Gst.Event event); [NoWrapper] public virtual bool start (); [NoWrapper] diff --git a/vapi/gstreamer-rtp-1.0.vapi b/vapi/gstreamer-rtp-1.0.vapi index 30ca416a0..846dbb67c 100644 --- a/vapi/gstreamer-rtp-1.0.vapi +++ b/vapi/gstreamer-rtp-1.0.vapi @@ -366,7 +366,6 @@ namespace Gst { [GIR (name = "RTPHeaderExtension")] [Version (since = "1.20")] public abstract class HeaderExtension : Gst.Element { - public uint ext_id; [CCode (has_construct_function = false)] protected HeaderExtension (); public static Gst.RTP.HeaderExtension? create_from_uri (string uri); @@ -375,7 +374,7 @@ namespace Gst { public string get_sdp_caps_field_name (); public virtual Gst.RTP.HeaderExtensionFlags get_supported_flags (); public unowned string get_uri (); - public virtual bool read (Gst.RTP.HeaderExtensionFlags read_flags, [CCode (array_length_cname = "size", array_length_pos = 2.5, array_length_type = "gsize", type = "const guint8*")] uint8[] data, Gst.Buffer buffer); + public virtual bool read (Gst.RTP.HeaderExtensionFlags read_flags, [CCode (array_length_cname = "size", array_length_pos = 2.5, array_length_type = "gsize")] uint8[] data, Gst.Buffer buffer); public virtual bool set_attributes_from_caps (Gst.Caps caps); public bool set_attributes_from_caps_simple_sdp (Gst.Caps caps); public virtual bool set_caps_from_attributes (Gst.Caps caps); @@ -386,7 +385,8 @@ namespace Gst { public class void set_uri (string uri); public void set_wants_update_non_rtp_src_caps (bool state); public virtual bool update_non_rtp_src_caps (Gst.Caps caps); - public virtual size_t write (Gst.Buffer input_meta, Gst.RTP.HeaderExtensionFlags write_flags, Gst.Buffer output, [CCode (array_length_cname = "size", array_length_pos = 4.1, array_length_type = "gsize", type = "guint8*")] uint8[] data); + public bool wants_update_non_rtp_src_caps (); + public virtual size_t write (Gst.Buffer input_meta, Gst.RTP.HeaderExtensionFlags write_flags, Gst.Buffer output, [CCode (array_length_cname = "size", array_length_pos = 4.1, array_length_type = "gsize")] uint8[] data); } [CCode (cheader_filename = "gst/rtp/rtp.h", has_type_id = false)] [GIR (name = "RTPBuffer")] @@ -444,6 +444,8 @@ namespace Gst { public static Gst.Buffer new_copy_data ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "gsize")] uint8[] data); public static Gst.Buffer new_take_data ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "gsize")] owned uint8[] data); public void pad_to (uint len); + [Version (since = "1.20")] + public void remove_extension_data (); public void set_csrc (uint8 idx, uint32 csrc); public void set_extension (bool extension); public bool set_extension_data (uint16 bits, uint16 length); diff --git a/vapi/gstreamer-rtsp-server-1.0.vapi b/vapi/gstreamer-rtsp-server-1.0.vapi index a874587c7..d1128133e 100644 --- a/vapi/gstreamer-rtsp-server-1.0.vapi +++ b/vapi/gstreamer-rtsp-server-1.0.vapi @@ -731,6 +731,8 @@ namespace Gst { public void set_ulpfec_pt (uint pt); public GLib.List transport_filter (Gst.RTSPServer.StreamTransportFilterFunc? func); public bool unblock_linked (); + [Version (since = "1.20")] + public void unblock_rtcp (); public bool update_crypto (uint ssrc, Gst.Caps? crypto); [Version (since = "1.16")] public bool verify_mcast_ttl (uint ttl); diff --git a/vapi/gstreamer-video-1.0.vapi b/vapi/gstreamer-video-1.0.vapi index 8ce7cd790..db41717ea 100644 --- a/vapi/gstreamer-video-1.0.vapi +++ b/vapi/gstreamer-video-1.0.vapi @@ -157,9 +157,13 @@ namespace Gst { [NoWrapper] public virtual Gst.FlowReturn drain (); public Gst.FlowReturn drop_frame (owned Gst.Video.CodecFrame frame); + [Version (since = "1.20")] + public Gst.FlowReturn drop_subframe (owned Gst.Video.CodecFrame frame); [NoWrapper] public virtual Gst.FlowReturn finish (); public Gst.FlowReturn finish_frame (owned Gst.Video.CodecFrame frame); + [Version (since = "1.20")] + public Gst.FlowReturn finish_subframe (owned Gst.Video.CodecFrame frame); [NoWrapper] public virtual bool flush (); public void get_allocator (out Gst.Allocator allocator, out Gst.AllocationParams @params); @@ -167,6 +171,8 @@ namespace Gst { public int get_estimate_rate (); public Gst.Video.CodecFrame get_frame (int frame_number); public GLib.List get_frames (); + [Version (since = "1.20")] + public uint get_input_subframe_index (Gst.Video.CodecFrame frame); public void get_latency (out Gst.ClockTime min_latency, out Gst.ClockTime max_latency); public Gst.ClockTimeDiff get_max_decode_time (Gst.Video.CodecFrame frame); public int get_max_errors (); @@ -179,13 +185,19 @@ namespace Gst { public bool get_packetized (); [Version (since = "1.4")] public size_t get_pending_frame_size (); + [Version (since = "1.20")] + public uint get_processed_subframe_index (Gst.Video.CodecFrame frame); [Version (since = "1.0.3")] public double get_qos_proportion (); + [Version (since = "1.20")] + public bool get_subframe_mode (); [NoWrapper] public virtual Gst.Caps getcaps (Gst.Caps filter); [NoWrapper] - public virtual Gst.FlowReturn handle_frame (Gst.Video.CodecFrame frame); + public virtual Gst.FlowReturn handle_frame (owned Gst.Video.CodecFrame frame); public Gst.FlowReturn have_frame (); + [Version (since = "1.20")] + public Gst.FlowReturn have_last_subframe (Gst.Video.CodecFrame frame); public void merge_tags (Gst.TagList? tags, Gst.TagMergeMode mode); public virtual bool negotiate (); [NoWrapper] @@ -215,6 +227,8 @@ namespace Gst { public void set_needs_sync_point (bool enabled); public Gst.Video.CodecState set_output_state (Gst.Video.Format fmt, uint width, uint height, Gst.Video.CodecState? reference); public void set_packetized (bool packetized); + [Version (since = "1.20")] + public void set_subframe_mode (bool subframe_mode); [Version (since = "1.6")] public void set_use_default_pad_acceptcaps (bool use); [NoWrapper] @@ -444,7 +458,8 @@ namespace Gst { public int width; [CCode (has_construct_function = false)] protected Sink (); - public static void center_rect (Gst.Video.Rectangle src, Gst.Video.Rectangle dst, Gst.Video.Rectangle result, bool scaling); + [Version (deprecated = true, deprecated_since = "1.20")] + public static void center_rect (Gst.Video.Rectangle src, Gst.Video.Rectangle dst, out Gst.Video.Rectangle result, bool scaling); [NoWrapper] [Version (since = "1.20")] public virtual bool set_info (Gst.Caps caps, Gst.Video.Info info); @@ -1772,6 +1787,9 @@ namespace Gst { [Version (since = "1.16")] public static Gst.Caps caption_type_to_caps (Gst.Video.CaptionType type); [CCode (cheader_filename = "gst/video/video.h")] + [Version (since = "1.20")] + public static void center_rect (Gst.Video.Rectangle src, Gst.Video.Rectangle dst, out Gst.Video.Rectangle result, bool scaling); + [CCode (cheader_filename = "gst/video/video.h")] [Version (deprecated = true, deprecated_since = "1.20")] public static Gst.Video.ChromaSite chroma_from_string (string s); [CCode (cheader_filename = "gst/video/video.h")] diff --git a/vapi/gstreamer-webrtc-1.0.vapi b/vapi/gstreamer-webrtc-1.0.vapi index d0b79704b..3e0059b4d 100644 --- a/vapi/gstreamer-webrtc-1.0.vapi +++ b/vapi/gstreamer-webrtc-1.0.vapi @@ -4,13 +4,8 @@ namespace Gst { [CCode (cheader_filename = "gst/webrtc/webrtc.h", lower_case_csuffix = "webrtc_dtls_transport", type_id = "gst_webrtc_dtls_transport_get_type ()")] public class WebRTCDTLSTransport : Gst.Object { - [CCode (array_length = false)] - public weak void* _padding[4]; - public weak Gst.Element dtlssrtpdec; - public weak Gst.Element dtlssrtpenc; [CCode (has_construct_function = false)] - public WebRTCDTLSTransport (uint session_id); - public void set_transport (Gst.WebRTCICETransport ice); + protected WebRTCDTLSTransport (); [NoAccessorMethod] public string certificate { owned get; set; } [NoAccessorMethod] @@ -27,9 +22,6 @@ namespace Gst { [CCode (cheader_filename = "gst/webrtc/webrtc.h", lower_case_csuffix = "webrtc_data_channel", type_id = "gst_webrtc_data_channel_get_type ()")] [Version (since = "1.18")] public abstract class WebRTCDataChannel : GLib.Object { - [CCode (array_length = false)] - public weak void* _padding[4]; - public GLib.Mutex @lock; [CCode (has_construct_function = false)] protected WebRTCDataChannel (); [NoAccessorMethod] @@ -55,39 +47,22 @@ namespace Gst { [NoAccessorMethod] public Gst.WebRTCDataChannelState ready_state { get; } [HasEmitter] - public virtual signal void close (); - [HasEmitter] + public signal void close (); public signal void on_buffered_amount_low (); - [HasEmitter] public signal void on_close (); - [HasEmitter] public signal void on_error (GLib.Error error); - [HasEmitter] public signal void on_message_data (GLib.Bytes? data); - [HasEmitter] - public signal void on_message_string (string? str); - [HasEmitter] + public signal void on_message_string (string? data); public signal void on_open (); [HasEmitter] - public virtual signal void send_data (GLib.Bytes? data); + public signal void send_data (GLib.Bytes? data); [HasEmitter] - public virtual signal void send_string (string? str); + public signal void send_string (string? str); } [CCode (cheader_filename = "gst/webrtc/webrtc.h", lower_case_csuffix = "webrtc_ice_transport", type_id = "gst_webrtc_ice_transport_get_type ()")] public abstract class WebRTCICETransport : Gst.Object { - [CCode (array_length = false)] - public weak void* _padding[4]; - public Gst.WebRTCICERole role; - public weak Gst.Element sink; - public weak Gst.Element src; [CCode (has_construct_function = false)] protected WebRTCICETransport (); - public void connection_state_change (Gst.WebRTCICEConnectionState new_state); - [NoWrapper] - public virtual bool gather_candidates (); - public void gathering_state_change (Gst.WebRTCICEGatheringState new_state); - public void new_candidate (uint stream_id, Gst.WebRTCICEComponent component, string attr); - public void selected_pair_change (); [NoAccessorMethod] public Gst.WebRTCICEComponent component { get; construct; } [NoAccessorMethod] @@ -98,24 +73,17 @@ namespace Gst { public signal void on_selected_candidate_pair_change (); } [CCode (cheader_filename = "gst/webrtc/webrtc.h", lower_case_csuffix = "webrtc_rtp_receiver", type_id = "gst_webrtc_rtp_receiver_get_type ()")] - [Version (since = "1.16")] public class WebRTCRTPReceiver : Gst.Object { - [CCode (array_length = false)] - public weak void* _padding[4]; [CCode (has_construct_function = false)] - public WebRTCRTPReceiver (); + protected WebRTCRTPReceiver (); [NoAccessorMethod] [Version (since = "1.20")] public Gst.WebRTCDTLSTransport transport { owned get; } } [CCode (cheader_filename = "gst/webrtc/webrtc.h", lower_case_csuffix = "webrtc_rtp_sender", type_id = "gst_webrtc_rtp_sender_get_type ()")] - [Version (since = "1.16")] public class WebRTCRTPSender : Gst.Object { - [CCode (array_length = false)] - public weak void* _padding[4]; - public weak GLib.Array send_encodings; [CCode (has_construct_function = false)] - public WebRTCRTPSender (); + protected WebRTCRTPSender (); [Version (since = "1.20")] public void set_priority (Gst.WebRTCPriorityType priority); [NoAccessorMethod] @@ -126,12 +94,7 @@ namespace Gst { public Gst.WebRTCDTLSTransport transport { owned get; } } [CCode (cheader_filename = "gst/webrtc/webrtc.h", lower_case_csuffix = "webrtc_rtp_transceiver", type_id = "gst_webrtc_rtp_transceiver_get_type ()")] - [Version (since = "1.16")] public abstract class WebRTCRTPTransceiver : Gst.Object { - [CCode (array_length = false)] - public weak void* _padding[4]; - public uint mline; - public bool stopped; [CCode (has_construct_function = false)] protected WebRTCRTPTransceiver (); [NoAccessorMethod] -- 2.47.2