From 6532c2b160c66540091d667c4af116ec4d71ff43 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Fri, 11 Feb 2022 20:33:06 +0100 Subject: RTP: Only display SSRC mismatch warning for GLib versions supporting warning_once --- plugins/rtp/CMakeLists.txt | 5 +++++ plugins/rtp/src/stream.vala | 2 ++ 2 files changed, 7 insertions(+) (limited to 'plugins/rtp') diff --git a/plugins/rtp/CMakeLists.txt b/plugins/rtp/CMakeLists.txt index 87ca4dcb..c8652c54 100644 --- a/plugins/rtp/CMakeLists.txt +++ b/plugins/rtp/CMakeLists.txt @@ -1,4 +1,5 @@ find_package(GstRtp REQUIRED) +find_package(GLib ${GLib_GLOBAL_VERSION} REQUIRED) find_package(WebRTCAudioProcessing 0.2) find_packages(RTP_PACKAGES REQUIRED Gee @@ -22,6 +23,10 @@ if(GstRtp_VERSION VERSION_GREATER "1.18") set(RTP_DEFINITIONS ${RTP_DEFINITIONS} GST_1_18) endif() +if(GLib_VERSION VERSION_GREATER "2.64") + set(RTP_DEFINITIONS ${RTP_DEFINITIONS} GLIB_2_64) +endif() + set(RTP_ENABLE_VP9 "no" CACHE BOOL "Enable VP9 support") if(RTP_ENABLE_VP9) set(RTP_DEFINITIONS ${RTP_DEFINITIONS} ENABLE_VP9) diff --git a/plugins/rtp/src/stream.vala b/plugins/rtp/src/stream.vala index ef9ffe96..6bd92e3f 100644 --- a/plugins/rtp/src/stream.vala +++ b/plugins/rtp/src/stream.vala @@ -316,9 +316,11 @@ public class Dino.Plugins.Rtp.Stream : Xmpp.Xep.JingleRtp.Stream { next_timestamp_offset_stamp = get_monotonic_time(); rtp_buffer.unmap(); } +#if GLIB_2_64 if (our_ssrc != buffer_ssrc) { warning_once("Sending RTP %s buffer seq %u with SSRC %u when our ssrc is %u", media, buffer_seq, buffer_ssrc, our_ssrc); } +#endif } prepare_local_crypto(); -- cgit v1.2.3-54-g00ecf