feat: E-RTMP v2 connect negotiation and multitrack relay (0.4.0) by AlexanderWagnerDev · Pull Request #128 · OpenRTMP/librtmp2

AlexanderWagnerDev · 2026-07-14T20:26:06Z

Summary

Release 0.4.0 with E-RTMP v2 connect negotiation (\ourCcList, numeric \capsEx\ bitmask, \�ideoFourCcInfoMap,
econnect, _error) wired into the live session path.
Add multitrack media support: opaque relay of full multitrack A/V messages, per-track \on_frame_cb\ with \Frame.track_id, and init-cache replay for late-joining players.
Enhanced init-frame classification (HEVC/AV1/Opus/AAC), \onMetaData\ caching/replay, client Aggregate + onMetaData receive, and legacy commands (\pause, \seek,
eceiveAudio,
eceiveVideo, \closeStream).

Test plan

\cargo test\ in \librtmp2/\
Publish multitrack E-RTMP v2 stream and verify late-joining player receives cached sequence-start headers
Verify connect _result\ includes negotiated \capsEx\ with multitrack bit
Smoke-test legacy H.264/AAC publisher + player still works

Made with Cursor

^{Need help on this PR? Tag /codesmith with what you need. Autofix is disabled.}

Replace marketing-style feature claims with what is actually wired into the live session path versus parser-only library code.

Wire enhanced connect caps, multitrack media parsing and opaque relay, per-track callbacks, init-cache for HEVC/AV1/Opus, onMetaData replay, legacy commands, and client Aggregate/onMetaData receive into the live session path. Co-authored-by: Cursor <cursoragent@cursor.com>

Import Reconnect from types, add track_id to all explicit Frame initializers, and simplify multitrack callback dispatch. Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

Only strip negotiated ModEx prefixes when bytes are not enhanced A/V tags; copy multitrack track payloads into frame_cb_scratch before callbacks; relay opaque original payloads. Co-authored-by: Cursor <cursoragent@cursor.com>

Respond with simple S1/S2 to complex C1 instead of rejecting ffmpeg; fix multitrack init-cache test payload; keep frame payload alive in e2e_multiple_frames. Co-authored-by: Cursor <cursoragent@cursor.com>

AlexanderWagnerDev · 2026-07-14T20:39:58Z

@codex review

AlexanderWagnerDev · 2026-07-14T20:41:41Z

@cursor review

When a client sends capsEx=0, negotiate_caps now keeps the zero mask instead of substituting server defaults. Play-side frame callbacks mirror Conn by splitting multitrack A/V via foreach_track and scratch buffer. Co-authored-by: Cursor <cursoragent@cursor.com>

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d0649380ba

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Object and long-string capsEx forms now seed the v2 default bitmask while numeric capsEx=0 still disables extended bits. Also stop re-reading the AMF object marker after read_type. Co-authored-by: Cursor <cursoragent@cursor.com>

Multitrack nibble order, outer keyframe detection, legacy capsEx/videoFourCcInfoMap parsing, closeStream 3-arg form, ModEx strip on legacy AAC, client aggregate subtag cap, init-cache limits/receiveVideo replay, and per-track sequence header retention. Co-authored-by: Cursor <cursoragent@cursor.com>

Co-authored-by: Cursor <cursoragent@cursor.com>

AlexanderWagnerDev · 2026-07-14T21:13:59Z

@codex review

AlexanderWagnerDev · 2026-07-14T21:14:14Z

@cursor review

AlexanderWagnerDev · 2026-07-14T21:14:37Z

@coderabbitai full review

Relay onMetaData with the RTMP message timestamp (including aggregate sub-tags). Do not default to paused when pause AMF parsing fails. Co-authored-by: Cursor <cursoragent@cursor.com>

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 617d3d2531

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

cursor · 2026-07-15T13:39:24Z

Bugbot couldn't run - usage limit reached

Bugbot is counted against Cursor usage for this user or team, and this run hit a usage or spend limit.

A user or team admin can review and increase usage limits in the Cursor dashboard.

(requestId: serverGenReqId_65ff277f-a829-45e3-8679-e4ddcb277214)

qodo-code-review · 2026-07-15T13:47:04Z

Code review by qodo was updated up to the latest commit 96bbda5

qodo-code-review · 2026-07-15T14:16:50Z

        for frame in &relay_frames {
+            let player_count = self.count_relay_players(frame);
+            if player_count > 0
+                && relay_sends.saturating_add(player_count) > MAX_RELAY_SENDS_PER_POLL
+            {
+                break;
+            }
+


2. Relay budget throttles fanout 🔗 Cross-repo conflict ☼ Reliability

This PR adds a hard-coded per-poll() relay-send budget (MAX_RELAY_SENDS_PER_POLL = 4096) that can defer relaying queued publisher frames to later ticks; librtmp2-server runs server.poll() on a fixed 50ms interval, so high fan-out streams can see increased relay latency and potentially more backpressure when librtmp2-server upgrades to v0.4.0. Because librtmp2-server also configures bounded relay-queue memory, this change can shift when/if publishers hit relay backpressure compared to prior versions.

Agent Prompt

### Issue description `librtmp2::server::Server::poll()` now enforces a hard-coded relay send budget (`MAX_RELAY_SENDS_PER_POLL`) and stops relaying when the budget would be exceeded, re-queuing the remainder. Downstream `librtmp2-server` polls every 50ms and also configures bounded relay queue memory, so this budget can increase relay latency/backpressure under high fan-out after upgrading to `librtmp2` v0.4.0. ### Issue Context - The budget is currently not configurable from the public API. - `librtmp2-server` drives `Server::poll(0)` in a fixed-interval loop and sets `server.resource_limits` based on its own config defaults. ### Fix Focus Areas - src/server/mod.rs[65-70] - src/server/mod.rs[687-696] ### Suggested approach - Expose the relay-send budget as a public knob (e.g., add `max_relay_sends_per_poll` to `ResourceLimits` or `ServerConfig`, with a sensible default equal to the current constant). - Use that configured value instead of the hard-coded constant. - Document the new behavior/knob in the changelog or README so downstream integrators (notably `librtmp2-server`) can tune it relative to their poll cadence and max-connection targets. - (Optional) Add a regression test ensuring the default remains bounded but configurable.

ⓘ Copy this prompt and use it to remediate the issue with your preferred AI generation tools

qodo-code-review · 2026-07-15T14:16:53Z

Code review by qodo was updated up to the latest commit 2806866

qodo-code-review · 2026-07-15T14:29:09Z

Code review by qodo was updated up to the latest commit 2c17e5b

qodo-code-review · 2026-07-15T14:32:01Z

Code review by qodo was updated up to the latest commit 4390983

qodo-code-review · 2026-07-15T14:42:39Z

Code review by qodo was updated up to the latest commit d0a1ec0

AlexanderWagnerDev and others added 2 commits July 14, 2026 22:06

docs: align README with code-accurate implementation status

bd0b4d3

Replace marketing-style feature claims with what is actually wired into the live session path versus parser-only library code.

cursor Bot reviewed Jul 14, 2026

View reviewed changes

Comment thread src/session/conn.rs Outdated

Comment thread src/session/conn.rs

AlexanderWagnerDev and others added 3 commits July 14, 2026 22:28

fix: resolve compile errors for 0.4.0 CI

551909a

Import Reconnect from types, add track_id to all explicit Frame initializers, and simplify multitrack callback dispatch. Co-authored-by: Cursor <cursoragent@cursor.com>

fix(tests): update Stream and multitrack test for CI

6991837

Co-authored-by: Cursor <cursoragent@cursor.com>

AlexanderWagnerDev self-assigned this Jul 14, 2026

fix(ci): handshake, multitrack cache test, and e2e frame lifetime

d064938

Respond with simple S1/S2 to complex C1 instead of rejecting ffmpeg; fix multitrack init-cache test payload; keep frame payload alive in e2e_multiple_frames. Co-authored-by: Cursor <cursoragent@cursor.com>

cursor Bot reviewed Jul 14, 2026

View reviewed changes

Comment thread src/ertmp/connect_amf.rs Outdated

Comment thread src/client/mod.rs Outdated

AlexanderWagnerDev mentioned this pull request Jul 14, 2026

chore: bump librtmp2 to 0.4.0 (0.1.5) OpenRTMP/librtmp2-server#82

Open

8 tasks

chatgpt-codex-connector Bot reviewed Jul 14, 2026

View reviewed changes

cursor Bot reviewed Jul 14, 2026

View reviewed changes

Comment thread src/ertmp/connect_amf.rs

AlexanderWagnerDev and others added 4 commits July 14, 2026 22:58

fix: preserve legacy capsEx object negotiation

110a6f6

Object and long-string capsEx forms now seed the v2 default bitmask while numeric capsEx=0 still disables extended bits. Also stop re-reading the AMF object marker after read_type. Co-authored-by: Cursor <cursoragent@cursor.com>

fix(ci): qualify Amf0Type in read_close_stream

d9d5a81

Co-authored-by: Cursor <cursoragent@cursor.com>

fix(tests): expect combined multitrack init in avc_header slot

617d3d2

Co-authored-by: Cursor <cursoragent@cursor.com>

cursor Bot reviewed Jul 14, 2026

View reviewed changes

Comment thread src/session/conn.rs

Comment thread src/session/conn.rs Outdated

fix: preserve metadata timestamps and ignore malformed pause

77571e7

Relay onMetaData with the RTMP message timestamp (including aggregate sub-tags). Do not default to paused when pause AMF parsing fails. Co-authored-by: Cursor <cursoragent@cursor.com>

chatgpt-codex-connector Bot reviewed Jul 14, 2026

View reviewed changes

AlexanderWagnerDev added 5 commits July 15, 2026 00:17

chore: stage automated PR 128 fixes

a9972ee

ci: apply and validate PR 128 fixes

77d79f5

ci: trigger PR 128 fix validation on synchronize

17ffe99

ci: supersede stale PR 128 fix runs

f882604

ci: make PR 128 fix runner self-reporting

2ff20a5

chore: stage PR #130 conflict resolution

96bbda5

fix(security): cap built-in relay fan-out per poll tick

4965475

AlexanderWagnerDev mentioned this pull request Jul 15, 2026

fix(security): cap built-in relay fan-out per poll tick #130

Closed

qodo-code-review Bot reviewed Jul 15, 2026

View reviewed changes

Comment thread src/session/conn.rs Outdated

Comment thread src/session/conn.rs Outdated

AlexanderWagnerDev and others added 8 commits July 15, 2026 15:53

ci: apply PR 128 review fixes

aa64aa3

ci: run PR 128 fixes as pull request check

1b81ca0

ci: apply PR 128 findings before validation

1fa7e0a

ci: add PR 128 review patch script

966bdf1

ci: run valid PR 128 review fixer

f31daf0

fix: harden multitrack callback handling

fe82870

ci: trigger validation for PR 128 fixes

89d7038

ci: remove PR 128 validation trigger

2806866

qodo-code-review Bot reviewed Jul 15, 2026

View reviewed changes

AlexanderWagnerDev added 2 commits July 15, 2026 16:22

ci: prepare PR 128 relay budget fixes

6f083b4

ci: run PR 128 relay budget fixes

2c17e5b

qodo-code-review Bot reviewed Jul 15, 2026

View reviewed changes

Comment thread .github/workflows/pr128-relay-budget-fixes.yml Outdated

Comment thread .github/workflows/pr128-relay-budget-fixes.yml Outdated

ci: make PR 128 relay budget run diagnosable

4390983

qodo-code-review Bot reviewed Jul 15, 2026

View reviewed changes

Comment thread .github/workflows/pr128-relay-budget-fixes.yml Outdated

AlexanderWagnerDev and others added 4 commits July 15, 2026 16:35

ci: apply PR 128 relay budget fix directly

9e99387

fix(server): make relay budget configurable and starvation-free

fb2132d

ci: trigger validation for PR 128 relay budget fixes

090f69c

ci: remove PR 128 validation trigger

d0a1ec0

AlexanderWagnerDev merged commit 99a2347 into main Jul 15, 2026
31 checks passed

AlexanderWagnerDev deleted the feat/ertmp-v2-multitrack-0.4.0 branch July 15, 2026 14:56

Uh oh!

Conversation

AlexanderWagnerDev commented Jul 14, 2026 • edited by blacksmith-sh Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Uh oh!

Uh oh!

Uh oh!

AlexanderWagnerDev commented Jul 14, 2026

Uh oh!

AlexanderWagnerDev commented Jul 14, 2026

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AlexanderWagnerDev commented Jul 14, 2026

Uh oh!

AlexanderWagnerDev commented Jul 14, 2026

Uh oh!

AlexanderWagnerDev commented Jul 14, 2026

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor Bot commented Jul 15, 2026

Bugbot couldn't run - usage limit reached

Uh oh!

Uh oh!

Uh oh!

qodo-code-review Bot commented Jul 15, 2026

Uh oh!

Uh oh!

qodo-code-review Bot Jul 15, 2026

Choose a reason for hiding this comment

Uh oh!

qodo-code-review Bot commented Jul 15, 2026

Uh oh!

Uh oh!

Uh oh!

qodo-code-review Bot commented Jul 15, 2026

Uh oh!

Uh oh!

qodo-code-review Bot commented Jul 15, 2026

Uh oh!

qodo-code-review Bot commented Jul 15, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

AlexanderWagnerDev commented Jul 14, 2026 •

edited by blacksmith-sh Bot

Loading