anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

RTP: Only display SSRC mismatch warning for GLib versions supporting warning_once

Browse source
This commit is contained in:
Marvin W 2022-02-11 20:33:06 +01:00
parent e768c40e11
commit 6532c2b160
No known key found for this signature in database
GPG key ID: 072E9235DB996F2A
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plugins/rtp/CMakeLists.txt
View file

@ -1,4 +1,5 @@
find_package(GstRtp REQUIRED) find_package(GstRtp REQUIRED)
find_package(GLib ${GLib_GLOBAL_VERSION} REQUIRED)
find_package(WebRTCAudioProcessing 0.2) find_package(WebRTCAudioProcessing 0.2)
find_packages(RTP_PACKAGES REQUIRED find_packages(RTP_PACKAGES REQUIRED
Gee Gee
@ -22,6 +23,10 @@ if(GstRtp_VERSION VERSION_GREATER "1.18")
set(RTP_DEFINITIONS ${RTP_DEFINITIONS} GST_1_18) set(RTP_DEFINITIONS ${RTP_DEFINITIONS} GST_1_18)
endif() 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") set(RTP_ENABLE_VP9 "no" CACHE BOOL "Enable VP9 support")
if(RTP_ENABLE_VP9) if(RTP_ENABLE_VP9)
set(RTP_DEFINITIONS ${RTP_DEFINITIONS} ENABLE_VP9) set(RTP_DEFINITIONS ${RTP_DEFINITIONS} ENABLE_VP9)

2
plugins/rtp/src/stream.vala
View file

@ -316,9 +316,11 @@ public class Dino.Plugins.Rtp.Stream : Xmpp.Xep.JingleRtp.Stream {
next_timestamp_offset_stamp = get_monotonic_time(); next_timestamp_offset_stamp = get_monotonic_time();
rtp_buffer.unmap(); rtp_buffer.unmap();
} }
#if GLIB_2_64
if (our_ssrc != buffer_ssrc) { 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); 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(); prepare_local_crypto();