RTP: Use latest gstreamer vapi if vala version older than 0.56.1

This commit is contained in:
Marvin W 2022-08-21 19:32:03 +02:00
parent 054d3fec16
commit e85477bb19
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
4 changed files with 1132 additions and 27 deletions

View file

@ -1,4 +1,3 @@
find_package(GstRtp REQUIRED)
find_package(GLib ${GLib_GLOBAL_VERSION} REQUIRED)
find_package(WebRTCAudioProcessing 0.2)
find_packages(RTP_PACKAGES REQUIRED
@ -11,10 +10,12 @@ find_packages(RTP_PACKAGES REQUIRED
Gst
GstApp
GstAudio
GstRtp
GstVideo
)
set(RTP_DEFINITIONS)
set(RTP_EXTRA_OPTIONS)
if(GstRtp_VERSION VERSION_GREATER_EQUAL "1.16")
set(RTP_DEFINITIONS ${RTP_DEFINITIONS} GST_1_16)
@ -28,8 +29,8 @@ if(GstRtp_VERSION VERSION_GREATER_EQUAL "1.20")
set(RTP_DEFINITIONS ${RTP_DEFINITIONS} GST_1_20)
endif()
if(VALA_VERSION VERSION_GREATER_EQUAL "0.56.1")
set(RTP_DEFINITIONS ${RTP_DEFINITIONS} VALA_0_56_1)
if(NOT VALA_VERSION VERSION_GREATER_EQUAL "0.56.1")
set(RTP_EXTRA_OPTIONS ${RTP_EXTRA_OPTIONS} --vapidir=${CMAKE_CURRENT_SOURCE_DIR}/vapi)
endif()
set(RTP_ENABLE_VP9 "no" CACHE BOOL "Enable VP9 support")
@ -81,11 +82,12 @@ CUSTOM_VAPIS
${CMAKE_BINARY_DIR}/exports/xmpp-vala.vapi
${CMAKE_BINARY_DIR}/exports/dino.vapi
${CMAKE_BINARY_DIR}/exports/qlite.vapi
${CMAKE_CURRENT_SOURCE_DIR}/vapi/gstreamer-rtp-1.0.vapi
PACKAGES
${RTP_PACKAGES}
DEFINITIONS
${RTP_DEFINITIONS}
OPTIONS
${RTP_EXTRA_OPTIONS}
)
add_definitions(${VALA_CFLAGS} -DG_LOG_DOMAIN="rtp" -I${CMAKE_CURRENT_SOURCE_DIR}/src)

View file

@ -97,14 +97,7 @@ public class Dino.Plugins.Rtp.Sink : Gst.Video.Sink {
}
}
#if VALA_0_56_1
public override Gst.Caps get_caps(Gst.Caps? filter) {
#if 0
}
#endif
#else
public override Gst.Caps get_caps(Gst.Caps filter) {
#endif
Gst.Caps caps = Gst.Caps.from_string("video/x-raw, format={ BGRA, ARGB, RGBA, ABGR, RGB, BGR }");
if (filter != null) {

File diff suppressed because it is too large Load diff

View file

@ -171,7 +171,21 @@ namespace Gst {
LOC,
TOOL,
NOTE,
PRIV;
PRIV,
[Version (since = "1.20")]
H323_CADDR,
[Version (since = "1.20")]
APSI,
[Version (since = "1.20")]
RGRP,
[Version (since = "1.20")]
RTP_STREAM_ID,
[Version (since = "1.20")]
REPAIRED_RTP_STREAM_ID,
[Version (since = "1.20")]
CCID,
[Version (since = "1.20")]
MID;
[CCode (cname = "gst_rtcp_sdes_name_to_type")]
public static Gst.RTCP.SDESType from_string (string name);
[CCode (cname = "gst_rtcp_sdes_type_to_name")]
@ -220,6 +234,30 @@ namespace Gst {
[CCode (cheader_filename = "gst/rtp/rtp.h", cname = "GST_RTCP_VERSION")]
public const int VERSION;
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTCPBuffer.map")]
public static bool buffer_map (Gst.Buffer buffer, Gst.MapFlags flags, Gst.RTCP.Buffer rtcp);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTCPBuffer.new")]
public static Gst.Buffer buffer_new (uint mtu);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTCPBuffer.new_copy_data")]
public static Gst.Buffer buffer_new_copy_data ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] data);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTCPBuffer.new_take_data")]
public static Gst.Buffer buffer_new_take_data ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] data);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTCPBuffer.validate")]
public static bool buffer_validate (Gst.Buffer buffer);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTCPBuffer.validate_data")]
public static bool buffer_validate_data ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] data);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTCPBuffer.validate_data_reduced", since = "1.6")]
public static bool buffer_validate_data_reduced ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "guint")] uint8[] data);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTCPBuffer.validate_reduced", since = "1.6")]
public static bool buffer_validate_reduced (Gst.Buffer buffer);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
public static uint64 ntp_to_unix (uint64 ntptime);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
public static uint64 unix_to_ntp (uint64 unixtime);
@ -305,8 +343,8 @@ namespace Gst {
public bool is_filled (uint size, Gst.ClockTime duration);
[Version (since = "1.16")]
public bool is_source_info_enabled ();
public Gst.FlowReturn push (Gst.Buffer buffer);
public Gst.FlowReturn push_list (Gst.BufferList list);
public Gst.FlowReturn push (owned Gst.Buffer buffer);
public Gst.FlowReturn push_list (owned Gst.BufferList list);
[NoWrapper]
public virtual bool query (Gst.Pad pad, Gst.Query query);
[NoWrapper]
@ -367,27 +405,30 @@ namespace Gst {
[GIR (name = "RTPHeaderExtension")]
[Version (since = "1.20")]
public abstract class HeaderExtension : Gst.Element {
public uint ext_id;
[CCode (has_construct_function = false)]
protected HeaderExtension ();
public static Gst.RTP.HeaderExtension? create_from_uri (string uri);
public Gst.RTP.HeaderExtensionDirection get_direction ();
public uint get_id ();
public virtual size_t get_max_size (Gst.Buffer input_meta);
public string get_sdp_caps_field_name ();
public virtual Gst.RTP.HeaderExtensionFlags get_supported_flags ();
public unowned string get_uri ();
public virtual bool read (Gst.RTP.HeaderExtensionFlags read_flags, [CCode (array_length_cname = "size", array_length_pos = 2.5, array_length_type = "gsize", type = "const guint8*")] uint8[] data, Gst.Buffer buffer);
public virtual bool set_attributes_from_caps (Gst.Caps caps);
public bool set_attributes_from_caps_simple_sdp (Gst.Caps caps);
public virtual bool read (Gst.RTP.HeaderExtensionFlags read_flags, [CCode (array_length_cname = "size", array_length_pos = 2.5, array_length_type = "gsize")] uint8[] data, Gst.Buffer buffer);
[NoWrapper]
public virtual bool set_attributes (Gst.RTP.HeaderExtensionDirection direction, string attributes);
public bool set_attributes_from_caps (Gst.Caps caps);
public virtual bool set_caps_from_attributes (Gst.Caps caps);
public bool set_caps_from_attributes_simple_sdp (Gst.Caps caps);
public bool set_caps_from_attributes_helper (Gst.Caps caps, string attributes);
public void set_direction (Gst.RTP.HeaderExtensionDirection direction);
public void set_id (uint ext_id);
public virtual bool set_non_rtp_sink_caps (Gst.Caps caps);
[CCode (cname = "gst_rtp_header_extension_class_set_uri")]
public class void set_uri (string uri);
public void set_wants_update_non_rtp_src_caps (bool state);
public virtual bool update_non_rtp_src_caps (Gst.Caps caps);
public virtual size_t write (Gst.Buffer input_meta, Gst.RTP.HeaderExtensionFlags write_flags, Gst.Buffer output, [CCode (array_length_cname = "size", array_length_pos = 4.1, array_length_type = "gsize", type = "guint8*")] uint8[] data);
public bool wants_update_non_rtp_src_caps ();
public virtual ssize_t write (Gst.Buffer input_meta, Gst.RTP.HeaderExtensionFlags write_flags, Gst.Buffer output, [CCode (array_length_cname = "size", array_length_pos = 4.1, array_length_type = "gsize")] uint8[] data);
}
[CCode (cheader_filename = "gst/rtp/rtp.h", has_type_id = false)]
[GIR (name = "RTPBuffer")]
@ -400,9 +441,6 @@ namespace Gst {
public weak size_t size[4];
public bool add_extension_onebyte_header (uint8 id, [CCode (array_length_cname = "size", array_length_pos = 2.1, array_length_type = "guint")] uint8[] data);
public bool add_extension_twobytes_header (uint8 appbits, uint8 id, [CCode (array_length_cname = "size", array_length_pos = 3.1, array_length_type = "guint")] uint8[] data);
[CCode (cname = "gst_buffer_add_rtp_source_meta")]
[Version (since = "1.16")]
public static unowned Gst.RTP.SourceMeta? add_rtp_source_meta (Gst.Buffer buffer, uint32? ssrc, uint32? csrc, uint csrc_count);
public static void allocate_data (Gst.Buffer buffer, uint payload_len, uint8 pad_len, uint8 csrc_count);
public static uint calc_header_len (uint8 csrc_count);
public static uint calc_packet_len (uint payload_len, uint8 pad_len, uint8 csrc_count);
@ -432,9 +470,6 @@ namespace Gst {
public uint get_payload_len ();
public Gst.Buffer get_payload_subbuffer (uint offset, uint len);
public uint8 get_payload_type ();
[CCode (cname = "gst_buffer_get_rtp_source_meta")]
[Version (since = "1.16")]
public static unowned Gst.RTP.SourceMeta? get_rtp_source_meta (Gst.Buffer buffer);
public uint16 get_seq ();
public uint32 get_ssrc ();
public uint32 get_timestamp ();
@ -445,6 +480,8 @@ namespace Gst {
public static Gst.Buffer new_copy_data ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "gsize")] uint8[] data);
public static Gst.Buffer new_take_data ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "gsize")] owned uint8[] data);
public void pad_to (uint len);
[Version (since = "1.20")]
public void remove_extension_data ();
public void set_csrc (uint8 idx, uint32 csrc);
public void set_extension (bool extension);
public bool set_extension_data (uint16 bits, uint16 length);
@ -467,6 +504,8 @@ namespace Gst {
public uint clock_rate;
public weak string encoding_parameters;
public uint bitrate;
public static unowned Gst.RTP.PayloadInfo? for_name (string media, string encoding_name);
public static unowned Gst.RTP.PayloadInfo? for_pt (uint8 payload_type);
}
[CCode (cheader_filename = "gst/rtp/rtp.h", has_type_id = false)]
[GIR (name = "RTPSourceMeta")]
@ -479,6 +518,7 @@ namespace Gst {
public weak uint32 csrc[15];
public uint csrc_count;
public bool append_csrc ([CCode (array_length_cname = "csrc_count", array_length_pos = 1.1, array_length_type = "guint", type = "const guint32*")] uint32[] csrc);
public static unowned Gst.MetaInfo? get_info ();
public uint get_source_count ();
public bool set_ssrc (uint32? ssrc);
}
@ -499,6 +539,17 @@ namespace Gst {
SKIP_PADDING,
LAST
}
[CCode (cheader_filename = "gst/rtp/rtp.h", cprefix = "GST_RTP_HEADER_EXTENSION_DIRECTION_", type_id = "gst_rtp_header_extension_direction_get_type ()")]
[Flags]
[GIR (name = "RTPHeaderExtensionDirection")]
[Version (since = "1.20")]
public enum HeaderExtensionDirection {
INACTIVE,
SENDONLY,
RECVONLY,
SENDRECV,
INHERITED
}
[CCode (cheader_filename = "gst/rtp/rtp.h", cprefix = "GST_RTP_HEADER_EXTENSION_", type_id = "gst_rtp_header_extension_flags_get_type ()")]
[Flags]
[GIR (name = "RTPHeaderExtensionFlags")]
@ -602,9 +653,54 @@ namespace Gst {
public const int SOURCE_META_MAX_CSRC_COUNT;
[CCode (cheader_filename = "gst/rtp/rtp.h", cname = "GST_RTP_VERSION")]
public const int VERSION;
[CCode (cheader_filename = "gst/rtp/rtp.h", cname = "gst_buffer_add_rtp_source_meta")]
[Version (since = "1.16")]
public static unowned Gst.RTP.SourceMeta? buffer_add_rtp_source_meta (Gst.Buffer buffer, uint32? ssrc, uint32? csrc, uint csrc_count);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.allocate_data")]
public static void buffer_allocate_data (Gst.Buffer buffer, uint payload_len, uint8 pad_len, uint8 csrc_count);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.calc_header_len")]
public static uint buffer_calc_header_len (uint8 csrc_count);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.calc_packet_len")]
public static uint buffer_calc_packet_len (uint payload_len, uint8 pad_len, uint8 csrc_count);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.calc_payload_len")]
public static uint buffer_calc_payload_len (uint packet_len, uint8 pad_len, uint8 csrc_count);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.compare_seqnum")]
public static int buffer_compare_seqnum (uint16 seqnum1, uint16 seqnum2);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.default_clock_rate")]
public static uint32 buffer_default_clock_rate (uint8 payload_type);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.ext_timestamp")]
public static uint64 buffer_ext_timestamp (ref uint64 exttimestamp, uint32 timestamp);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.get_extension_onebyte_header_from_bytes", since = "1.18")]
public static bool buffer_get_extension_onebyte_header_from_bytes (GLib.Bytes bytes, uint16 bit_pattern, uint8 id, uint nth, [CCode (array_length_cname = "size", array_length_pos = 5.1, array_length_type = "guint")] out unowned uint8[] data);
[CCode (cheader_filename = "gst/rtp/rtp.h", cname = "gst_buffer_get_rtp_source_meta")]
[Version (since = "1.16")]
public static unowned Gst.RTP.SourceMeta? buffer_get_rtp_source_meta (Gst.Buffer buffer);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.map")]
public static bool buffer_map (Gst.Buffer buffer, Gst.MapFlags flags, out Gst.RTP.Buffer rtp);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.new_allocate")]
public static Gst.Buffer buffer_new_allocate (uint payload_len, uint8 pad_len, uint8 csrc_count);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.new_allocate_len")]
public static Gst.Buffer buffer_new_allocate_len (uint packet_len, uint8 pad_len, uint8 csrc_count);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.new_copy_data")]
public static Gst.Buffer buffer_new_copy_data ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "gsize")] uint8[] data);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPBuffer.new_take_data")]
public static Gst.Buffer buffer_new_take_data ([CCode (array_length_cname = "len", array_length_pos = 1.1, array_length_type = "gsize")] owned uint8[] data);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (since = "1.20")]
public static GLib.List<Gst.RTP.HeaderExtension> get_header_extension_list ();
public static GLib.List<Gst.ElementFactory> get_header_extension_list ();
[CCode (cheader_filename = "gst/rtp/rtp.h")]
public static bool hdrext_get_ntp_56 ([CCode (array_length_cname = "size", array_length_pos = 1.5, array_length_type = "guint")] uint8[] data, out uint64 ntptime);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
@ -614,12 +710,15 @@ namespace Gst {
[CCode (cheader_filename = "gst/rtp/rtp.h")]
public static bool hdrext_set_ntp_64 (void* data, uint size, uint64 ntptime);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPPayloadInfo.for_name")]
public static unowned Gst.RTP.PayloadInfo? payload_info_for_name (string media, string encoding_name);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPPayloadInfo.for_pt")]
public static unowned Gst.RTP.PayloadInfo? payload_info_for_pt (uint8 payload_type);
[CCode (cheader_filename = "gst/rtp/rtp.h")]
public static GLib.Type source_meta_api_get_type ();
[CCode (cheader_filename = "gst/rtp/rtp.h")]
[Version (replacement = "RTPSourceMeta.get_info")]
public static unowned Gst.MetaInfo? source_meta_get_info ();
}
}