jeka/utun2
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wake video transmission on router queue readiness without polling delay

Browse Source
This commit is contained in:
evgeny committed 2026-10-19 17:38:31 +02:00
1 parent 5f1985f9ab
commit 4ed2c4bbab
2 files changed
+32 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/call/call_video_transport.c
+14 -2
View File
@@ -23,6 +23,7 @@ struct call_video_transport {
struct call_video_caps local, peer;
struct call_video_ops ops;
void *arg, *timer, *flush_pending;
struct queue_waiter_handle send_waiter; // Одноразовое событие освобождения router send_q.
struct call_video_receiver *receiver;
struct video_tx_frame tx[VIDEO_TX_FRAMES];
unsigned tx_count, tx_bytes;
@@ -96,6 +97,8 @@ static void pop_tx(struct call_video_transport *v) {
}
/* call_soon остаётся в очереди с NULL callback до прохода uasync; v можно освободить сразу. */
static void cancel_flush(struct call_video_transport *v) {
struct call_session *s = v->session;
etcp_router_cancel_send_ready(s->ctx->inst, s->group_id, s->peer_node_id, ETCP_RT_ID_CALL_VIDEO, &v->send_waiter);
if (v->flush_pending && uasync_call_soon_cancel(v->session->ctx->inst->ua, v->flush_pending) != ERR_OK)
DEBUG_ERROR(DEBUG_CATEGORY_CALL, "video flush cancel failed call=%llu", (unsigned long long)v->session->call_id);
v->flush_pending = NULL; v->flush_scheduled_us = 0;
@@ -201,6 +204,10 @@ static void update_rate(struct call_video_transport *v) {
}
}
static void flush(struct call_video_transport *v);
static void send_ready(struct ll_queue *queue, void *arg) {
(void)queue;
struct call_video_transport *v = arg; flush(v); writable(v);
}
/* Снимаем handle до callback: повторный бюджет будет поставлен в следующий batch uasync. */
static void continue_flush(void *arg) {
struct call_video_transport *v = arg;
@@ -234,7 +241,12 @@ static void flush(struct call_video_transport *v) {
&& media_bytes(net.queued_bytes + net.inflight_bytes, (uint64_t)net.queued_packets + net.inflight_packets)
>= debt_limit(v, net.baseline_rtt_us)) { v->flush_net_wait++; return; }
if (!etcp_router_send_q_has_room(s->ctx->inst, s->group_id, s->peer_node_id, ETCP_RT_ID_CALL_VIDEO)
|| queue_entry_count(conn->send_q) >= ROUTER_MAX_SEND_Q_PACKETS) { v->flush_net_wait++; return; }
|| queue_entry_count(conn->send_q) >= ROUTER_MAX_SEND_Q_PACKETS) {
v->flush_net_wait++;
etcp_router_on_send_ready(s->ctx->inst, s->group_id, s->peer_node_id, ETCP_RT_ID_CALL_VIDEO,
&v->send_waiter, send_ready, v);
return;
}
uint32_t remaining = f->size - f->offset;
f->length = remaining < CALL_VIDEO_FRAGMENT_BYTES ? remaining : CALL_VIDEO_FRAGMENT_BYTES;
f->data = head->data + f->offset;
@@ -502,7 +514,7 @@ static void receive(struct ETCP_CONN *conn, struct ll_entry *entry) {
} else if (data[0] == VIDEO_CAPS_ACK && length == 17 && revision && revision <= v->local_revision) {
if (revision < v->local_revision) goto done;
v->acknowledged_revision = revision;
writable(v);
flush(v); writable(v);
DEBUG_DEBUG(DEBUG_CATEGORY_CALL, "video capabilities acknowledged call=%llu revision=%llu",
(unsigned long long)id, (unsigned long long)revision);
} else if (data[0] == VIDEO_KEY_REQUEST && length == 17 && !revision) {