depau/Purism-Calls
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/calls.git synced 2024-09-29 15:25:24 +00:00
Code Issues Releases Wiki Activity

media manager: Manage and hand out available pipelines

Browse source 
The media manager will always try to have a pipeline ready.
This commit is contained in:
Evangelos Ribeiro Tzaras 2022-02-28 11:37:26 +01:00
parent c4aa8d45e8
commit 7033c1cd75
2 changed files with 63 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
plugins/sip/calls-sip-media-manager.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2021 Purism SPC * Copyright (C) 2021-2022 Purism SPC
* *
* This file is part of Calls. * This file is part of Calls.
* *
@ -26,8 +26,11 @@
#include "calls-settings.h" #include "calls-settings.h"
#include "calls-sip-media-manager.h" #include "calls-sip-media-manager.h"
#include "calls-sip-media-pipeline.h"
#include "gst-rfc3551.h" #include "gst-rfc3551.h"
#include "util.h"
#include <gio/gio.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <sys/types.h> #include <sys/types.h>
@ -41,8 +44,8 @@
* @Title: CallsSipMediaManager * @Title: CallsSipMediaManager
* *
* #CallsSipMediaManager is mainly responsible for generating appropriate * #CallsSipMediaManager is mainly responsible for generating appropriate
* SDP messages for the set of supported codecs. In the future it * SDP messages for the set of supported codecs. It also holds a list of
* shall also manage the #CallsSipMediaPipeline objects that are in use. * #CallsSipMediaPipeline objects that are ready to be used.
*/ */
typedef struct _CallsSipMediaManager typedef struct _CallsSipMediaManager
@ -54,6 +57,7 @@ typedef struct _CallsSipMediaManager
CallsSettings *settings; CallsSettings *settings;
GList *preferred_codecs; GList *preferred_codecs;
GListStore *pipelines;
} CallsSipMediaManager; } CallsSipMediaManager;
G_DEFINE_TYPE (CallsSipMediaManager, calls_sip_media_manager, G_TYPE_OBJECT); G_DEFINE_TYPE (CallsSipMediaManager, calls_sip_media_manager, G_TYPE_OBJECT);
@ -132,6 +136,18 @@ on_notify_preferred_audio_codecs (CallsSipMediaManager *self)
} }
static void
add_new_pipeline (CallsSipMediaManager *self)
{
CallsSipMediaPipeline *pipeline;
g_assert (CALLS_IS_SIP_MEDIA_MANAGER (self));
pipeline = calls_sip_media_pipeline_new (NULL);
g_list_store_append (self->pipelines, pipeline);
}
static void static void
calls_sip_media_manager_finalize (GObject *object) calls_sip_media_manager_finalize (GObject *object)
{ {
@ -139,6 +155,7 @@ calls_sip_media_manager_finalize (GObject *object)
g_list_free (self->preferred_codecs); g_list_free (self->preferred_codecs);
g_object_unref (self->settings); g_object_unref (self->settings);
g_object_unref (self->pipelines);
G_OBJECT_CLASS (calls_sip_media_manager_parent_class)->finalize (object); G_OBJECT_CLASS (calls_sip_media_manager_parent_class)->finalize (object);
} }
@ -169,6 +186,10 @@ calls_sip_media_manager_init (CallsSipMediaManager *self)
/* Hints are used with getaddrinfo() when setting the session IP */ /* Hints are used with getaddrinfo() when setting the session IP */
self->hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG | AI_NUMERICHOST; self->hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG | AI_NUMERICHOST;
self->hints.ai_family = AF_UNSPEC; self->hints.ai_family = AF_UNSPEC;
self->pipelines = g_list_store_new (CALLS_TYPE_SIP_MEDIA_PIPELINE);
add_new_pipeline (self);
} }
@ -342,4 +363,25 @@ calls_sip_media_manager_get_codecs_from_sdp (CallsSipMediaManager *self,
return codecs; return codecs;
} }
/**
* calls_sip_media_manager_get_pipeline:
* @self: A #CallsSipMediaManager
*
* Returns: (transfer full): A #CallsSipMediaPipeline
*/
CallsSipMediaPipeline *
calls_sip_media_manager_get_pipeline (CallsSipMediaManager *self)
{
g_autoptr (CallsSipMediaPipeline) pipeline = NULL;
g_return_val_if_fail (CALLS_IS_SIP_MEDIA_MANAGER (self), NULL);
pipeline = g_list_model_get_item (G_LIST_MODEL (self->pipelines), 0);
g_list_store_remove (self->pipelines, 0);
/* add a pipeline for the one we just removed */
add_new_pipeline (self);
return pipeline;
}

34
plugins/sip/calls-sip-media-manager.h
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2021 Purism SPC * Copyright (C) 2021-2022 Purism SPC
* *
* This file is part of Calls. * This file is part of Calls.
* *
@ -24,6 +24,7 @@
#pragma once #pragma once
#include "calls-sip-media-pipeline.h"
#include "gst-rfc3551.h" #include "gst-rfc3551.h"
#include <sofia-sip/sdp.h> #include <sofia-sip/sdp.h>
@ -36,20 +37,21 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (CallsSipMediaManager, calls_sip_media_manager, CALLS, SIP_MEDIA_MANAGER, GObject) G_DECLARE_FINAL_TYPE (CallsSipMediaManager, calls_sip_media_manager, CALLS, SIP_MEDIA_MANAGER, GObject)
CallsSipMediaManager* calls_sip_media_manager_default (void); CallsSipMediaManager* calls_sip_media_manager_default (void);
gchar* calls_sip_media_manager_get_capabilities (CallsSipMediaManager *self, gchar* calls_sip_media_manager_get_capabilities (CallsSipMediaManager *self,
const char *own_ip, const char *own_ip,
guint port, guint port,
gboolean use_srtp, gboolean use_srtp,
GList *supported_codecs); GList *supported_codecs);
gchar* calls_sip_media_manager_static_capabilities (CallsSipMediaManager *self, gchar* calls_sip_media_manager_static_capabilities (CallsSipMediaManager *self,
const char *own_ip, const char *own_ip,
guint port, guint port,
gboolean use_srtp); gboolean use_srtp);
gboolean calls_sip_media_manager_supports_media (CallsSipMediaManager *self, gboolean calls_sip_media_manager_supports_media (CallsSipMediaManager *self,
const char *media_type); const char *media_type);
GList * calls_sip_media_manager_codec_candidates (CallsSipMediaManager *self); GList * calls_sip_media_manager_codec_candidates (CallsSipMediaManager *self);
GList * calls_sip_media_manager_get_codecs_from_sdp (CallsSipMediaManager *self, GList * calls_sip_media_manager_get_codecs_from_sdp (CallsSipMediaManager *self,
sdp_media_t *sdp_media); sdp_media_t *sdp_media);
CallsSipMediaPipeline *calls_sip_media_manager_get_pipeline (CallsSipMediaManager *self);
G_END_DECLS G_END_DECLS