From 0dc052e2ccee3a09e2b89908e2edd2a9b0264ed3 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Mon, 9 Mar 2020 13:48:21 -0400 Subject: [PATCH] TT#76711 globalise ensure_codec_def function Change-Id: I2183ed5c7882b3e8909584425b1a37dd7da36124 --- daemon/codec.c | 8 ++++---- include/codec.h | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/daemon/codec.c b/daemon/codec.c index 953a637d6..85ead4a9b 100644 --- a/daemon/codec.c +++ b/daemon/codec.c @@ -264,7 +264,7 @@ struct codec_handler *codec_handler_make_playback(struct rtp_payload_type *src_p return handler; } -static void __ensure_codec_def(struct rtp_payload_type *pt, struct call_media *media) { +void ensure_codec_def(struct rtp_payload_type *pt, struct call_media *media) { if (pt->codec_def) return; @@ -315,7 +315,7 @@ static struct rtp_payload_type *__check_dest_codecs(struct call_media *receiver, for (GList *l = sink->codecs_prefs_send.head; l; l = l->next) { struct rtp_payload_type *pt = l->data; - __ensure_codec_def(pt, sink); + ensure_codec_def(pt, sink); if (!pt->codec_def) // not supported, next continue; @@ -425,7 +425,7 @@ static void __accept_transcode_codecs(struct call_media *receiver, struct call_m GList *insert_pos = NULL; for (GList *l = receiver->codecs_prefs_send.head; l; l = l->next) { struct rtp_payload_type *pt = l->data; - __ensure_codec_def(pt, receiver); + ensure_codec_def(pt, receiver); if (!pt->codec_def) continue; if (g_hash_table_lookup(receiver->codecs_recv, &pt->payload_type)) { @@ -526,7 +526,7 @@ static void __check_dtmf_injector(const struct sdp_ng_flags *flags, struct call_ static struct codec_handler *__get_pt_handler(struct call_media *receiver, struct rtp_payload_type *pt) { - __ensure_codec_def(pt, receiver); + ensure_codec_def(pt, receiver); struct codec_handler *handler; handler = g_hash_table_lookup(receiver->codec_handlers, GINT_TO_POINTER(pt->payload_type)); if (handler) { diff --git a/include/codec.h b/include/codec.h index 2a90a5df2..c21dc04cb 100644 --- a/include/codec.h +++ b/include/codec.h @@ -55,6 +55,7 @@ void codec_handlers_free(struct call_media *); struct codec_handler *codec_handler_make_playback(struct rtp_payload_type *src_pt, struct rtp_payload_type *dst_pt, unsigned long ts); void codec_handler_free(struct codec_handler *handler); +void ensure_codec_def(struct rtp_payload_type *pt, struct call_media *media); void codec_add_raw_packet(struct media_packet *mp); void codec_packet_free(void *);