Skip to content

fix: negotiate Opus NACK in single and dual PC modes - #1072

Merged
xianshijing-lk merged 2 commits into
mainfrom
sxian/fix-single-pc-opus-nack
Nov 18, 2026
Merged

xianshijing-lk merged 2 commits into
mainfrom
sxian/fix-single-pc-opus-nack

Conversation

@xianshijing-lk

@xianshijing-lk xianshijing-lk commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Single-PC offers omit plain NACK feedback for Opus, including when the first audio section is send-only. Dual-PC subscriber answers also need to restore NACK when the server offers it. This negotiates plain NACK on every Opus payload in single-PC audio offers and accepts server-offered NACK in the corresponding dual-PC answer sections. With RED disabled, this enables retransmission of lost audio.

Ports the single-PC behavior from livekit/client-sdk-js#2270 and aligns dual-PC answers with the existing JS and Swift behavior. Publisher offers remain unchanged in dual-PC mode, including after fallback from single-PC mode. Subscriber answers match offered sections by MID and resolve their own Opus payload types. Both paths preserve wildcard feedback, distinguish plain NACK from NACK PLI, and avoid duplicate feedback.

If a modified answer is rejected, the original answer is applied instead; only the successfully applied answer is returned for signaling. If both attempts fail, the error is propagated. Includes a changeset.

Android currently sends its first client offer after JOIN rather than bundling it with JOIN. The shared offer-generation step covers the first offer and renegotiations.

Validation:

  • 94 targeted JVM tests passed across the Opus NACK tests and single/dual PC transport tests.
  • Answer tests cover selective NACK acceptance, absence of offered NACK, NACK PLI, wildcard feedback, reordered MIDs, different payload types, rejection fallback, and failure of both answers.
  • Spotless checks passed for changed Kotlin files using a temporary init script for linked-worktree Git discovery; no build configuration changes are included.
  • detektDebug still reports existing repository findings; this change adds no new findings.
  • git diff --check passed. Android device/server and controlled packet-loss tests were not run.

@changeset-bot

changeset-bot Bot commented Nov 18, 2026 •

Copy link
Copy Markdown

🦋 Changeset detected

Latest commit: 754cfc4

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
client-sdk-android Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@devin-ai-integration devin-ai-integration Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no bugs or issues to report.

Devin Review

@github-actions

github-actions Bot commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Diffuse output:

OLD: diffuse-source-file
NEW: livekit-android-sdk-release.aar

 AAR      │ old      │ new      │ diff      
──────────┼──────────┼──────────┼───────────
      jar │  3.1 MiB │  3.1 MiB │ +10.1 KiB 
 manifest │  1.5 KiB │  1.5 KiB │       0 B 
 lint-jar │ 12.7 KiB │ 12.7 KiB │       0 B 
    other │  2.4 KiB │  2.4 KiB │       0 B 
──────────┼──────────┼──────────┼───────────
    total │  3.1 MiB │  3.1 MiB │ +10.1 KiB 

 JAR     │ old   │ new   │ diff          
─────────┼───────┼───────┼───────────────
 classes │  1794 │  1798 │  +4 (+5 -1)   
 methods │ 22661 │ 22679 │ +18 (+28 -10) 
  fields │  5984 │  5996 │ +12 (+15 -3)
AAR
 size    │ diff      │ path          
─────────┼───────────┼───────────────
 3.1 MiB │ +10.1 KiB │ ∆ classes.jar 
─────────┼───────────┼───────────────
 3.1 MiB │ +10.1 KiB │ (total)
JAR
CLASSES:

   old  │ new  │ diff       
  ──────┼──────┼────────────
   1794 │ 1798 │ +4 (+5 -1) 
  
  + io.livekit.android.room.OpusNackKt
  + io.livekit.android.room.PeerConnectionTransport_Factory_DefaultImpls
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_1
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_1
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_2
  
  - io.livekit.android.room.DualPeerConnectionTransport_answerServerOffer_outcome_1
  

METHODS:

   old   │ new   │ diff          
  ───────┼───────┼───────────────
   22661 │ 22679 │ +18 (+28 -10) 
  
  + io.livekit.android.room.OpusNackKt <clinit>()
  + io.livekit.android.room.OpusNackKt ensureOpusNack(MediaDescription)
  + io.livekit.android.room.OpusNackKt mungeOpusNackForAnswer(String, String, SdpFactory) → String
  + io.livekit.android.room.OpusNackKt nackPayloads(MediaDescription) → Set
  + io.livekit.android.room.OpusNackKt opusPayloads(MediaDescription) → Set
  + io.livekit.android.room.PeerConnectionTransport <init>(PeerConnection_RTCConfiguration, PeerConnection_Observer, PeerConnectionTransport_Listener, CoroutineDispatcher, PeerConnectionFactory, SdpFactory, RTCThreadToken, boolean)
  + io.livekit.android.room.PeerConnectionTransport <init>(PeerConnection_RTCConfiguration, PeerConnection_Observer, PeerConnectionTransport_Listener, CoroutineDispatcher, PeerConnectionFactory, SdpFactory, RTCThreadToken, boolean, int, DefaultConstructorMarker)
  + io.livekit.android.room.PeerConnectionTransport access_getSinglePeerConnection_p(PeerConnectionTransport) → boolean
  + io.livekit.android.room.PeerConnectionTransport setAnswerWithOpusNack(SessionDescription, SessionDescription, Continuation) → Object
  + io.livekit.android.room.PeerConnectionTransport_Factory create(PeerConnection_RTCConfiguration, PeerConnection_Observer, PeerConnectionTransport_Listener, boolean) → PeerConnectionTransport
  + io.livekit.android.room.PeerConnectionTransport_Factory_DefaultImpls create_default(PeerConnectionTransport_Factory, PeerConnection_RTCConfiguration, PeerConnection_Observer, PeerConnectionTransport_Listener, boolean, int, Object) → PeerConnectionTransport
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_1 <init>(PeerConnectionTransport, Continuation)
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_1 invokeSuspend(Object) → Object
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_1 <init>(SessionDescription, Continuation)
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_1 create(Object, Continuation) → Continuation
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_1 invoke(Object, Object) → Object
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_1 invoke(PeerConnection, Continuation) → Object
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_1 invokeSuspend(Object) → Object
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_2 <init>(SessionDescription, Continuation)
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_2 create(Object, Continuation) → Continuation
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_2 invoke(Object, Object) → Object
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_2 invoke(PeerConnection, Continuation) → Object
  + io.livekit.android.room.PeerConnectionTransport_setAnswerWithOpusNack_result_2 invokeSuspend(Object) → Object
  + io.livekit.android.room.PeerConnectionTransport_Factory get(PeerConnection_RTCConfiguration, PeerConnection_Observer, PeerConnectionTransport_Listener, boolean) → PeerConnectionTransport
  + io.livekit.android.room.PeerConnectionTransport_Factory newInstance(PeerConnection_RTCConfiguration, PeerConnection_Observer, PeerConnectionTransport_Listener, CoroutineDispatcher, PeerConnectionFactory, SdpFactory, RTCThreadToken, boolean) → PeerConnectionTransport
  + io.livekit.android.room.PeerConnectionTransport_Factory_Impl create(PeerConnection_RTCConfiguration, PeerConnection_Observer, PeerConnectionTransport_Listener, boolean) → PeerConnectionTransport
  + kotlin.collections.CollectionsKt toSet(Iterable) → Set
  + kotlin.text.Regex split(CharSequence, int) → List
  
  - io.livekit.android.room.DualPeer
...✂

@xianshijing-lk xianshijing-lk changed the title fix: negotiate Opus NACK in single-PC audio offers fix: negotiate Opus NACK in single and dual PC modes Nov 18, 2026
@xianshijing-lk
xianshijing-lk merged commit 890b798 into main Nov 18, 2026
6 checks passed
@xianshijing-lk
xianshijing-lk deleted the sxian/fix-single-pc-opus-nack branch November 18, 2026 22:44
@davidliu davidliu mentioned this pull request Nov 18, 2026
changt added a commit that referenced this pull request Nov 19, 2026
PeerConnectionTransport conflicted with the Opus NACK change (#1072),
which edited the offer munge inline in createAndSendOffer and added
setAnswerWithOpusNack next to it. On this branch the munge lives in
createMungedOffer, so the Opus NACK step for audio sections moves
there, and both functions are kept.

The single peer connection publisher is created in joinImpl on this
branch, ahead of the join, so that call now passes
singlePeerConnection = true. Without it the publisher's offers would
not carry Opus NACK. audioOffersAdvertiseOpusNack covers this through
the engine.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants