<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/gapk/+/19493">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gapk: add optional throttling<br><br>When throttling is enabled, one voice frame will be processed every<br>20ms. This is useful for e.g. playback of a file as a RTP stream.<br><br>Without this option, the entire file would generate a flood of RTP<br>messages, rather than a continuous stream.<br><br>Change-Id: I0dcd4248cc800b82142722aa36a811f0657b3e0c<br>---<br>M src/app_osmo_gapk.c<br>1 file changed, 60 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/gapk refs/changes/93/19493/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/app_osmo_gapk.c b/src/app_osmo_gapk.c</span><br><span>index 91647ee..5432de0 100644</span><br><span>--- a/src/app_osmo_gapk.c</span><br><span>+++ b/src/app_osmo_gapk.c</span><br><span>@@ -36,6 +36,7 @@</span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/core/socket.h></span><br><span> #include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/select.h></span><br><span> </span><br><span> #include <osmocom/gapk/common.h></span><br><span> #include <osmocom/gapk/codecs.h></span><br><span>@@ -67,6 +68,7 @@</span><br><span> /* RTP payload type */</span><br><span> uint8_t rtp_pt_in, rtp_pt_out;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ int throttle;</span><br><span> int benchmark;</span><br><span> int verbose;</span><br><span> };</span><br><span>@@ -75,6 +77,8 @@</span><br><span> {</span><br><span> struct gapk_options opts;</span><br><span> struct osmo_gapk_pq *pq;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_fd timerfd; /* for optional throttling */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int num_frames;</span><br><span> int exit;</span><br><span> </span><br><span> struct {</span><br><span>@@ -211,10 +215,11 @@</span><br><span> {"rtp-pt-in", 1, 0, 'p'},</span><br><span> {"rtp-pt-out", 1, 0, 'P'},</span><br><span> {"enable-benchmark", 0, 0, 'b'},</span><br><span style="color: hsl(120, 100%, 40%);">+ {"throttle", 0, 0, 't'},</span><br><span> {"verbose", 0, 0, 'v'},</span><br><span> {"help", 0, 0, 'h'},</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- const char *short_options = "i:o:I:O:f:g:p:P:bvh"</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *short_options = "i:o:I:O:f:g:p:P:btvh"</span><br><span> #ifdef HAVE_ALSA</span><br><span> "a:A:"</span><br><span> #endif</span><br><span>@@ -312,6 +317,10 @@</span><br><span> opt->benchmark = 1;</span><br><span> break;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ case 't':</span><br><span style="color: hsl(120, 100%, 40%);">+ opt->throttle = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> case 'v':</span><br><span> log_parse_category_mask(osmo_stderr_target, "DAPP");</span><br><span> opt->verbose = 1;</span><br><span>@@ -668,22 +677,65 @@</span><br><span> }</span><br><span> </span><br><span> static int</span><br><span style="color: hsl(120, 100%, 40%);">+timerfd_cb(struct osmo_fd *ofd, unsigned int what)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gapk_state *gs = ofd->data;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint64_t expire_count;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = read(ofd->fd, (void *)&expire_count, sizeof(expire_count));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0 && errno == EAGAIN)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rc == sizeof(expire_count));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (expire_count--) {</span><br><span style="color: hsl(120, 100%, 40%);">+ gs->num_frames++;</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_gapk_pq_execute(gs->pq);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ gs->exit = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 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%);">+static int</span><br><span> run(struct gapk_state *gs)</span><br><span> {</span><br><span> struct osmo_gapk_pq_item *item;</span><br><span style="color: hsl(0, 100%, 40%);">- int rv, frames;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rv;</span><br><span> </span><br><span> rv = osmo_gapk_pq_prepare(gs->pq);</span><br><span> if (rv)</span><br><span> return rv;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- for (frames = 0; !gs->exit; frames++) {</span><br><span style="color: hsl(0, 100%, 40%);">- rv = osmo_gapk_pq_execute(gs->pq);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv)</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gs->opts.throttle) {</span><br><span style="color: hsl(120, 100%, 40%);">+ for (gs->num_frames = 0; !gs->exit; gs->num_frames++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = osmo_gapk_pq_execute(gs->pq);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* setup timerfd based processing */</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct timespec interval = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .tv_sec = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ .tv_nsec = 20*1000*1000,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ gs->timerfd.fd = -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = osmo_timerfd_setup(&gs->timerfd, timerfd_cb, gs);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rv == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = osmo_timerfd_schedule(&gs->timerfd, NULL, &interval);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(rv == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* actual processing loop */</span><br><span style="color: hsl(120, 100%, 40%);">+ while (!gs->exit)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_select_main(0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* cleanup */</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timerfd_disable(&gs->timerfd);</span><br><span style="color: hsl(120, 100%, 40%);">+ close(gs->timerfd.fd);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fd_unregister(&gs->timerfd);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DAPP, LOGL_NOTICE, "Processed %d frames\n", frames);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DAPP, LOGL_NOTICE, "Processed %d frames\n", gs->num_frames);</span><br><span> </span><br><span> /* Wait for sink to process buffers */</span><br><span> item = llist_last_entry(&gs->pq->items, struct osmo_gapk_pq_item, list);</span><br><span>@@ -693,7 +745,7 @@</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return frames > 0 ? 0 : rv;</span><br><span style="color: hsl(120, 100%, 40%);">+ return gs->num_frames > 0 ? 0 : rv;</span><br><span> }</span><br><span> </span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/gapk/+/19493">change 19493</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/gapk/+/19493"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: gapk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I0dcd4248cc800b82142722aa36a811f0657b3e0c </div>
<div style="display:none"> Gerrit-Change-Number: 19493 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>