From: Rico Tzschichholz Date: Sun, 22 Apr 2018 13:27:33 +0000 (+0200) Subject: gstreamer: Update from 1.15+ git master X-Git-Tag: 0.41.90~168 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=212cd10c005bc63ed86e05e547f1c73ddb5b7dae;p=thirdparty%2Fvala.git gstreamer: Update from 1.15+ git master --- diff --git a/vapi/gstreamer-1.0.vapi b/vapi/gstreamer-1.0.vapi index c1828ec5c..82fc6d98b 100644 --- a/vapi/gstreamer-1.0.vapi +++ b/vapi/gstreamer-1.0.vapi @@ -402,7 +402,7 @@ namespace Gst { [Version (since = "1.14")] public static void dump_buffer (Gst.Buffer buf); [CCode (cheader_filename = "gst/gst.h")] - public static void dump_mem (uint8 mem, uint size); + public static void dump_mem ([CCode (array_length_cname = "size", array_length_pos = 1.1, array_length_type = "guint")] uint8[] mem); [CCode (cheader_filename = "gst/gst.h")] public static bool fraction_add (int a_n, int a_d, int b_n, int b_d, out int res_n, out int res_d); [CCode (cheader_filename = "gst/gst.h")] @@ -678,7 +678,7 @@ namespace Gst { [CCode (instance_pos = 1.9)] public bool copy_into (Gst.Buffer dst, Gst.BufferCopyFlags flags, size_t offset, size_t size); public Gst.Buffer copy_region (Gst.BufferCopyFlags flags, size_t offset, size_t size); - public size_t extract (size_t offset, void* dest, size_t size); + public size_t extract (size_t offset, [CCode (array_length_cname = "size", array_length_pos = 2.1, array_length_type = "gsize")] out unowned uint8[] dest); [Version (since = "1.0.10")] public void extract_dup (size_t offset, size_t size, [CCode (array_length_cname = "dest_size", array_length_pos = 3.1, array_length_type = "gsize")] out uint8[] dest); public size_t fill (size_t offset, [CCode (array_length_cname = "size", array_length_pos = 2.1, array_length_type = "gsize")] uint8[] src); @@ -835,6 +835,7 @@ namespace Gst { [Version (since = "1.2")] public void append_structure_full (owned Gst.Structure structure, owned Gst.CapsFeatures? features = null); public bool can_intersect (Gst.Caps caps2); + public Gst.Caps copy (); public Gst.Caps copy_nth (uint nth); [CCode (has_construct_function = false)] public Caps.empty (); @@ -2218,8 +2219,16 @@ namespace Gst { public unowned Gst.Caps? get_caps (); public unowned Gst.Structure? get_info (); public unowned Gst.Segment get_segment (); + [Version (since = "1.16")] + public void set_buffer (Gst.Buffer buffer); [Version (since = "1.6")] public void set_buffer_list (Gst.BufferList buffer_list); + [Version (since = "1.16")] + public void set_caps (Gst.Caps caps); + [Version (since = "1.16")] + public bool set_info (Gst.Structure info); + [Version (since = "1.16")] + public void set_segment (Gst.Segment segment); } [CCode (cheader_filename = "gst/gst.h", copy_function = "gst_segment_copy", free_function = "gst_segment_free", type_id = "gst_segment_get_type ()")] [Compact] diff --git a/vapi/gstreamer-base-1.0.vapi b/vapi/gstreamer-base-1.0.vapi index 625b5141d..9a86fe2ec 100644 --- a/vapi/gstreamer-base-1.0.vapi +++ b/vapi/gstreamer-base-1.0.vapi @@ -239,7 +239,7 @@ namespace Gst { public uint masked_scan_uint32 (uint32 mask, uint32 pattern, uint offset, uint size); [CCode (cname = "gst_byte_reader_masked_scan_uint32_peek")] [Version (since = "1.6")] - public uint masked_scan_uint32_peek (uint32 mask, uint32 pattern, uint offset, uint size, uint32 value); + public uint masked_scan_uint32_peek (uint32 mask, uint32 pattern, uint offset, uint size, out uint32 value); [CCode (cname = "gst_byte_reader_peek_data")] public bool peek_data ([CCode (array_length_cname = "size", array_length_pos = 0.5, array_length_type = "guint")] out unowned uint8[] val); [CCode (cname = "gst_byte_reader_peek_float32_be")] @@ -361,7 +361,7 @@ namespace Gst { [CCode (cname = "gst_byte_writer_put_string_utf32")] public bool put_string_utf32 ([CCode (array_length = false, array_null_terminated = true)] uint32[] data); [CCode (cname = "gst_byte_writer_put_string_utf8")] - public bool put_string_utf8 ([CCode (array_length = false, array_null_terminated = true)] string[] data); + public bool put_string_utf8 (string data); [CCode (cname = "gst_byte_writer_put_uint16_be")] public bool put_uint16_be (uint16 val); [CCode (cname = "gst_byte_writer_put_uint16_le")] @@ -397,7 +397,7 @@ namespace Gst { public CollectPads (); public unowned Gst.Base.CollectData? add_pad (Gst.Pad pad, uint size, [CCode (scope = "async")] Gst.Base.CollectDataDestroyNotify destroy_notify, bool @lock); public uint available (); - public Gst.FlowReturn clip_running_time (Gst.Base.CollectData cdata, Gst.Buffer buf, Gst.Buffer? outbuf, void* user_data); + public Gst.FlowReturn clip_running_time (Gst.Base.CollectData cdata, Gst.Buffer buf, out Gst.Buffer outbuf, void* user_data); public bool event_default (Gst.Base.CollectData data, Gst.Event event, bool discard); public uint flush (Gst.Base.CollectData data, uint size); public Gst.Buffer? peek (Gst.Base.CollectData data); @@ -471,7 +471,7 @@ namespace Gst { public bool add_index_entry (uint64 offset, Gst.ClockTime ts, bool key, bool force); [NoWrapper] public virtual bool convert (Gst.Format src_format, int64 src_value, Gst.Format dest_format, int64 dest_value); - public bool convert_default (Gst.Format src_format, int64 src_value, Gst.Format dest_format, int64 dest_value); + public bool convert_default (Gst.Format src_format, int64 src_value, Gst.Format dest_format, out int64 dest_value); [NoWrapper] public virtual Gst.FlowReturn detect (Gst.Buffer buffer); [Version (since = "1.12")] @@ -844,7 +844,7 @@ namespace Gst { [CCode (cheader_filename = "gst/base/base.h", cname = "GstCollectPadsBufferFunction", instance_pos = 3.9)] public delegate Gst.FlowReturn CollectPadsBufferFunction (Gst.Base.CollectPads pads, Gst.Base.CollectData data, owned Gst.Buffer buffer); [CCode (cheader_filename = "gst/base/base.h", cname = "GstCollectPadsClipFunction", instance_pos = 4.9)] - public delegate Gst.FlowReturn CollectPadsClipFunction (Gst.Base.CollectPads pads, Gst.Base.CollectData data, owned Gst.Buffer inbuffer, Gst.Buffer outbuffer); + public delegate Gst.FlowReturn CollectPadsClipFunction (Gst.Base.CollectPads pads, Gst.Base.CollectData data, owned Gst.Buffer inbuffer, out Gst.Buffer outbuffer); [CCode (cheader_filename = "gst/base/base.h", cname = "GstCollectPadsCompareFunction", instance_pos = 5.9)] public delegate int CollectPadsCompareFunction (Gst.Base.CollectPads pads, Gst.Base.CollectData data1, Gst.ClockTime timestamp1, Gst.Base.CollectData data2, Gst.ClockTime timestamp2); [CCode (cheader_filename = "gst/base/base.h", cname = "GstCollectPadsEventFunction", instance_pos = 3.9)] @@ -861,7 +861,7 @@ namespace Gst { [CCode (cheader_filename = "gst/base/base.h", cname = "GstDataQueueFullCallback", has_target = false)] public delegate void DataQueueFullCallback (Gst.Base.DataQueue queue, void* checkdata); [CCode (cheader_filename = "gst/base/base.h", cname = "GstTypeFindHelperGetRangeFunction", has_target = false)] - public delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, Gst.Object? parent, uint64 offset, uint length, Gst.Buffer buffer); + public delegate Gst.FlowReturn TypeFindHelperGetRangeFunction (Gst.Object obj, Gst.Object? parent, uint64 offset, uint length, out Gst.Buffer buffer); [CCode (cheader_filename = "gst/base/base.h", cname = "GST_BASE_PARSE_FLAG_DRAINING")] public const int PARSE_FLAG_DRAINING; [CCode (cheader_filename = "gst/base/base.h", cname = "GST_BASE_PARSE_FLAG_LOST_SYNC")] @@ -875,7 +875,7 @@ namespace Gst { [CCode (cheader_filename = "gst/base/base.h", cname = "gst_type_find_helper_for_buffer")] public static Gst.Caps? type_find_helper_for_buffer (Gst.Object? obj, Gst.Buffer buf, out Gst.TypeFindProbability prob); [CCode (cheader_filename = "gst/base/base.h", cname = "gst_type_find_helper_for_data")] - public static Gst.Caps? type_find_helper_for_data (Gst.Object? obj, uint8 data, size_t size, out Gst.TypeFindProbability prob); + public static Gst.Caps? type_find_helper_for_data (Gst.Object? obj, [CCode (array_length_cname = "size", array_length_pos = 2.5, array_length_type = "gsize")] uint8[] data, out Gst.TypeFindProbability prob); [CCode (cheader_filename = "gst/base/base.h", cname = "gst_type_find_helper_for_extension")] public static Gst.Caps? type_find_helper_for_extension (Gst.Object? obj, string extension); [CCode (cheader_filename = "gst/base/base.h", cname = "gst_type_find_helper_get_range")] diff --git a/vapi/gstreamer-tag-1.0.vapi b/vapi/gstreamer-tag-1.0.vapi index b16fa636c..8b0a77686 100644 --- a/vapi/gstreamer-tag-1.0.vapi +++ b/vapi/gstreamer-tag-1.0.vapi @@ -70,7 +70,7 @@ namespace Gst { } namespace List { [CCode (cheader_filename = "gst/tag/tag.h")] - public static bool add_id3_image (Gst.TagList tag_list, uint8 image_data, uint image_data_len, uint id3_picture_type); + public static bool add_id3_image (Gst.TagList tag_list, [CCode (array_length_cname = "image_data_len", array_length_pos = 2.5, array_length_type = "guint")] uint8[] image_data, uint id3_picture_type); [CCode (cheader_filename = "gst/tag/tag.h")] public static Gst.TagList from_exif_buffer (Gst.Buffer buffer, int byte_order, uint32 base_offset); [CCode (cheader_filename = "gst/tag/tag.h")] @@ -78,21 +78,21 @@ namespace Gst { [CCode (cheader_filename = "gst/tag/tag.h")] public static Gst.TagList from_id3v2_tag (Gst.Buffer buffer); [CCode (cheader_filename = "gst/tag/tag.h")] - public static Gst.TagList from_vorbiscomment (uint8 data, size_t size, uint8 id_data, uint id_data_length, string vendor_string); + public static Gst.TagList from_vorbiscomment ([CCode (array_length_cname = "size", array_length_pos = 1.5, array_length_type = "gsize")] uint8[] data, [CCode (array_length_cname = "id_data_length", array_length_pos = 2.5, array_length_type = "guint")] uint8[] id_data, out string vendor_string); [CCode (cheader_filename = "gst/tag/tag.h")] - public static Gst.TagList from_vorbiscomment_buffer (Gst.Buffer buffer, uint8 id_data, uint id_data_length, string vendor_string); + public static Gst.TagList from_vorbiscomment_buffer (Gst.Buffer buffer, [CCode (array_length_cname = "id_data_length", array_length_pos = 2.5, array_length_type = "guint")] uint8[] id_data, out string vendor_string); [CCode (cheader_filename = "gst/tag/tag.h")] public static Gst.TagList from_xmp_buffer (Gst.Buffer buffer); [CCode (cheader_filename = "gst/tag/tag.h")] - public static Gst.TagList new_from_id3v1 (uint8 data); + public static Gst.TagList new_from_id3v1 ([CCode (array_length = false)] uint8 data[128]); [CCode (cheader_filename = "gst/tag/tag.h")] public static Gst.Buffer to_exif_buffer (Gst.TagList taglist, int byte_order, uint32 base_offset); [CCode (cheader_filename = "gst/tag/tag.h")] public static Gst.Buffer to_exif_buffer_with_tiff_header (Gst.TagList taglist); [CCode (cheader_filename = "gst/tag/tag.h")] - public static Gst.Buffer to_vorbiscomment_buffer (Gst.TagList list, uint8 id_data, uint id_data_length, string vendor_string); + public static Gst.Buffer to_vorbiscomment_buffer (Gst.TagList list, [CCode (array_length_cname = "id_data_length", array_length_pos = 2.5, array_length_type = "guint")] uint8[] id_data, string? vendor_string); [CCode (cheader_filename = "gst/tag/tag.h")] - public static Gst.Buffer to_xmp_buffer (Gst.TagList list, bool read_only, string schemas); + public static Gst.Buffer to_xmp_buffer (Gst.TagList list, bool read_only, [CCode (array_length = false, array_null_terminated = true)] string[] schemas); } namespace MusicBrainz { [CCode (cheader_filename = "gst/tag/tag.h", cname = "GST_TAG_MUSICBRAINZ_ALBUMARTISTID")] @@ -196,7 +196,7 @@ namespace Gst { [CCode (cheader_filename = "gst/tag/tag.h")] public static bool check_language_code (string lang_code); [CCode (cheader_filename = "gst/tag/tag.h")] - public static string freeform_string_to_utf8 (string data, int size, string env_vars); + public static string freeform_string_to_utf8 ([CCode (array_length_cname = "size", array_length_pos = 1.5)] char[] data, [CCode (array_length = false, array_null_terminated = true)] string[] env_vars); [CCode (cheader_filename = "gst/tag/tag.h")] public static unowned string from_id3_tag (string id3_tag); [CCode (cheader_filename = "gst/tag/tag.h")] @@ -234,9 +234,9 @@ namespace Gst { [CCode (cheader_filename = "gst/tag/tag.h")] public static unowned string id3_genre_get (uint id); [CCode (cheader_filename = "gst/tag/tag.h")] - public static Gst.Sample image_data_to_image_sample (uint8 image_data, uint image_data_len, Gst.Tag.ImageType image_type); + public static Gst.Sample image_data_to_image_sample ([CCode (array_length_cname = "image_data_len", array_length_pos = 1.5, array_length_type = "guint")] uint8[] image_data, Gst.Tag.ImageType image_type); [CCode (cheader_filename = "gst/tag/tag.h")] - public static bool parse_extended_comment (string ext_comment, string key, string lang, string value, bool fail_if_no_key); + public static bool parse_extended_comment (string ext_comment, out string? key, out string? lang, out string value, bool fail_if_no_key); [CCode (cheader_filename = "gst/tag/tag.h")] public static void register_musicbrainz_tags (); [CCode (cheader_filename = "gst/tag/tag.h")]