From de80676d2f6039b46c03cebe225b92d36087dc83 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Wed, 4 Jul 2018 17:41:39 +0200 Subject: [PATCH] gstreamer: Update from 1.15+ git master --- vapi/Makefile.am | 2 +- vapi/gstreamer-audio-1.0.vapi | 25 +++++++++++++++++++++++++ vapi/gstreamer-rtsp-1.0.deps | 1 + vapi/gstreamer-rtsp-1.0.vapi | 3 +++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/vapi/Makefile.am b/vapi/Makefile.am index 565a845f7..a147d0fe6 100644 --- a/vapi/Makefile.am +++ b/vapi/Makefile.am @@ -527,7 +527,7 @@ gstreamer-rtp-1.0: $(GENVAPI) --library $(srcdir)/gstreamer-rtp-1.0 --pkg gstreamer-base-1.0 --metadatadir $(METADATADIR) $(GIRDIR)/GstRtp-1.0.gir gstreamer-rtsp-1.0: - $(GENVAPI) --library $(srcdir)/gstreamer-rtsp-1.0 --pkg gstreamer-sdp-1.0 --metadatadir $(METADATADIR) $(GIRDIR)/GstRtsp-1.0.gir + $(GENVAPI) --library $(srcdir)/gstreamer-rtsp-1.0 --pkg gstreamer-base-1.0 --pkg gstreamer-sdp-1.0 --metadatadir $(METADATADIR) $(GIRDIR)/GstRtsp-1.0.gir gstreamer-rtsp-server-1.0: $(GENVAPI) --library $(srcdir)/gstreamer-rtsp-server-1.0 --pkg gstreamer-rtsp-1.0 --pkg gstreamer-net-1.0 --metadatadir $(METADATADIR) $(GIRDIR)/GstRtspServer-1.0.gir diff --git a/vapi/gstreamer-audio-1.0.vapi b/vapi/gstreamer-audio-1.0.vapi index 0ef67238d..6ca526c2c 100644 --- a/vapi/gstreamer-audio-1.0.vapi +++ b/vapi/gstreamer-audio-1.0.vapi @@ -500,6 +500,18 @@ namespace Gst { public abstract double volume { get; set; } } [CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)] + [GIR (name = "AudioBuffer")] + [Version (since = "1.16")] + public struct Buffer { + public weak Gst.Audio.Info info; + public size_t n_samples; + public int n_planes; + public void* planes; + public weak Gst.Buffer buffer; + public bool map (Gst.Audio.Info info, Gst.Buffer gstbuffer, Gst.MapFlags flags); + public void unmap (); + } + [CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)] [GIR (name = "AudioCdSrcTrack")] public struct CdSrcTrack { public bool is_audio; @@ -544,6 +556,15 @@ namespace Gst { public weak Gst.Audio.FormatPack pack_func; } [CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)] + [GIR (name = "AudioMeta")] + [Version (since = "1.16")] + public struct Meta { + public Gst.Meta meta; + public weak Gst.Audio.Info info; + public size_t samples; + public size_t offsets; + } + [CCode (cheader_filename = "gst/audio/audio.h", has_type_id = false)] [GIR (name = "AudioRingBufferSpec")] public struct RingBufferSpec { public weak Gst.Caps caps; @@ -935,6 +956,10 @@ namespace Gst { public static uint audio_iec61937_frame_size (Gst.Audio.RingBufferSpec spec); [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_iec61937_payload")] public static bool audio_iec61937_payload ([CCode (array_length_cname = "src_n", array_length_pos = 1.5, array_length_type = "guint")] uint8[] src, [CCode (array_length_cname = "dst_n", array_length_pos = 2.5, array_length_type = "guint")] uint8[] dst, Gst.Audio.RingBufferSpec spec, int endianness); + [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_meta_api_get_type")] + public static GLib.Type audio_meta_api_get_type (); + [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_meta_get_info")] + public static unowned Gst.MetaInfo? audio_meta_get_info (); [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_reorder_channels")] public static bool audio_reorder_channels ([CCode (array_length_cname = "size", array_length_pos = 1.5, array_length_type = "gsize")] uint8[] data, Gst.Audio.Format format, [CCode (array_length_cname = "channels", array_length_pos = 2.5)] Gst.Audio.ChannelPosition[] from, [CCode (array_length_cname = "channels", array_length_pos = 2.5)] Gst.Audio.ChannelPosition[] to); [CCode (cheader_filename = "gst/audio/audio.h", cname = "gst_audio_resampler_options_set_quality")] diff --git a/vapi/gstreamer-rtsp-1.0.deps b/vapi/gstreamer-rtsp-1.0.deps index eed504d05..69022a6e1 100644 --- a/vapi/gstreamer-rtsp-1.0.deps +++ b/vapi/gstreamer-rtsp-1.0.deps @@ -1,3 +1,4 @@ gstreamer-1.0 +gstreamer-base-1.0 gstreamer-sdp-1.0 gio-2.0 diff --git a/vapi/gstreamer-rtsp-1.0.vapi b/vapi/gstreamer-rtsp-1.0.vapi index 0d8494080..3099690e7 100644 --- a/vapi/gstreamer-rtsp-1.0.vapi +++ b/vapi/gstreamer-rtsp-1.0.vapi @@ -555,6 +555,9 @@ namespace Gst { [Version (since = "1.12")] public static string generate_digest_auth_response (string? algorithm, string method, string realm, string username, string password, string uri, string nonce); [CCode (cheader_filename = "gst/rtsp/rtsp.h")] + [Version (since = "1.16")] + public static string generate_digest_auth_response_from_md5 (string? algorithm, string method, string md5, string uri, string nonce); + [CCode (cheader_filename = "gst/rtsp/rtsp.h")] public static bool header_allow_multiple (Gst.RTSP.HeaderField field); [CCode (cheader_filename = "gst/rtsp/rtsp.h")] public static unowned string header_as_text (Gst.RTSP.HeaderField field); -- 2.47.2