From: Rico Tzschichholz Date: Thu, 22 Jun 2023 17:55:46 +0000 (+0200) Subject: gstreamer: Update from 1.23.0+ git main X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da3b1ff38f7dfece52d35a606e64471d8c17e88a;p=thirdparty%2Fvala.git gstreamer: Update from 1.23.0+ git main --- diff --git a/vapi/gst-editing-services-1.0.vapi b/vapi/gst-editing-services-1.0.vapi index 844c19093..edea527d0 100644 --- a/vapi/gst-editing-services-1.0.vapi +++ b/vapi/gst-editing-services-1.0.vapi @@ -185,6 +185,21 @@ namespace GES { public virtual signal void child_added (GES.TimelineElement element); public virtual signal void child_removed (GES.TimelineElement element); } + [CCode (cheader_filename = "ges/ges.h", type_id = "ges_discoverer_manager_get_type ()")] + [Version (since = "1.24")] + public sealed class DiscovererManager : GLib.Object { + [CCode (has_construct_function = false)] + protected DiscovererManager (); + public static GES.DiscovererManager get_default (); + public Gst.ClockTime get_timeout (); + public bool get_use_cache (); + public void set_timeout (Gst.ClockTime timeout); + public void set_use_cache (bool use_cache); + public uint64 timeout { get; set construct; } + public bool use_cache { get; set construct; } + public signal void discovered (Gst.PbUtils.DiscovererInfo info, GLib.Error? error); + public signal Gst.PbUtils.DiscovererInfo? load_serialized_info (string uri); + } [CCode (cheader_filename = "ges/ges.h", type_id = "ges_effect_get_type ()")] public class Effect : GES.BaseEffect, GES.Extractable, GES.MetaContainer { [CCode (has_construct_function = false)] @@ -865,6 +880,7 @@ namespace GES { [CCode (cname = "ges_uri_clip_asset_request_sync", has_construct_function = false)] public UriClipAsset.request_sync (string uri) throws GLib.Error; [CCode (cname = "ges_uri_clip_asset_class_set_timeout")] + [Version (deprecated = true, deprecated_since = "1.24")] public class void set_timeout (Gst.ClockTime timeout); [NoAccessorMethod] public uint64 duration { get; set; } diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi index c9b665d6a..a78fb3d33 100644 --- a/vapi/gstreamer-1.0.vapi +++ b/vapi/gstreamer-1.0.vapi @@ -476,6 +476,9 @@ namespace Gst { [CCode (cheader_filename = "gst/gst.h")] public static void set_value_from_string (ref GLib.Value value, string value_str); [CCode (cheader_filename = "gst/gst.h")] + [Version (since = "1.24")] + public static void simplify_fraction (int numerator, int denominator, uint n_terms, uint threshold); + [CCode (cheader_filename = "gst/gst.h")] public static uint64 uint64_scale (uint64 val, uint64 num, uint64 denom); [CCode (cheader_filename = "gst/gst.h")] public static uint64 uint64_scale_ceil (uint64 val, uint64 num, uint64 denom); diff --git a/vapi/gstreamer-allocators-1.0.vapi b/vapi/gstreamer-allocators-1.0.vapi index e2455ccf0..99ee19ee8 100644 --- a/vapi/gstreamer-allocators-1.0.vapi +++ b/vapi/gstreamer-allocators-1.0.vapi @@ -3,6 +3,23 @@ [CCode (cprefix = "Gst", gir_namespace = "GstAllocators", gir_version = "1.0", lower_case_cprefix = "gst_")] namespace Gst { namespace Allocators { + [CCode (cheader_filename = "gst/allocators/allocators.h", cname = "GstDRMDumbAllocator", lower_case_cprefix = "gst_drm_dumb_allocator_", type_id = "gst_drm_dumb_allocator_get_type ()")] + [GIR (name = "DRMDumbAllocator")] + [Version (since = "1.24")] + public sealed class DRMDumbAllocator : Gst.Allocator { + [CCode (has_construct_function = false)] + protected DRMDumbAllocator (); + public Gst.Memory alloc (uint32 drm_fourcc, uint32 width, uint32 height, out uint32 out_pitch); + public bool has_prime_export (); + [CCode (has_construct_function = false, type = "GstAllocator*")] + public DRMDumbAllocator.with_device_path (string drm_device_path); + [CCode (has_construct_function = false, type = "GstAllocator*")] + public DRMDumbAllocator.with_fd (int drm_fd); + [NoAccessorMethod] + public string drm_device_path { owned get; construct; } + [NoAccessorMethod] + public int drm_fd { get; construct; } + } [CCode (cheader_filename = "gst/allocators/allocators.h", cname = "GstDmaBufAllocator", lower_case_cprefix = "gst_dmabuf_allocator_", lower_case_csuffix = "dmabuf_allocator", type_id = "gst_dmabuf_allocator_get_type ()")] [GIR (name = "DmaBufAllocator")] [Version (since = "1.12")] @@ -50,12 +67,21 @@ namespace Gst { [CCode (cheader_filename = "gst/allocators/allocators.h", cname = "gst_dmabuf_memory_get_fd")] [Version (since = "1.2")] public static int dmabuf_memory_get_fd (Gst.Memory mem); + [CCode (cheader_filename = "gst/allocators/allocators.h", cname = "gst_drm_dumb_memory_export_dmabuf")] + [Version (since = "1.24")] + public static Gst.Memory drm_dumb_memory_export_dmabuf (Gst.Memory mem); + [CCode (cheader_filename = "gst/allocators/allocators.h", cname = "gst_drm_dumb_memory_get_handle")] + [Version (since = "1.24")] + public static uint32 drm_dumb_memory_get_handle (Gst.Memory mem); [CCode (cheader_filename = "gst/allocators/allocators.h", cname = "gst_fd_memory_get_fd")] [Version (since = "1.6")] public static int fd_memory_get_fd (Gst.Memory mem); [CCode (cheader_filename = "gst/allocators/allocators.h", cname = "gst_is_dmabuf_memory")] [Version (since = "1.2")] public static bool is_dmabuf_memory (Gst.Memory mem); + [CCode (cheader_filename = "gst/allocators/allocators.h", cname = "gst_is_drm_dumb_memory")] + [Version (since = "1.24")] + public static bool is_drm_dumb_memory (Gst.Memory mem); [CCode (cheader_filename = "gst/allocators/allocators.h", cname = "gst_is_fd_memory")] [Version (since = "1.6")] public static bool is_fd_memory (Gst.Memory mem); diff --git a/vapi/gstreamer-app-1.0.vapi b/vapi/gstreamer-app-1.0.vapi index 0e59decdc..0aeea417e 100644 --- a/vapi/gstreamer-app-1.0.vapi +++ b/vapi/gstreamer-app-1.0.vapi @@ -36,6 +36,8 @@ namespace Gst { public virtual signal Gst.FlowReturn new_sample (); [Version (since = "1.20")] public signal bool new_serialized_event (); + [Version (since = "1.24")] + public signal bool propose_allocation (Gst.Query query); [HasEmitter] public virtual signal Gst.Sample? pull_preroll (); [HasEmitter] diff --git a/vapi/gstreamer-base-1.0.vapi b/vapi/gstreamer-base-1.0.vapi index 414d03e5e..87ab7896b 100644 --- a/vapi/gstreamer-base-1.0.vapi +++ b/vapi/gstreamer-base-1.0.vapi @@ -763,6 +763,8 @@ namespace Gst { public bool new_segment (Gst.Segment segment); [NoWrapper] public virtual bool prepare_seek_segment (Gst.Event seek, Gst.Segment segment); + [Version (since = "1.24")] + public bool push_segment (Gst.Segment segment); [NoWrapper] public virtual bool query (Gst.Query query); public bool query_latency (out bool live, out Gst.ClockTime min_latency, out Gst.ClockTime max_latency); diff --git a/vapi/gstreamer-pbutils-1.0.vapi b/vapi/gstreamer-pbutils-1.0.vapi index eb9132439..cc609df06 100644 --- a/vapi/gstreamer-pbutils-1.0.vapi +++ b/vapi/gstreamer-pbutils-1.0.vapi @@ -70,6 +70,9 @@ namespace Gst { public Discoverer (Gst.ClockTime timeout) throws GLib.Error; public Gst.PbUtils.DiscovererInfo discover_uri (string uri) throws GLib.Error; public bool discover_uri_async (string uri); + [NoWrapper] + [Version (since = "1.24")] + public virtual Gst.PbUtils.DiscovererInfo load_serialize_info (string uri); public void start (); public void stop (); [NoAccessorMethod] @@ -78,6 +81,8 @@ namespace Gst { public bool use_cache { get; set construct; } public virtual signal void discovered (Gst.PbUtils.DiscovererInfo info, GLib.Error? err); public virtual signal void finished (); + [Version (since = "1.24")] + public signal Gst.PbUtils.DiscovererInfo? load_serialized_info (string uri); public virtual signal void source_setup (Gst.Element source); public virtual signal void starting (); } @@ -146,7 +151,7 @@ namespace Gst { public unowned Gst.Structure? get_misc (); public Gst.PbUtils.DiscovererStreamInfo? get_next (); public Gst.PbUtils.DiscovererStreamInfo? get_previous (); - public unowned string get_stream_id (); + public unowned string? get_stream_id (); [Version (since = "1.20")] public int get_stream_number (); public unowned string get_stream_type_nick (); diff --git a/vapi/gstreamer-rtsp-1.0.vapi b/vapi/gstreamer-rtsp-1.0.vapi index 5d7ede440..7b77e1ea8 100644 --- a/vapi/gstreamer-rtsp-1.0.vapi +++ b/vapi/gstreamer-rtsp-1.0.vapi @@ -72,9 +72,9 @@ namespace Gst { [Version (since = "1.18")] public Gst.RTSP.Result read_usec ([CCode (array_length_cname = "size", array_length_pos = 1.5, array_length_type = "guint")] uint8[] data, int64 timeout); [Version (deprecated = true, deprecated_since = "1.18")] - public Gst.RTSP.Result receive (out unowned Gst.RTSP.Message message, GLib.TimeVal timeout); + public Gst.RTSP.Result receive (Gst.RTSP.Message message, GLib.TimeVal timeout); [Version (since = "1.18")] - public Gst.RTSP.Result receive_usec (out unowned Gst.RTSP.Message message, int64 timeout); + public Gst.RTSP.Result receive_usec (Gst.RTSP.Message message, int64 timeout); public Gst.RTSP.Result reset_timeout (); [Version (deprecated = true, deprecated_since = "1.18")] public Gst.RTSP.Result send (Gst.RTSP.Message message, GLib.TimeVal timeout); @@ -157,6 +157,14 @@ namespace Gst { [CCode (cname = "gst_rtsp_message_has_body_buffer")] [Version (since = "1.16")] public bool has_body_buffer (); + [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 (array_length = false, array_null_terminated = true, cname = "gst_rtsp_message_parse_auth_credentials")] [Version (since = "1.12")] public Gst.RTSP.AuthCredential[] parse_auth_credentials (Gst.RTSP.HeaderField field); @@ -633,14 +641,6 @@ namespace Gst { [CCode (cheader_filename = "gst/rtsp/rtsp.h")] public static unowned string? header_as_text (Gst.RTSP.HeaderField field); [CCode (cheader_filename = "gst/rtsp/rtsp.h")] - public static Gst.RTSP.Result message_init (out unowned Gst.RTSP.Message msg); - [CCode (cheader_filename = "gst/rtsp/rtsp.h")] - public static Gst.RTSP.Result message_init_data (out unowned Gst.RTSP.Message msg, uint8 channel); - [CCode (cheader_filename = "gst/rtsp/rtsp.h")] - public static Gst.RTSP.Result message_init_request (out unowned Gst.RTSP.Message msg, Gst.RTSP.Method method, string uri); - [CCode (cheader_filename = "gst/rtsp/rtsp.h")] - public static Gst.RTSP.Result message_init_response (out unowned Gst.RTSP.Message msg, Gst.RTSP.StatusCode code, string? reason, Gst.RTSP.Message? request); - [CCode (cheader_filename = "gst/rtsp/rtsp.h")] public static Gst.RTSP.Result message_new (out Gst.RTSP.Message msg); [CCode (cheader_filename = "gst/rtsp/rtsp.h")] public static Gst.RTSP.Result message_new_data (out Gst.RTSP.Message msg, uint8 channel); diff --git a/vapi/gstreamer-rtsp-server-1.0.vapi b/vapi/gstreamer-rtsp-server-1.0.vapi index 9702ccaf9..ade578239 100644 --- a/vapi/gstreamer-rtsp-server-1.0.vapi +++ b/vapi/gstreamer-rtsp-server-1.0.vapi @@ -186,6 +186,8 @@ namespace Gst { public class Media : GLib.Object { [CCode (has_construct_function = false)] public Media (owned Gst.Element element); + [Version (since = "1.24")] + public bool can_be_shared (); public void collect_streams (); [Version (since = "1.14")] public bool complete_pipeline (GLib.GenericArray transports); diff --git a/vapi/gstreamer-sdp-1.0.vapi b/vapi/gstreamer-sdp-1.0.vapi index d9fa85e1f..73e8bc467 100644 --- a/vapi/gstreamer-sdp-1.0.vapi +++ b/vapi/gstreamer-sdp-1.0.vapi @@ -259,6 +259,8 @@ namespace Gst { public Gst.SDP.Result remove_bandwidth (uint idx); [Version (since = "1.2")] public Gst.SDP.Result remove_email (uint idx); + [Version (since = "1.24")] + public Gst.SDP.Result remove_media (uint idx); [Version (since = "1.2")] public Gst.SDP.Result remove_phone (uint idx); [Version (since = "1.2")] diff --git a/vapi/gstreamer-video-1.0.vapi b/vapi/gstreamer-video-1.0.vapi index 551c744a7..0de96379c 100644 --- a/vapi/gstreamer-video-1.0.vapi +++ b/vapi/gstreamer-video-1.0.vapi @@ -424,6 +424,23 @@ namespace Gst { [Version (since = "1.20")] public Info.with_caps (Gst.Caps caps); } + [CCode (cheader_filename = "gst/video/video.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gst_video_info_dma_drm_get_type ()")] + [Compact] + [GIR (name = "VideoInfoDmaDrm")] + [Version (since = "1.24")] + public class InfoDmaDrm { + public uint32 drm_fourcc; + public uint64 drm_modifier; + public weak Gst.Video.Info vinfo; + [CCode (has_construct_function = false)] + public InfoDmaDrm (); + public void free (); + [CCode (has_construct_function = false)] + public InfoDmaDrm.from_caps (Gst.Caps caps); + public bool from_video_info (Gst.Video.Info info, uint64 modifier); + public void init (); + public Gst.Caps? to_caps (); + } [CCode (cheader_filename = "gst/video/video.h", lower_case_cprefix = "gst_video_multiview_flagset_", type_id = "gst_video_multiview_flagset_get_type ()")] [GIR (name = "VideoMultiviewFlagsSet")] public sealed class MultiviewFlagsSet : Gst.FlagSet { @@ -1409,7 +1426,9 @@ namespace Gst { [Version (since = "1.22")] NV12_8L128, [Version (since = "1.22")] - NV12_10BE_8L128; + NV12_10BE_8L128, + [Version (since = "1.24")] + NV12_10LE40_4L4; public static Gst.Video.Format from_fourcc (uint32 fourcc); public static Gst.Video.Format from_masks (int depth, int bpp, int endianness, uint red_mask, uint green_mask, uint blue_mask, uint alpha_mask); public static Gst.Video.Format from_string (string format); @@ -2060,7 +2079,7 @@ namespace Gst { [Version (deprecated = true, deprecated_since = "1.20", since = "1.6")] public static double color_transfer_encode (Gst.Video.TransferFunction func, double val); [CCode (cheader_filename = "gst/video/video.h")] - public static Gst.Sample convert_sample (Gst.Sample sample, Gst.Caps to_caps, Gst.ClockTime timeout) throws GLib.Error; + public static Gst.Sample? convert_sample (Gst.Sample sample, Gst.Caps to_caps, Gst.ClockTime timeout) throws GLib.Error; [CCode (cheader_filename = "gst/video/video.h")] public static void convert_sample_async (Gst.Sample sample, Gst.Caps to_caps, Gst.ClockTime timeout, owned Gst.Video.ConvertSampleCallback callback); [CCode (cheader_filename = "gst/video/video.h")] @@ -2069,6 +2088,18 @@ namespace Gst { [Version (replacement = "VideoCropMeta.get_info")] public static unowned Gst.MetaInfo? crop_meta_get_info (); [CCode (cheader_filename = "gst/video/video.h")] + [Version (since = "1.24")] + public static uint32 dma_drm_fourcc_from_format (Gst.Video.Format format); + [CCode (cheader_filename = "gst/video/video.h")] + [Version (since = "1.24")] + public static uint32 dma_drm_fourcc_from_string (string format_str, out uint64 modifier); + [CCode (cheader_filename = "gst/video/video.h")] + [Version (since = "1.24")] + public static Gst.Video.Format dma_drm_fourcc_to_format (uint32 fourcc); + [CCode (cheader_filename = "gst/video/video.h")] + [Version (since = "1.24")] + public static string? dma_drm_fourcc_to_string (uint32 fourcc, uint64 modifier); + [CCode (cheader_filename = "gst/video/video.h")] public static bool event_is_force_key_unit (Gst.Event event); [CCode (cheader_filename = "gst/video/video.h")] public static Gst.Event event_new_downstream_force_key_unit (Gst.ClockTime timestamp, Gst.ClockTime stream_time, Gst.ClockTime running_time, bool all_headers, uint count); @@ -2127,6 +2158,15 @@ namespace Gst { [Version (since = "1.6")] public static bool guess_framerate (Gst.ClockTime duration, out int dest_n, out int dest_d); [CCode (cheader_filename = "gst/video/video.h")] + [Version (replacement = "VideoInfoDmaDrm.from_caps", since = "1.24")] + public static bool info_dma_drm_from_caps (out unowned Gst.Video.InfoDmaDrm drm_info, Gst.Caps caps); + [CCode (cheader_filename = "gst/video/video.h")] + [Version (replacement = "VideoInfoDmaDrm.from_video_info", since = "1.24")] + public static bool info_dma_drm_from_video_info (out unowned Gst.Video.InfoDmaDrm drm_info, Gst.Video.Info info, uint64 modifier); + [CCode (cheader_filename = "gst/video/video.h")] + [Version (replacement = "VideoInfoDmaDrm.init", since = "1.24")] + public static void info_dma_drm_init (out unowned Gst.Video.InfoDmaDrm drm_info); + [CCode (cheader_filename = "gst/video/video.h")] [Version (replacement = "VideoInfo.from_caps")] public static bool info_from_caps (out unowned Gst.Video.Info info, Gst.Caps caps); [CCode (cheader_filename = "gst/video/video.h")] @@ -2141,6 +2181,9 @@ namespace Gst { [CCode (cheader_filename = "gst/video/video.h")] [Version (since = "1.22")] public static bool is_common_aspect_ratio (int width, int height, int par_n, int par_d); + [CCode (cheader_filename = "gst/video/video.h")] + [Version (since = "1.24")] + public static bool is_dma_drm_caps (Gst.Caps caps); [CCode (cheader_filename = "gst/video/video.h", cname = "gst_is_video_overlay_prepare_window_handle_message")] public static bool is_video_overlay_prepare_window_handle_message (Gst.Message msg); [CCode (cheader_filename = "gst/video/video.h")] diff --git a/vapi/gstreamer-webrtc-1.0.vapi b/vapi/gstreamer-webrtc-1.0.vapi index 7bdcfeba1..52070d7d5 100644 --- a/vapi/gstreamer-webrtc-1.0.vapi +++ b/vapi/gstreamer-webrtc-1.0.vapi @@ -72,7 +72,7 @@ namespace Gst { public Gst.WebRTCICEGatheringState ice_gathering_state; [CCode (has_construct_function = false)] protected WebRTCICE (); - public virtual void add_candidate (Gst.WebRTCICEStream stream, string candidate); + public virtual void add_candidate (Gst.WebRTCICEStream stream, string candidate, Gst.Promise? promise); public virtual Gst.WebRTCICEStream? add_stream (uint session_id); public virtual bool add_turn_server (string uri); public virtual Gst.WebRTCICETransport? find_transport (Gst.WebRTCICEStream stream, Gst.WebRTCICEComponent component);