diff --git a/gst-libs/gst/rtp/Makefile.am b/gst-libs/gst/rtp/Makefile.am index 0a8cc5dafb..a6f971db99 100644 --- a/gst-libs/gst/rtp/Makefile.am +++ b/gst-libs/gst/rtp/Makefile.am @@ -2,6 +2,7 @@ libgstrtpincludedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/rtp libgstrtpinclude_HEADERS = \ rtp.h \ + rtp-prelude.h \ gstrtpdefs.h \ gstrtpbuffer.h \ gstrtcpbuffer.h \ @@ -38,7 +39,8 @@ glib_gen_prefix = __gst_rtp glib_enum_define = gst_rtp glib_enum_headers = $(libgstrtpinclude_HEADERS) glib_gen_basename = gstrtp -glib_gen_decl_banner=GST_EXPORT +glib_gen_decl_banner=GST_RTP_API +glib_gen_decl_include=\#include include $(top_srcdir)/common/gst-glib-gen.mak diff --git a/gst-libs/gst/rtp/gstrtcpbuffer.h b/gst-libs/gst/rtp/gstrtcpbuffer.h index 2403e2f69b..0aee0133f0 100644 --- a/gst-libs/gst/rtp/gstrtcpbuffer.h +++ b/gst-libs/gst/rtp/gstrtcpbuffer.h @@ -24,6 +24,7 @@ #define __GST_RTCPBUFFER_H__ #include +#include G_BEGIN_DECLS @@ -224,105 +225,105 @@ struct _GstRTCPPacket /* creating buffers */ -GST_EXPORT +GST_RTP_API GstBuffer* gst_rtcp_buffer_new_take_data (gpointer data, guint len); -GST_EXPORT +GST_RTP_API GstBuffer* gst_rtcp_buffer_new_copy_data (gconstpointer data, guint len); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_buffer_validate_data (guint8 *data, guint len); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_buffer_validate (GstBuffer *buffer); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_buffer_validate_data_reduced (guint8 *data, guint len); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_buffer_validate_reduced (GstBuffer *buffer); -GST_EXPORT +GST_RTP_API GstBuffer* gst_rtcp_buffer_new (guint mtu); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_buffer_map (GstBuffer *buffer, GstMapFlags flags, GstRTCPBuffer *rtcp); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_buffer_unmap (GstRTCPBuffer *rtcp); /* adding/retrieving packets */ -GST_EXPORT +GST_RTP_API guint gst_rtcp_buffer_get_packet_count (GstRTCPBuffer *rtcp); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_buffer_get_first_packet (GstRTCPBuffer *rtcp, GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_move_to_next (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_buffer_add_packet (GstRTCPBuffer *rtcp, GstRTCPType type, GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_remove (GstRTCPPacket *packet); /* working with packets */ -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_get_padding (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API guint8 gst_rtcp_packet_get_count (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API GstRTCPType gst_rtcp_packet_get_type (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API guint16 gst_rtcp_packet_get_length (GstRTCPPacket *packet); /* sender reports */ -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_sr_get_sender_info (GstRTCPPacket *packet, guint32 *ssrc, guint64 *ntptime, guint32 *rtptime, guint32 *packet_count, guint32 *octet_count); -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_sr_set_sender_info (GstRTCPPacket *packet, guint32 ssrc, guint64 ntptime, guint32 rtptime, guint32 packet_count, guint32 octet_count); /* receiver reports */ -GST_EXPORT +GST_RTP_API guint32 gst_rtcp_packet_rr_get_ssrc (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_rr_set_ssrc (GstRTCPPacket *packet, guint32 ssrc); /* report blocks for SR and RR */ -GST_EXPORT +GST_RTP_API guint gst_rtcp_packet_get_rb_count (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_get_rb (GstRTCPPacket *packet, guint nth, guint32 *ssrc, guint8 *fractionlost, gint32 *packetslost, guint32 *exthighestseq, guint32 *jitter, guint32 *lsr, guint32 *dlsr); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_add_rb (GstRTCPPacket *packet, guint32 ssrc, guint8 fractionlost, gint32 packetslost, guint32 exthighestseq, guint32 jitter, guint32 lsr, guint32 dlsr); -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_set_rb (GstRTCPPacket *packet, guint nth, guint32 ssrc, guint8 fractionlost, gint32 packetslost, guint32 exthighestseq, guint32 jitter, @@ -330,151 +331,151 @@ void gst_rtcp_packet_set_rb (GstRTCPPacket *packet, gu /* profile-specific extensions for SR and RR */ -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_add_profile_specific_ext (GstRTCPPacket * packet, const guint8 * data, guint len); -GST_EXPORT +GST_RTP_API guint16 gst_rtcp_packet_get_profile_specific_ext_length (GstRTCPPacket * packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_get_profile_specific_ext (GstRTCPPacket * packet, guint8 ** data, guint * len); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_copy_profile_specific_ext (GstRTCPPacket * packet, guint8 ** data, guint * len); /* source description packet */ -GST_EXPORT +GST_RTP_API guint gst_rtcp_packet_sdes_get_item_count (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_sdes_first_item (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_sdes_next_item (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API guint32 gst_rtcp_packet_sdes_get_ssrc (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_sdes_first_entry (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_sdes_next_entry (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_sdes_get_entry (GstRTCPPacket *packet, GstRTCPSDESType *type, guint8 *len, guint8 **data); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_sdes_copy_entry (GstRTCPPacket *packet, GstRTCPSDESType *type, guint8 *len, guint8 **data); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_sdes_add_item (GstRTCPPacket *packet, guint32 ssrc); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_sdes_add_entry (GstRTCPPacket *packet, GstRTCPSDESType type, guint8 len, const guint8 *data); /* bye packet */ -GST_EXPORT +GST_RTP_API guint gst_rtcp_packet_bye_get_ssrc_count (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API guint32 gst_rtcp_packet_bye_get_nth_ssrc (GstRTCPPacket *packet, guint nth); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_bye_add_ssrc (GstRTCPPacket *packet, guint32 ssrc); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_bye_add_ssrcs (GstRTCPPacket *packet, guint32 *ssrc, guint len); -GST_EXPORT +GST_RTP_API guint8 gst_rtcp_packet_bye_get_reason_len (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gchar* gst_rtcp_packet_bye_get_reason (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_bye_set_reason (GstRTCPPacket *packet, const gchar *reason); /* app packets */ -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_app_set_subtype (GstRTCPPacket * packet, guint8 subtype); -GST_EXPORT +GST_RTP_API guint8 gst_rtcp_packet_app_get_subtype (GstRTCPPacket * packet); -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_app_set_ssrc (GstRTCPPacket * packet, guint32 ssrc); -GST_EXPORT +GST_RTP_API guint32 gst_rtcp_packet_app_get_ssrc (GstRTCPPacket * packet); -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_app_set_name (GstRTCPPacket * packet, const gchar *name); -GST_EXPORT +GST_RTP_API const gchar* gst_rtcp_packet_app_get_name (GstRTCPPacket * packet); -GST_EXPORT +GST_RTP_API guint16 gst_rtcp_packet_app_get_data_length (GstRTCPPacket * packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_app_set_data_length (GstRTCPPacket * packet, guint16 wordlen); -GST_EXPORT +GST_RTP_API guint8* gst_rtcp_packet_app_get_data (GstRTCPPacket * packet); /* feedback packets */ -GST_EXPORT +GST_RTP_API guint32 gst_rtcp_packet_fb_get_sender_ssrc (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_fb_set_sender_ssrc (GstRTCPPacket *packet, guint32 ssrc); -GST_EXPORT +GST_RTP_API guint32 gst_rtcp_packet_fb_get_media_ssrc (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_fb_set_media_ssrc (GstRTCPPacket *packet, guint32 ssrc); -GST_EXPORT +GST_RTP_API GstRTCPFBType gst_rtcp_packet_fb_get_type (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API void gst_rtcp_packet_fb_set_type (GstRTCPPacket *packet, GstRTCPFBType type); -GST_EXPORT +GST_RTP_API guint16 gst_rtcp_packet_fb_get_fci_length (GstRTCPPacket *packet); -GST_EXPORT +GST_RTP_API gboolean gst_rtcp_packet_fb_set_fci_length (GstRTCPPacket *packet, guint16 wordlen); -GST_EXPORT +GST_RTP_API guint8 * gst_rtcp_packet_fb_get_fci (GstRTCPPacket *packet); /* helper functions */ -GST_EXPORT +GST_RTP_API guint64 gst_rtcp_ntp_to_unix (guint64 ntptime); -GST_EXPORT +GST_RTP_API guint64 gst_rtcp_unix_to_ntp (guint64 unixtime); -GST_EXPORT +GST_RTP_API const gchar * gst_rtcp_sdes_type_to_name (GstRTCPSDESType type); -GST_EXPORT +GST_RTP_API GstRTCPSDESType gst_rtcp_sdes_name_to_type (const gchar *name); G_END_DECLS diff --git a/gst-libs/gst/rtp/gstrtpbaseaudiopayload.h b/gst-libs/gst/rtp/gstrtpbaseaudiopayload.h index 8ab5dbe392..33de222619 100644 --- a/gst-libs/gst/rtp/gstrtpbaseaudiopayload.h +++ b/gst-libs/gst/rtp/gstrtpbaseaudiopayload.h @@ -76,44 +76,44 @@ struct _GstRTPBaseAudioPayloadClass gpointer _gst_reserved[GST_PADDING]; }; -GST_EXPORT +GST_RTP_API GType gst_rtp_base_audio_payload_get_type (void); /* configure frame based */ -GST_EXPORT +GST_RTP_API void gst_rtp_base_audio_payload_set_frame_based (GstRTPBaseAudioPayload *rtpbaseaudiopayload); -GST_EXPORT +GST_RTP_API void gst_rtp_base_audio_payload_set_frame_options (GstRTPBaseAudioPayload *rtpbaseaudiopayload, gint frame_duration, gint frame_size); /* configure sample based */ -GST_EXPORT +GST_RTP_API void gst_rtp_base_audio_payload_set_sample_based (GstRTPBaseAudioPayload *rtpbaseaudiopayload); -GST_EXPORT +GST_RTP_API void gst_rtp_base_audio_payload_set_sample_options (GstRTPBaseAudioPayload *rtpbaseaudiopayload, gint sample_size); -GST_EXPORT +GST_RTP_API void gst_rtp_base_audio_payload_set_samplebits_options (GstRTPBaseAudioPayload *rtpbaseaudiopayload, gint sample_size); /* get the internal adapter */ -GST_EXPORT +GST_RTP_API GstAdapter* gst_rtp_base_audio_payload_get_adapter (GstRTPBaseAudioPayload *rtpbaseaudiopayload); /* push and flushing data */ -GST_EXPORT +GST_RTP_API GstFlowReturn gst_rtp_base_audio_payload_push (GstRTPBaseAudioPayload * baseaudiopayload, const guint8 * data, guint payload_len, GstClockTime timestamp); -GST_EXPORT +GST_RTP_API GstFlowReturn gst_rtp_base_audio_payload_flush (GstRTPBaseAudioPayload * baseaudiopayload, guint payload_len, GstClockTime timestamp); diff --git a/gst-libs/gst/rtp/gstrtpbasedepayload.h b/gst-libs/gst/rtp/gstrtpbasedepayload.h index f5656ace9a..ff43250700 100644 --- a/gst-libs/gst/rtp/gstrtpbasedepayload.h +++ b/gst-libs/gst/rtp/gstrtpbasedepayload.h @@ -114,13 +114,13 @@ struct _GstRTPBaseDepayloadClass gpointer _gst_reserved[GST_PADDING - 1]; }; -GST_EXPORT +GST_RTP_API GType gst_rtp_base_depayload_get_type (void); -GST_EXPORT +GST_RTP_API GstFlowReturn gst_rtp_base_depayload_push (GstRTPBaseDepayload *filter, GstBuffer *out_buf); -GST_EXPORT +GST_RTP_API GstFlowReturn gst_rtp_base_depayload_push_list (GstRTPBaseDepayload *filter, GstBufferList *out_list); diff --git a/gst-libs/gst/rtp/gstrtpbasepayload.h b/gst-libs/gst/rtp/gstrtpbasepayload.h index 48bc29c307..b477e8a216 100644 --- a/gst-libs/gst/rtp/gstrtpbasepayload.h +++ b/gst-libs/gst/rtp/gstrtpbasepayload.h @@ -21,6 +21,7 @@ #define __GST_RTP_BASE_PAYLOAD_H__ #include +#include G_BEGIN_DECLS @@ -145,29 +146,29 @@ struct _GstRTPBasePayloadClass gpointer _gst_reserved[GST_PADDING]; }; -GST_EXPORT +GST_RTP_API GType gst_rtp_base_payload_get_type (void); -GST_EXPORT +GST_RTP_API void gst_rtp_base_payload_set_options (GstRTPBasePayload *payload, const gchar *media, gboolean dynamic, const gchar *encoding_name, guint32 clock_rate); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_base_payload_set_outcaps (GstRTPBasePayload *payload, const gchar *fieldname, ...); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_base_payload_is_filled (GstRTPBasePayload *payload, guint size, GstClockTime duration); -GST_EXPORT +GST_RTP_API GstFlowReturn gst_rtp_base_payload_push (GstRTPBasePayload *payload, GstBuffer *buffer); -GST_EXPORT +GST_RTP_API GstFlowReturn gst_rtp_base_payload_push_list (GstRTPBasePayload *payload, GstBufferList *list); diff --git a/gst-libs/gst/rtp/gstrtpbuffer.h b/gst-libs/gst/rtp/gstrtpbuffer.h index 8b8d4c6f1b..42e3791f67 100644 --- a/gst-libs/gst/rtp/gstrtpbuffer.h +++ b/gst-libs/gst/rtp/gstrtpbuffer.h @@ -64,150 +64,150 @@ struct _GstRTPBuffer /* creating buffers */ -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_allocate_data (GstBuffer *buffer, guint payload_len, guint8 pad_len, guint8 csrc_count); -GST_EXPORT +GST_RTP_API GstBuffer* gst_rtp_buffer_new_take_data (gpointer data, gsize len); -GST_EXPORT +GST_RTP_API GstBuffer* gst_rtp_buffer_new_copy_data (gconstpointer data, gsize len); -GST_EXPORT +GST_RTP_API GstBuffer* gst_rtp_buffer_new_allocate (guint payload_len, guint8 pad_len, guint8 csrc_count); -GST_EXPORT +GST_RTP_API GstBuffer* gst_rtp_buffer_new_allocate_len (guint packet_len, guint8 pad_len, guint8 csrc_count); -GST_EXPORT +GST_RTP_API guint gst_rtp_buffer_calc_header_len (guint8 csrc_count); -GST_EXPORT +GST_RTP_API guint gst_rtp_buffer_calc_packet_len (guint payload_len, guint8 pad_len, guint8 csrc_count); -GST_EXPORT +GST_RTP_API guint gst_rtp_buffer_calc_payload_len (guint packet_len, guint8 pad_len, guint8 csrc_count); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_buffer_map (GstBuffer *buffer, GstMapFlags flags, GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_unmap (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_set_packet_len (GstRTPBuffer *rtp, guint len); -GST_EXPORT +GST_RTP_API guint gst_rtp_buffer_get_packet_len (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API guint gst_rtp_buffer_get_header_len (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API guint8 gst_rtp_buffer_get_version (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_set_version (GstRTPBuffer *rtp, guint8 version); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_buffer_get_padding (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_set_padding (GstRTPBuffer *rtp, gboolean padding); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_pad_to (GstRTPBuffer *rtp, guint len); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_buffer_get_extension (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_set_extension (GstRTPBuffer *rtp, gboolean extension); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_buffer_get_extension_data (GstRTPBuffer *rtp, guint16 *bits, gpointer *data, guint *wordlen); -GST_EXPORT +GST_RTP_API GBytes* gst_rtp_buffer_get_extension_bytes (GstRTPBuffer *rtp, guint16 *bits); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_buffer_set_extension_data (GstRTPBuffer *rtp, guint16 bits, guint16 length); -GST_EXPORT +GST_RTP_API guint32 gst_rtp_buffer_get_ssrc (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_set_ssrc (GstRTPBuffer *rtp, guint32 ssrc); -GST_EXPORT +GST_RTP_API guint8 gst_rtp_buffer_get_csrc_count (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API guint32 gst_rtp_buffer_get_csrc (GstRTPBuffer *rtp, guint8 idx); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_set_csrc (GstRTPBuffer *rtp, guint8 idx, guint32 csrc); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_buffer_get_marker (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_set_marker (GstRTPBuffer *rtp, gboolean marker); -GST_EXPORT +GST_RTP_API guint8 gst_rtp_buffer_get_payload_type (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_set_payload_type (GstRTPBuffer *rtp, guint8 payload_type); -GST_EXPORT +GST_RTP_API guint16 gst_rtp_buffer_get_seq (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_set_seq (GstRTPBuffer *rtp, guint16 seq); -GST_EXPORT +GST_RTP_API guint32 gst_rtp_buffer_get_timestamp (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API void gst_rtp_buffer_set_timestamp (GstRTPBuffer *rtp, guint32 timestamp); -GST_EXPORT +GST_RTP_API GstBuffer* gst_rtp_buffer_get_payload_buffer (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API GstBuffer* gst_rtp_buffer_get_payload_subbuffer (GstRTPBuffer *rtp, guint offset, guint len); -GST_EXPORT +GST_RTP_API guint gst_rtp_buffer_get_payload_len (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API gpointer gst_rtp_buffer_get_payload (GstRTPBuffer *rtp); -GST_EXPORT +GST_RTP_API GBytes* gst_rtp_buffer_get_payload_bytes (GstRTPBuffer *rtp); /* some helpers */ -GST_EXPORT +GST_RTP_API guint32 gst_rtp_buffer_default_clock_rate (guint8 payload_type); -GST_EXPORT +GST_RTP_API gint gst_rtp_buffer_compare_seqnum (guint16 seqnum1, guint16 seqnum2); -GST_EXPORT +GST_RTP_API guint64 gst_rtp_buffer_ext_timestamp (guint64 *exttimestamp, guint32 timestamp); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_buffer_get_extension_onebyte_header (GstRTPBuffer *rtp, guint8 id, guint nth, gpointer * data, guint * size); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_buffer_get_extension_twobytes_header (GstRTPBuffer *rtp, guint8 * appbits, guint8 id, @@ -215,13 +215,13 @@ gboolean gst_rtp_buffer_get_extension_twobytes_header (GstRTPBuffer *rtp, gpointer * data, guint * size); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_buffer_add_extension_onebyte_header (GstRTPBuffer *rtp, guint8 id, gconstpointer data, guint size); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_buffer_add_extension_twobytes_header (GstRTPBuffer *rtp, guint8 appbits, guint8 id, diff --git a/gst-libs/gst/rtp/gstrtpdefs.h b/gst-libs/gst/rtp/gstrtpdefs.h index 350f1c29b6..deb77d9893 100644 --- a/gst-libs/gst/rtp/gstrtpdefs.h +++ b/gst-libs/gst/rtp/gstrtpdefs.h @@ -25,6 +25,7 @@ #define __GST_RTPDEFS_H__ #include +#include /** * GstRTPProfile: diff --git a/gst-libs/gst/rtp/gstrtphdrext.h b/gst-libs/gst/rtp/gstrtphdrext.h index 475aa5ac70..df36fe616b 100644 --- a/gst-libs/gst/rtp/gstrtphdrext.h +++ b/gst-libs/gst/rtp/gstrtphdrext.h @@ -34,20 +34,20 @@ G_BEGIN_DECLS #define GST_RTP_HDREXT_NTP_64_SIZE 8 -GST_EXPORT +GST_RTP_API gboolean gst_rtp_hdrext_set_ntp_64 (gpointer data, guint size, guint64 ntptime); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_hdrext_get_ntp_64 (gpointer data, guint size, guint64 *ntptime); #define GST_RTP_HDREXT_NTP_56 "ntp-56" #define GST_RTP_HDREXT_NTP_56_SIZE 7 -GST_EXPORT +GST_RTP_API gboolean gst_rtp_hdrext_set_ntp_56 (gpointer data, guint size, guint64 ntptime); -GST_EXPORT +GST_RTP_API gboolean gst_rtp_hdrext_get_ntp_56 (gpointer data, guint size, guint64 *ntptime); G_END_DECLS diff --git a/gst-libs/gst/rtp/gstrtppayloads.h b/gst-libs/gst/rtp/gstrtppayloads.h index d8d5478dbd..84f6c3cc3c 100644 --- a/gst-libs/gst/rtp/gstrtppayloads.h +++ b/gst-libs/gst/rtp/gstrtppayloads.h @@ -24,6 +24,7 @@ #define __GST_RTPPAYLOADS_H__ #include +#include G_BEGIN_DECLS @@ -186,10 +187,10 @@ struct _GstRTPPayloadInfo gpointer _gst_reserved[GST_PADDING]; }; -GST_EXPORT +GST_RTP_API const GstRTPPayloadInfo * gst_rtp_payload_info_for_pt (guint8 payload_type); -GST_EXPORT +GST_RTP_API const GstRTPPayloadInfo * gst_rtp_payload_info_for_name (const gchar *media, const gchar *encoding_name); G_END_DECLS diff --git a/gst-libs/gst/rtp/meson.build b/gst-libs/gst/rtp/meson.build index 496b7d0039..ab20bf7684 100644 --- a/gst-libs/gst/rtp/meson.build +++ b/gst-libs/gst/rtp/meson.build @@ -17,6 +17,7 @@ rtp_headers = [ 'gstrtpdefs.h', 'gstrtphdrext.h', 'gstrtppayloads.h', + 'rtp-prelude.h', 'rtp.h', ] install_headers(rtp_headers, subdir : 'gstreamer-1.0/gst/rtp/') diff --git a/gst-libs/gst/rtp/rtp-prelude.h b/gst-libs/gst/rtp/rtp-prelude.h new file mode 100644 index 0000000000..6f9c537fcc --- /dev/null +++ b/gst-libs/gst/rtp/rtp-prelude.h @@ -0,0 +1,31 @@ +/* GStreamer RTP Library + * Copyright (C) 2018 GStreamer developers + * + * rtp-prelude.h: prelude include header for gst-rtp library + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __GST_RTP_PRELUDE_H__ +#define __GST_RTP_PRELUDE_H__ + +#include + +#ifndef GST_RTP_API +#define GST_RTP_API GST_EXPORT +#endif + +#endif /* __GST_RTP_PRELUDE_H__ */ diff --git a/gst-libs/gst/rtp/rtp_mkenum.py b/gst-libs/gst/rtp/rtp_mkenum.py index 9e3d92c37a..984061284a 100755 --- a/gst-libs/gst/rtp/rtp_mkenum.py +++ b/gst-libs/gst/rtp/rtp_mkenum.py @@ -8,11 +8,11 @@ import sys, os, shutil, subprocess h_array = ['--fhead', - "#ifndef __GST_RTP_ENUM_TYPES_H__\n#define __GST_RTP_ENUM_TYPES_H__\n\n#include \n\nG_BEGIN_DECLS\n", + "#ifndef __GST_RTP_ENUM_TYPES_H__\n#define __GST_RTP_ENUM_TYPES_H__\n\n#include \n#include \nG_BEGIN_DECLS\n", '--fprod', "\n/* enumerations from \"@filename@\" */\n", '--vhead', - 'GST_EXPORT GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n', + 'GST_RTP_API GType @enum_name@_get_type (void);\n#define GST_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n', '--ftail', 'G_END_DECLS\n\n#endif /* __GST_RTP_ENUM_TYPES_H__ */', ]