diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-11-29 11:27:33 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-11-29 11:29:22 +0100 |
commit | 5a74c608487f3085038494d071d71c2c7cf15147 (patch) | |
tree | 1f6cc8082fcfd71894680e83b5824a009773dcf8 | |
parent | 9738f812aae1d2ef92a9178e1da92e24aa415397 (diff) | |
download | vala-5a74c608487f3085038494d071d71c2c7cf15147.tar.gz |
gstreamer: Cherry-pick bindings fixes from 0.56
-rw-r--r-- | vapi/gst-editing-services-1.0.vapi | 11 | ||||
-rw-r--r-- | vapi/gstreamer-pbutils-1.0.vapi | 2 | ||||
-rw-r--r-- | vapi/gstreamer-play-1.0.vapi | 8 | ||||
-rw-r--r-- | vapi/metadata/GstPbutils-1.0.metadata | 5 |
4 files changed, 16 insertions, 10 deletions
diff --git a/vapi/gst-editing-services-1.0.vapi b/vapi/gst-editing-services-1.0.vapi index e58fbfbd6..3e8eff701 100644 --- a/vapi/gst-editing-services-1.0.vapi +++ b/vapi/gst-editing-services-1.0.vapi @@ -147,7 +147,7 @@ namespace GES { [Version (since = "1.18")] public Gst.ClockTime get_frame_time (GES.FrameNumber frame_number); [Version (since = "1.18")] - public virtual bool get_natural_framerate (int framerate_n, int framerate_d); + public virtual bool get_natural_framerate (out int framerate_n, out int framerate_d); public GES.TrackType get_supported_formats (); public void set_supported_formats (GES.TrackType supportedformats); public GES.TrackType supported_formats { get; set construct; } @@ -156,8 +156,9 @@ namespace GES { public class CommandLineFormatter : GES.Formatter, GES.Extractable { [CCode (has_construct_function = false)] protected CommandLineFormatter (); - public static string get_help (int nargs, string commands); - [Version (since = "1.20")] + [Version (since = "1.10")] + public static string get_help ([CCode (array_length_cname = "nargs", array_length_pos = 0.5)] string[] commands); + [Version (since = "1.10")] public static string get_timeline_uri (GES.Timeline timeline); } [CCode (cheader_filename = "ges/ges.h", type_id = "ges_container_get_type ()")] @@ -809,7 +810,7 @@ namespace GES { [CCode (has_construct_function = false)] protected TrackElementAsset (); [Version (since = "1.18")] - public virtual bool get_natural_framerate (int framerate_n, int framerate_d); + public virtual bool get_natural_framerate (out int framerate_n, out int framerate_d); public GES.TrackType get_track_type (); public void set_track_type (GES.TrackType type); public GES.TrackType track_type { get; set construct; } @@ -944,7 +945,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, out GES.MetaFlag? flags, out 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); diff --git a/vapi/gstreamer-pbutils-1.0.vapi b/vapi/gstreamer-pbutils-1.0.vapi index 0c8a03e88..2d6e83b72 100644 --- a/vapi/gstreamer-pbutils-1.0.vapi +++ b/vapi/gstreamer-pbutils-1.0.vapi @@ -33,7 +33,7 @@ namespace Gst { public static unowned string get_profile ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] sps); [CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_h264_get_profile_flags_level")] [Version (since = "1.20")] - public static bool get_profile_flags_level (uint8 codecs_data, uint len, uint8 profile, uint8 flags, uint8 level); + public static bool get_profile_flags_level ([CCode (array_length_cname = "len", array_length_pos = 1.5, array_length_type = "guint", type = "const guint8*")] uint8[] codec_data, out uint8 profile, out uint8 flags, out uint8 level); } namespace MPEG4Video { [CCode (cheader_filename = "gst/pbutils/pbutils.h", cname = "gst_codec_utils_mpeg4video_caps_set_level_and_profile")] diff --git a/vapi/gstreamer-play-1.0.vapi b/vapi/gstreamer-play-1.0.vapi index f222736a6..b187d30b1 100644 --- a/vapi/gstreamer-play-1.0.vapi +++ b/vapi/gstreamer-play-1.0.vapi @@ -245,7 +245,7 @@ namespace Gst { public unowned string get_name (); public static void parse_buffering_percent (Gst.Message msg, out uint percent); public static void parse_duration_updated (Gst.Message msg, out Gst.ClockTime duration); - public static void parse_error (Gst.Message msg, out unowned GLib.Error error, out Gst.Structure details); + public static void parse_error (Gst.Message msg, out GLib.Error error, out Gst.Structure? details); public static void parse_media_info_updated (Gst.Message msg, out Gst.Play.MediaInfo info); public static void parse_muted_changed (Gst.Message msg, out bool muted); public static void parse_position_updated (Gst.Message msg, out Gst.ClockTime position); @@ -253,7 +253,7 @@ namespace Gst { public static void parse_type (Gst.Message msg, out Gst.Play.Message type); public static void parse_video_dimensions_changed (Gst.Message msg, out uint width, out uint height); public static void parse_volume_changed (Gst.Message msg, out double volume); - public static void parse_warning (Gst.Message msg, out unowned GLib.Error error, out Gst.Structure details); + public static void parse_warning (Gst.Message msg, out GLib.Error error, out Gst.Structure? details); } [CCode (cheader_filename = "gst/play/play.h", cprefix = "GST_PLAY_THUMBNAIL_", has_type_id = false)] [GIR (name = "PlaySnapshotFormat")] @@ -305,7 +305,7 @@ namespace Gst { public static void play_message_parse_duration_updated (Gst.Message msg, out Gst.ClockTime duration); [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_message_parse_error")] [Version (replacement = "PlayMessage.parse_error", since = "1.20")] - public static void play_message_parse_error (Gst.Message msg, out unowned GLib.Error error, out Gst.Structure details); + public static void play_message_parse_error (Gst.Message msg, out GLib.Error error, out Gst.Structure? details); [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_message_parse_media_info_updated")] [Version (replacement = "PlayMessage.parse_media_info_updated", since = "1.20")] public static void play_message_parse_media_info_updated (Gst.Message msg, out Gst.Play.MediaInfo info); @@ -329,7 +329,7 @@ namespace Gst { public static void play_message_parse_volume_changed (Gst.Message msg, out double volume); [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_message_parse_warning")] [Version (replacement = "PlayMessage.parse_warning", since = "1.20")] - public static void play_message_parse_warning (Gst.Message msg, out unowned GLib.Error error, out Gst.Structure details); + public static void play_message_parse_warning (Gst.Message msg, out GLib.Error error, out Gst.Structure? details); [CCode (cheader_filename = "gst/play/play.h", cname = "gst_play_state_get_name")] [Version (replacement = "PlayState.get_name", since = "1.20")] public static unowned string play_state_get_name (Gst.Play.State state); diff --git a/vapi/metadata/GstPbutils-1.0.metadata b/vapi/metadata/GstPbutils-1.0.metadata index b67c60a86..3772449a7 100644 --- a/vapi/metadata/GstPbutils-1.0.metadata +++ b/vapi/metadata/GstPbutils-1.0.metadata @@ -5,5 +5,10 @@ pb_utils_* name="pb_utils_(.+)" codec_utils_aac_* parent="Gst.PbUtils.Codec.AAC" name="codec_utils_aac_(.+)" codec_utils_h264_* parent="Gst.PbUtils.Codec.H264" name="codec_utils_h264_(.+)" +codec_utils_h264_get_profile_flags_level + .codec_data array array_length_idx=1 + .profile out + .flags out + .level out codec_utils_mpeg4video_* parent="Gst.PbUtils.Codec.MPEG4Video" name="codec_utils_mpeg4video_(.+)" |