<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/mncc-python/+/17978">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rtpsource: Modularize generation of RTP frames<br><br>Change-Id: Iad98e1753fef1927c0e8a7493372141372a38224<br>---<br>M rtpsource/Makefile<br>M rtpsource/internal.h<br>A rtpsource/rtp_provider.c<br>A rtpsource/rtp_provider.h<br>A rtpsource/rtp_provider_static.c<br>M rtpsource/rtpsource.c<br>6 files changed, 230 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/rtpsource/Makefile b/rtpsource/Makefile</span><br><span>index 9972325..2ede792 100644</span><br><span>--- a/rtpsource/Makefile</span><br><span>+++ b/rtpsource/Makefile</span><br><span>@@ -4,7 +4,7 @@</span><br><span> CFLAGS:= -g -Wall $(OSMO_CFLAGS)</span><br><span> LIBS:= $(OSMO_LIBS)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-rtpsource: rtpsource.o ctrl_if.o</span><br><span style="color: hsl(120, 100%, 40%);">+rtpsource: rtpsource.o ctrl_if.o rtp_provider.o rtp_provider_static.o</span><br><span> $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)</span><br><span> </span><br><span> </span><br><span>diff --git a/rtpsource/internal.h b/rtpsource/internal.h</span><br><span>index 13d07aa..a4501a2 100644</span><br><span>--- a/rtpsource/internal.h</span><br><span>+++ b/rtpsource/internal.h</span><br><span>@@ -8,6 +8,8 @@</span><br><span> DMAIN,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct rtp_provider_instance;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct rtp_connection {</span><br><span> struct llist_head list;</span><br><span> </span><br><span>@@ -21,6 +23,7 @@</span><br><span> uint16_t remote_port;</span><br><span> </span><br><span> uint8_t rtp_pt;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_provider_instance *rtp_prov_inst;</span><br><span> };</span><br><span> </span><br><span> struct rtpsource_state {</span><br><span>diff --git a/rtpsource/rtp_provider.c b/rtpsource/rtp_provider.c</span><br><span>new file mode 100644</span><br><span>index 0000000..0d2b9c6</span><br><span>--- /dev/null</span><br><span>+++ b/rtpsource/rtp_provider.c</span><br><span>@@ -0,0 +1,54 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "rtp_provider.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "internal.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static LLIST_HEAD(g_providers);</span><br><span style="color: hsl(120, 100%, 40%);">+static LLIST_HEAD(g_prov_instances);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void rtp_provider_register(struct rtp_provider *prov)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(&prov->list, &g_providers);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+const struct rtp_provider *rtp_provider_find(const char *name)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_provider *p;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(p, &g_providers, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(name, p->name))</span><br><span style="color: hsl(120, 100%, 40%);">+ return p;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "Couldn't find RTP provider '%s'\n", name);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct rtp_provider_instance *</span><br><span style="color: hsl(120, 100%, 40%);">+rtp_provider_instance_alloc(void *ctx, const struct rtp_provider *provider, enum codec_type codec)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct rtp_provider_instance *pi;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ pi = talloc_zero(ctx, struct rtp_provider_instance);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!pi)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ pi->provider = provider;</span><br><span style="color: hsl(120, 100%, 40%);">+ pi->codec = codec;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(&pi->list, &g_prov_instances);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return pi;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void rtp_provider_instance_free(struct rtp_provider_instance *pi)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&pi->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(pi);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int rtp_provider_instance_gen_frame(struct rtp_provider_instance *pi, uint8_t *out, size_t out_size)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pi->provider);</span><br><span style="color: hsl(120, 100%, 40%);">+ return pi->provider->rtp_gen(pi, out, out_size);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/rtpsource/rtp_provider.h b/rtpsource/rtp_provider.h</span><br><span>new file mode 100644</span><br><span>index 0000000..7048a3e</span><br><span>--- /dev/null</span><br><span>+++ b/rtpsource/rtp_provider.h</span><br><span>@@ -0,0 +1,51 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/linuxlist.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum codec_type {</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_ULAW,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_ALAW,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_GSM_FR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_GSM_EFR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_GSM_HR,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_AMR_4_75,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_AMR_5_15,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_AMR_5_90,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_AMR_6_70,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_AMR_7_40,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_AMR_7_95,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_AMR_10_2,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_AMR_12_2,</span><br><span style="color: hsl(120, 100%, 40%);">+ CODEC_AMR_SID,</span><br><span style="color: hsl(120, 100%, 40%);">+ _NUM_CODECS</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct rtp_provider_instance;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct rtp_provider {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* global list of RTP providers */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head list;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *name;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* generate the next RTP packet; return length in octests or negative on error */</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*rtp_gen)(struct rtp_provider_instance *inst, uint8_t *out, size_t out_size);</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct rtp_provider_instance {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* entry in global list of RTP provider instances */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head list;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* pointer to provider of which we are an instance */</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct rtp_provider *provider;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* codec payload we are to generate */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum codec_type codec;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* private user data */</span><br><span style="color: hsl(120, 100%, 40%);">+ void *priv;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void rtp_provider_register(struct rtp_provider *prov);</span><br><span style="color: hsl(120, 100%, 40%);">+const struct rtp_provider *rtp_provider_find(const char *name);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct rtp_provider_instance *rtp_provider_instance_alloc(void *ctx, const struct rtp_provider *provider, enum codec_type codec);</span><br><span style="color: hsl(120, 100%, 40%);">+void rtp_provider_instance_free(struct rtp_provider_instance *pi);</span><br><span style="color: hsl(120, 100%, 40%);">+int rtp_provider_instance_gen_frame(struct rtp_provider_instance *pi, uint8_t *out, size_t out_size);</span><br><span>diff --git a/rtpsource/rtp_provider_static.c b/rtpsource/rtp_provider_static.c</span><br><span>new file mode 100644</span><br><span>index 0000000..323e686</span><br><span>--- /dev/null</span><br><span>+++ b/rtpsource/rtp_provider_static.c</span><br><span>@@ -0,0 +1,107 @@</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/codec/codec.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "rtp_provider.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "internal.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct rtp_provider static_provider;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static const uint8_t len4codec[_NUM_CODECS] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_ULAW] = 160,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_ALAW] = 160,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_GSM_FR] = GSM_FR_BYTES,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_GSM_EFR] = GSM_EFR_BYTES,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_GSM_HR] = GSM_HR_BYTES,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_AMR_4_75] = 12,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_AMR_5_15] = 13,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_AMR_5_90] = 15,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_AMR_6_70] = 17,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_AMR_7_40] = 19,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_AMR_7_95] = 20,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_AMR_10_2] = 26,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_AMR_12_2] = 31,</span><br><span style="color: hsl(120, 100%, 40%);">+ [CODEC_AMR_SID] = 5,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* generate a static / fixed RTP payload of matching codec/mode */</span><br><span style="color: hsl(120, 100%, 40%);">+static int rtp_gen_static(struct rtp_provider_instance *pi, uint8_t *out, size_t out_size)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(pi->provider == &static_provider);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ len = len4codec[pi->codec];</span><br><span style="color: hsl(120, 100%, 40%);">+ if (out_size < len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "out_size %zu < %u\n", out_size, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(out, 0, len);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (pi->codec) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_ULAW:</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_ALAW:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_GSM_FR:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = (out[0] & 0x0f) | 0xD0; /* mask in first four bit for FR */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_GSM_EFR:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = (out[0] & 0x0f) | 0xC0; /* mask in first four bit for EFR */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_GSM_HR:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_4_75:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = 0 << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ out[1] = 0 << 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_5_15:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = 1 << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ out[1] = 1 << 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_5_90:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = 2 << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ out[1] = 2 << 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_6_70:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = 3 << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ out[1] = 3 << 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_7_40:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = 4 << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ out[1] = 4 << 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_7_95:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = 5 << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ out[1] = 5 << 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_10_2:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = 6 << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ out[1] = 6 << 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_12_2:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = 7 << 4;</span><br><span style="color: hsl(120, 100%, 40%);">+ out[1] = 7 << 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case CODEC_AMR_SID:</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = 2 << 4; /* CMR: 5.90 */</span><br><span style="color: hsl(120, 100%, 40%);">+ out[0] = 8 << 3;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return len;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static struct rtp_provider static_provider = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "static",</span><br><span style="color: hsl(120, 100%, 40%);">+ .rtp_gen = &rtp_gen_static,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void __attribute__((constructor)) rtp_provider_static_constr(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ rtp_provider_register(&static_provider);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/rtpsource/rtpsource.c b/rtpsource/rtpsource.c</span><br><span>index 569d962..3087262 100644</span><br><span>--- a/rtpsource/rtpsource.c</span><br><span>+++ b/rtpsource/rtpsource.c</span><br><span>@@ -48,6 +48,7 @@</span><br><span> #include <osmocom/trau/osmo_ortp.h></span><br><span> </span><br><span> #include "internal.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "rtp_provider.h"</span><br><span> </span><br><span> </span><br><span> /* find a connection based on its CNAME */</span><br><span>@@ -64,13 +65,18 @@</span><br><span> /* create a new RTP connection for given CNAME; includes binding of local RTP port */</span><br><span> struct rtp_connection *create_connection(struct rtpsource_state *rss, const char *cname)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct rtp_provider *rtp_prov;</span><br><span> struct rtp_connection *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum codec_type codec = CODEC_GSM_FR; // TODO: configurable</span><br><span> const char *host;</span><br><span> int port;</span><br><span> int rc;</span><br><span> </span><br><span> OSMO_ASSERT(!find_connection_by_cname(rss, cname));</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ rtp_prov = rtp_provider_find("static"); // TODO: configurable</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rtp_prov);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> conn = talloc_zero(rss, struct rtp_connection);</span><br><span> OSMO_ASSERT(conn);</span><br><span> conn->cname = talloc_strdup(conn, cname);</span><br><span>@@ -90,6 +96,9 @@</span><br><span> osmo_rtp_set_source_desc(conn->rtp_sock, conn->cname, "rtpsource", NULL, NULL,</span><br><span> NULL, "osmo-rtpsource", NULL);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ conn->rtp_prov_inst = rtp_provider_instance_alloc(conn, rtp_prov, codec);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(conn->rtp_prov_inst);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_add_tail(&conn->list, &rss->connections);</span><br><span> </span><br><span> CLOGP(conn, DMAIN, LOGL_INFO, "Created RTP connection; local=%s:%u\n",</span><br><span>@@ -156,12 +165,11 @@</span><br><span> </span><br><span> /* iterate over all RTP connections and send one frame each */</span><br><span> llist_for_each_entry(conn, &rss->connections, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: have different sources (file+name, ...) */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t payload[33];</span><br><span style="color: hsl(0, 100%, 40%);">- memset(payload, 0, sizeof(payload));</span><br><span style="color: hsl(0, 100%, 40%);">- payload[0] = (payload[0] & 0x0f) | 0xD0; /* mask in first four bit for FR */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_rtp_send_frame_ext(conn->rtp_sock, payload, sizeof(payload), 160, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t payload[256];</span><br><span style="color: hsl(120, 100%, 40%);">+ int i, len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ len = rtp_provider_instance_gen_frame(conn->rtp_prov_inst, payload, sizeof(payload));</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_rtp_send_frame_ext(conn->rtp_sock, payload, len, 160, false);</span><br><span> /* make sure RTP clock advances correctly, even if we missed transmit of some */</span><br><span> for (i = 1; i < expire_count; i++)</span><br><span> osmo_rtp_skipped_frame(conn->rtp_sock, 160);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/mncc-python/+/17978">change 17978</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/mncc-python/+/17978"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: mncc-python </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iad98e1753fef1927c0e8a7493372141372a38224 </div>
<div style="display:none"> Gerrit-Change-Number: 17978 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>