Skip to content

webrtc-sys: detach the frame transformer when a FrameCryptor is destroyed #1408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ctarabocchia wants to merge 1 commit into
base: main
Choose a base branch
from
Open

webrtc-sys: detach the frame transformer when a FrameCryptor is destroyed #1408

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions webrtc-sys/src/frame_cryptor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,17 @@ FrameCryptor::~FrameCryptor() {
if (observer_) {
unregister_observer();
}
// Detach the transformer from the sender/receiver it was attached to in
// the constructor. Without this the RtpSender/RtpReceiver keeps the
// FrameCryptorTransformer (and the thread it owns) alive for as long as
// it exists, which outlives this object -- one leaked
// FrameCryptorTransformer thread per cryptor per room.
if (sender_) {
sender_->SetEncoderToPacketizerFrameTransformer(nullptr);
}
if (receiver_) {
receiver_->SetDepacketizerToDecoderFrameTransformer(nullptr);
Comment on lines +177 to +181

@devin-ai-integration devin-ai-integration Bot Sep 7, 2026

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.

🟡 Cryptor destruction removes other transforms

Dropping a cryptor after set_packet_trailer_handler also detaches the retained packet-trailer handler. A stale cryptor can likewise detach a replacement cryptor.

Prompt for agents 
FrameCryptor::~FrameCryptor unconditionally sets the sender or receiver transformer to null. FrameCryptor::set_packet_trailer_handler replaces that slot with chained_transformer_, which contains both the cryptor and a PacketTrailerTransformer. Clearing the slot therefore disables packet-trailer processing even when the independently retained PacketTrailerHandler remains alive. The same ownership problem lets an older FrameCryptor clear a newer transformer installed on the same sender or receiver when its final SharedPtr is dropped later. Redesign teardown so a cryptor removes only the transformer installation it owns and preserves or restores other processing. Account for replacement cryptors and chained packet-trailer handlers rather than blindly clearing the shared endpoint slot.
Devin Review

Was this helpful? React with 👍 or 👎 to provide feedback.

}
}

void FrameCryptor::register_observer(
Expand Down