From 21b40bded31cc66fc3aac4477459cdfdd56e8ce6 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Mon, 23 Mar 2020 17:12:28 +0100 Subject: gstreamer: Update from 1.17.0+ git master --- vapi/gst-editing-services-1.0.vapi | 59 +++++++++++++++++++++++++------------- vapi/gstreamer-1.0.vapi | 4 +++ vapi/gstreamer-audio-1.0.vapi | 6 ++-- vapi/gstreamer-rtp-1.0.vapi | 3 ++ vapi/gstreamer-video-1.0.vapi | 14 +++++++-- vapi/metadata/GES-1.0.metadata | 4 +-- 6 files changed, 63 insertions(+), 27 deletions(-) diff --git a/vapi/gst-editing-services-1.0.vapi b/vapi/gst-editing-services-1.0.vapi index 5d99f68b8..0db246c84 100644 --- a/vapi/gst-editing-services-1.0.vapi +++ b/vapi/gst-editing-services-1.0.vapi @@ -6,7 +6,7 @@ namespace GES { public class Asset : GLib.Object, GES.MetaContainer, GLib.AsyncInitable, GLib.Initable { [CCode (has_construct_function = false)] protected Asset (); - public virtual unowned GES.Extractable? extract () throws GLib.Error; + public virtual unowned GES.Extractable extract () throws GLib.Error; [Version (since = "1.8")] public unowned GLib.Error? get_error (); public GLib.Type get_extractable_type (); @@ -18,13 +18,13 @@ namespace GES { [CCode (cname = "ges_list_assets")] public static GLib.List list_assets (GLib.Type filter); public unowned GLib.List list_proxies (); - public static bool needs_reload (GLib.Type extractable_type, string id); + public static bool needs_reload (GLib.Type extractable_type, string? id); [NoWrapper] public virtual void proxied (GES.Asset proxy); [CCode (cname = "ges_asset_request", has_construct_function = false)] public Asset.request (GLib.Type extractable_type, string? id) throws GLib.Error; [CCode (cname = "ges_asset_request_async", has_construct_function = false, type = "void")] - public async Asset.request_async (GLib.Type extractable_type, string id, GLib.Cancellable? cancellable) throws GLib.Error; + public async Asset.request_async (GLib.Type extractable_type, string? id, GLib.Cancellable? cancellable) throws GLib.Error; [NoWrapper] public virtual bool request_id_update (string proposed_new_id, GLib.Error error); public bool set_proxy (GES.Asset? proxy); @@ -34,8 +34,7 @@ namespace GES { public GLib.Type extractable_type { get; construct; } public string id { get; construct; } public GES.Asset proxy { get; set; } - [NoAccessorMethod] - public GES.Asset proxy_target { owned get; set; } + public GES.Asset proxy_target { get; } } [CCode (cheader_filename = "ges/ges.h", type_id = "ges_audio_source_get_type ()")] public abstract class AudioSource : GES.Source, GES.Extractable, GES.MetaContainer { @@ -93,6 +92,10 @@ namespace GES { [CCode (has_construct_function = false)] protected Clip (); public unowned GES.TrackElement? add_asset (GES.Asset asset); + [NoWrapper] + public virtual unowned GES.TrackElement? create_track_element (GES.TrackType type); + [NoWrapper] + public virtual GLib.List create_track_elements (GES.TrackType type); public GES.TrackElement? find_track_element (GES.Track? track, GLib.Type type); public GLib.List find_track_elements (GES.Track? track, GES.TrackType track_type, GLib.Type type); public GES.Layer? get_layer (); @@ -133,7 +136,7 @@ namespace GES { [NoWrapper] public virtual bool add_child (GES.TimelineElement element); [Version (deprecated = true, deprecated_since = "1.18")] - public virtual bool edit (GLib.List layers, int new_layer_priority, GES.EditMode mode, GES.Edge edge, uint64 position); + public virtual bool edit (GLib.List? layers, int new_layer_priority, GES.EditMode mode, GES.Edge edge, uint64 position); public GLib.List get_children (bool recursive); public static unowned GES.Container group (GLib.List? containers); public bool remove (GES.TimelineElement child); @@ -285,8 +288,8 @@ namespace GES { [CCode (has_construct_function = false)] public Pipeline (); public GES.PipelineFlags get_mode (); - public Gst.Sample? get_thumbnail (Gst.Caps caps); - public Gst.Sample? get_thumbnail_rgb24 (int width, int height); + public Gst.Sample get_thumbnail (Gst.Caps caps); + public Gst.Sample get_thumbnail_rgb24 (int width, int height); public Gst.Element preview_get_audio_sink (); public Gst.Element preview_get_video_sink (); public void preview_set_audio_sink (Gst.Element sink); @@ -296,6 +299,7 @@ namespace GES { public bool set_render_settings (string output_uri, Gst.PbUtils.EncodingProfile profile); public bool set_timeline (owned GES.Timeline timeline); [NoAccessorMethod] + [Version (since = "1.6.0")] public Gst.Element audio_filter { owned get; set; } [NoAccessorMethod] public Gst.Element audio_sink { owned get; set; } @@ -303,6 +307,7 @@ namespace GES { [NoAccessorMethod] public GES.Timeline timeline { owned get; set; } [NoAccessorMethod] + [Version (since = "1.6.0")] public Gst.Element video_filter { owned get; set; } [NoAccessorMethod] public Gst.Element video_sink { owned get; set; } @@ -430,6 +435,7 @@ namespace GES { public weak GLib.List tracks; [CCode (has_construct_function = false)] public Timeline (); + [Version (deprecated = true, deprecated_since = "1.18")] public bool add_layer (GES.Layer layer); public bool add_track (owned GES.Track track); public unowned GES.Layer append_layer (); @@ -453,7 +459,7 @@ namespace GES { public bool load_from_uri (string uri) throws GLib.Error; [Version (since = "1.16")] public bool move_layer (GES.Layer layer, uint new_layer_priority); - public unowned GES.TimelineElement paste_element (GES.TimelineElement element, Gst.ClockTime position, int layer_priority); + public GES.TimelineElement? paste_element (GES.TimelineElement element, Gst.ClockTime position, int layer_priority); public bool remove_layer (GES.Layer layer); public bool remove_track (GES.Track track); public bool save_to_uri (string uri, GES.Asset? formatter_asset, bool overwrite) throws GLib.Error; @@ -464,7 +470,7 @@ namespace GES { public uint64 snapping_distance { get; set; } public signal void commited (); public virtual signal void group_added (GES.Group group); - public signal void group_removed (GES.Group group, owned GLib.GenericArray children); + public signal void group_removed (GES.Group group, GLib.GenericArray children); public virtual signal void layer_added (GES.Layer layer); public virtual signal void layer_removed (GES.Layer layer); public signal GLib.GenericArray select_tracks_for_object (GES.Clip clip, GES.TrackElement track_element); @@ -485,7 +491,7 @@ namespace GES { [NoWrapper] public virtual void deep_copy (GES.TimelineElement copy); [Version (since = "1.18")] - public bool edit (GLib.List layers, int64 new_layer_priority, GES.EditMode mode, GES.Edge edge, uint64 position); + public bool edit (GLib.List? layers, int64 new_layer_priority, GES.EditMode mode, GES.Edge edge, uint64 position); public bool get_child_property (string property_name, out GLib.Value value); public GLib.Value get_child_property_by_pspec (GLib.ParamSpec pspec); public Gst.ClockTime get_duration (); @@ -505,7 +511,7 @@ namespace GES { public GLib.ParamSpec[] list_children_properties (); public virtual bool lookup_child (string prop_name, out GLib.Object child, out GLib.ParamSpec pspec); [Version (since = "1.6.0")] - public GES.TimelineElement paste (Gst.ClockTime paste_position); + public GES.TimelineElement? paste (Gst.ClockTime paste_position); public bool remove_child_property (GLib.ParamSpec pspec); public virtual bool ripple (uint64 start); public virtual bool ripple_end (uint64 end); @@ -530,11 +536,14 @@ namespace GES { public uint64 max_duration { get; set construct; } public string name { owned get; set construct; } public GES.TimelineElement parent { owned get; set; } + [Version (deprecated = true, deprecated_since = "1.10")] public uint priority { get; set; } [NoAccessorMethod] public bool serialize { get; set; } public uint64 start { get; set; } public GES.Timeline timeline { owned get; set; } + public signal void child_property_added (GLib.Object prop_object, GLib.ParamSpec prop); + public signal void child_property_removed (GLib.Object prop_object, GLib.ParamSpec prop); public signal void deep_notify (GLib.Object prop_object, GLib.ParamSpec prop); } [CCode (cheader_filename = "ges/ges.h", type_id = "ges_title_clip_get_type ()")] @@ -638,6 +647,7 @@ namespace GES { [NoAccessorMethod] public uint64 duration { get; } [NoAccessorMethod] + [Version (since = "1.18")] public string id { owned get; set; } public bool mixing { get; set construct; } public Gst.Caps restriction_caps { owned get; set; } @@ -657,7 +667,7 @@ namespace GES { [NoWrapper] public virtual void changed (); [Version (deprecated = true, deprecated_since = "1.18")] - public bool edit (GLib.List layers, GES.EditMode mode, GES.Edge edge, uint64 position); + public bool edit (GLib.List? layers, GES.EditMode mode, GES.Edge edge, uint64 position); public unowned GLib.HashTable get_all_control_bindings (); public unowned Gst.ControlBinding? get_control_binding (string property_name); public unowned Gst.Element get_element (); @@ -676,9 +686,12 @@ namespace GES { public bool remove_control_binding (string property_name); public bool set_active (bool active); public bool set_control_source (Gst.ControlSource source, string property_name, string binding_type); + public void set_has_internal_source (bool has_internal_source); public void set_track_type (GES.TrackType type); [NoAccessorMethod] public bool active { get; set; } + [NoAccessorMethod] + public bool has_internal_source { get; set; } public GES.Track track { get; } public GES.TrackType track_type { get; set construct; } public signal void control_binding_added (Gst.ControlBinding control_binding); @@ -756,6 +769,7 @@ namespace GES { public abstract class VideoSource : GES.Source, GES.Extractable, GES.MetaContainer { [CCode (has_construct_function = false)] protected VideoSource (); + public bool get_natural_size (out int width, out int height); } [CCode (cheader_filename = "ges/ges.h", type_id = "ges_video_test_source_get_type ()")] public class VideoTestSource : GES.VideoSource, GES.Extractable, GES.MetaContainer { @@ -808,7 +822,7 @@ namespace GES { [CCode (cheader_filename = "ges/ges.h", type_cname = "GESMetaContainerInterface", type_id = "ges_meta_container_get_type ()")] public interface MetaContainer : GLib.Object { public bool add_metas_from_string (string str); - public bool check_meta_registered (string meta_item, GES.MetaFlag flags, GLib.Type type); + public bool check_meta_registered (string meta_item, out GES.MetaFlag? flags, out GLib.Type? type); public void @foreach (GES.MetaForeachFunc func); public bool get_boolean (string meta_item, out bool dest); public bool get_date (string meta_item, out GLib.Date dest); @@ -823,16 +837,16 @@ namespace GES { public unowned string get_string (string meta_item); public bool get_uint (string meta_item, out uint dest); public bool get_uint64 (string meta_item, out uint64 dest); - public string? metas_to_string (); + public string metas_to_string (); public bool register_meta (GES.MetaFlag flags, string meta_item, GLib.Value value); public bool register_meta_boolean (GES.MetaFlag flags, string meta_item, bool value); - public bool register_meta_date (GES.MetaFlag flags, string meta_item, GLib.Date? value); - public bool register_meta_date_time (GES.MetaFlag flags, string meta_item, Gst.DateTime? value); + public bool register_meta_date (GES.MetaFlag flags, string meta_item, GLib.Date value); + public bool register_meta_date_time (GES.MetaFlag flags, string meta_item, Gst.DateTime value); public bool register_meta_double (GES.MetaFlag flags, string meta_item, double value); public bool register_meta_float (GES.MetaFlag flags, string meta_item, float value); public bool register_meta_int (GES.MetaFlag flags, string meta_item, int value); public bool register_meta_int64 (GES.MetaFlag flags, string meta_item, int64 value); - public bool register_meta_string (GES.MetaFlag flags, string meta_item, string? value); + public bool register_meta_string (GES.MetaFlag flags, string meta_item, string value); public bool register_meta_uint (GES.MetaFlag flags, string meta_item, uint value); public bool register_meta_uint64 (GES.MetaFlag flags, string meta_item, uint64 value); public bool register_static_meta (GES.MetaFlag flags, string meta_item, GLib.Type type); @@ -844,12 +858,12 @@ namespace GES { public bool set_int (string meta_item, int value); public bool set_int64 (string meta_item, int64 value); [Version (since = "1.18")] - public bool set_marker_list (string meta_item, GES.MarkerList? list); + public bool set_marker_list (string meta_item, GES.MarkerList list); public bool set_meta (string meta_item, GLib.Value? value); public bool set_string (string meta_item, string value); public bool set_uint (string meta_item, uint value); public bool set_uint64 (string meta_item, uint64 value); - public signal void notify_meta (string object, GLib.Value p0); + public signal void notify_meta (string key, GLib.Value? value); } [CCode (cheader_filename = "ges/ges.h", cprefix = "GES_ASSET_LOADING_", has_type_id = false)] public enum AssetLoadingReturn { @@ -1053,8 +1067,13 @@ namespace GES { SOLID_COLOR } [CCode (cheader_filename = "ges/ges.h", has_target = false)] + public delegate unowned GES.TrackElement? CreateTrackElementFunc (GES.Clip clip, GES.TrackType type); + [CCode (cheader_filename = "ges/ges.h", has_target = false)] + public delegate GLib.List CreateTrackElementsFunc (GES.Clip clip, GES.TrackType type); + [CCode (cheader_filename = "ges/ges.h", has_target = false)] public delegate string ExtractableCheckId (GLib.Type type, string id) throws GLib.Error; [CCode (cheader_filename = "ges/ges.h", has_target = false)] + [Version (deprecated = true, deprecated_since = "1.18")] public delegate bool FillTrackElementFunc (GES.Clip clip, GES.TrackElement track_element, Gst.Element nleobj); [CCode (cheader_filename = "ges/ges.h", has_target = false)] public delegate bool FormatterCanLoadURIMethod (GES.Formatter dummy_instance, string uri) throws GLib.Error; diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi index 1c3b22216..8165d2882 100644 --- a/vapi/gstreamer-1.0.vapi +++ b/vapi/gstreamer-1.0.vapi @@ -2721,6 +2721,8 @@ namespace Gst { public static void append_value (GLib.Value value, GLib.Value append_value); public static uint get_size (GLib.Value value); public static unowned GLib.Value? get_value (GLib.Value value, uint index); + [Version (since = "1.18")] + public static unowned GLib.Value? init (GLib.Value value, uint prealloc); public static void prepend_value (GLib.Value value, GLib.Value prepend_value); } [CCode (cheader_filename = "gst/gst.h", type_id = "gst_value_list_get_type ()")] @@ -2733,6 +2735,8 @@ namespace Gst { public static void concat (out GLib.Value dest, GLib.Value value1, GLib.Value value2); public static uint get_size (GLib.Value value); public static unowned GLib.Value? get_value (GLib.Value value, uint index); + [Version (since = "1.18")] + public static unowned GLib.Value? init (GLib.Value value, uint prealloc); public static void merge (out GLib.Value dest, GLib.Value value1, GLib.Value value2); public static void prepend_value (GLib.Value value, GLib.Value prepend_value); } diff --git a/vapi/gstreamer-audio-1.0.vapi b/vapi/gstreamer-audio-1.0.vapi index bffa24ff1..d1e690917 100644 --- a/vapi/gstreamer-audio-1.0.vapi +++ b/vapi/gstreamer-audio-1.0.vapi @@ -181,9 +181,9 @@ namespace Gst { public virtual bool close (); [NoWrapper] public virtual bool decide_allocation (Gst.Query query); - public Gst.FlowReturn finish_frame (Gst.Buffer buf, int frames); + public Gst.FlowReturn finish_frame (owned Gst.Buffer? buf, int frames); [Version (since = "1.16")] - public Gst.FlowReturn finish_subframe (Gst.Buffer buf); + public Gst.FlowReturn finish_subframe (owned Gst.Buffer? buf); [NoWrapper] public virtual void flush (bool hard); public void get_allocator (out Gst.Allocator allocator, out Gst.AllocationParams @params); @@ -266,7 +266,7 @@ namespace Gst { public virtual bool close (); [NoWrapper] public virtual bool decide_allocation (Gst.Query query); - public Gst.FlowReturn finish_frame (Gst.Buffer buffer, int samples); + public Gst.FlowReturn finish_frame (owned Gst.Buffer? buffer, int samples); [NoWrapper] public virtual void flush (); public void get_allocator (out Gst.Allocator allocator, out Gst.AllocationParams @params); diff --git a/vapi/gstreamer-rtp-1.0.vapi b/vapi/gstreamer-rtp-1.0.vapi index ba951aeff..b3044fc1b 100644 --- a/vapi/gstreamer-rtp-1.0.vapi +++ b/vapi/gstreamer-rtp-1.0.vapi @@ -103,6 +103,9 @@ namespace Gst { [NoAccessorMethod] public int64 ptime_multiple { get; set; } [NoAccessorMethod] + [Version (since = "1.18")] + public bool scale_rtptime { get; set; } + [NoAccessorMethod] public uint seqnum { get; } [NoAccessorMethod] public int seqnum_offset { get; set; } diff --git a/vapi/gstreamer-video-1.0.vapi b/vapi/gstreamer-video-1.0.vapi index 3a6af3673..a7c9da9b0 100644 --- a/vapi/gstreamer-video-1.0.vapi +++ b/vapi/gstreamer-video-1.0.vapi @@ -523,6 +523,8 @@ namespace Gst { public static bool event_parse_key_event (Gst.Event event, out unowned string key); public static bool event_parse_mouse_button_event (Gst.Event event, out int button, out double x, out double y); public static bool event_parse_mouse_move_event (Gst.Event event, out double x, out double y); + [Version (since = "1.18")] + public static bool event_parse_mouse_scroll_event (Gst.Event event, out double x, out double y, out double delta_x, out double delta_y); public static Gst.Video.NavigationMessageType message_get_type (Gst.Message message); public static Gst.Message message_new_angles_changed (Gst.Object src, uint cur_angle, uint n_angles); public static Gst.Message message_new_commands_changed (Gst.Object src); @@ -545,6 +547,8 @@ namespace Gst { public abstract void send_event (Gst.Structure structure); public void send_key_event (string event, string key); public void send_mouse_event (string event, int button, double x, double y); + [Version (since = "1.18")] + public void send_mouse_scroll_event (double x, double y, double delta_x, double delta_y); } [CCode (cheader_filename = "gst/video/video.h", type_id = "gst_video_orientation_get_type ()")] [GIR (name = "VideoOrientation")] @@ -1169,7 +1173,9 @@ namespace Gst { Y444_16BE, Y444_16LE, P016_BE, - P016_LE + P016_LE, + P012_BE, + P012_LE } [CCode (cheader_filename = "gst/video/video.h", cprefix = "GST_VIDEO_FORMAT_FLAG_", type_id = "gst_video_format_flags_get_type ()")] [Flags] @@ -1323,7 +1329,8 @@ namespace Gst { MOUSE_BUTTON_PRESS, MOUSE_BUTTON_RELEASE, MOUSE_MOVE, - COMMAND + COMMAND, + MOUSE_SCROLL } [CCode (cheader_filename = "gst/video/video.h", cname = "GstNavigationMessageType", cprefix = "GST_NAVIGATION_MESSAGE_", type_id = "gst_navigation_message_type_get_type ()")] [GIR (name = "NavigationMessageType")] @@ -1826,6 +1833,9 @@ namespace Gst { public static bool navigation_event_parse_mouse_button_event (Gst.Event event, out int button, out double x, out double y); [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_event_parse_mouse_move_event")] public static bool navigation_event_parse_mouse_move_event (Gst.Event event, out double x, out double y); + [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_event_parse_mouse_scroll_event")] + [Version (since = "1.18")] + public static bool navigation_event_parse_mouse_scroll_event (Gst.Event event, out double x, out double y, out double delta_x, out double delta_y); [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_message_get_type")] public static Gst.Video.NavigationMessageType navigation_message_get_type (Gst.Message message); [CCode (cheader_filename = "gst/video/video.h", cname = "gst_navigation_message_new_angles_changed")] diff --git a/vapi/metadata/GES-1.0.metadata b/vapi/metadata/GES-1.0.metadata index cdd680ed7..5e7532eb1 100644 --- a/vapi/metadata/GES-1.0.metadata +++ b/vapi/metadata/GES-1.0.metadata @@ -3,8 +3,8 @@ Asset .request_async symbol_type="constructor" .request symbol_type="constructor" -SmartAdder - .pads_infos type_arguments="unowned Gst.Pad,void*" +Timeline + .tracks type_arguments="GES.Track" UriClipAsset .new symbol_type="constructor" finish_name="ges_asset_request_finish" throws="GLib.Error" .request_sync symbol_type="constructor" -- cgit v1.2.1