Skip to content
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

fix: Destroy correctly unused transmuxer #7059

Merged
merged 1 commit into from
Jul 18, 2024
Merged

fix: Destroy correctly unused transmuxer #7059

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
16 changes: 16 additions & 0 deletions lib/media/media_source_engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2052,6 +2052,22 @@ shaka.media.MediaSourceEngine = class {

// Current/new codecs base and basic type match then no need to switch
if (currentCodec === newCodec && currentBasicType === newBasicType) {
if (this.transmuxers_[contentType] && !transmuxer) {
this.transmuxers_[contentType].destroy();
delete this.transmuxers_[contentType];
} else if (!this.transmuxers_[contentType] && transmuxer) {
this.transmuxers_[contentType] = transmuxer;
} else if (transmuxer) {
// Compare if the transmuxer is different
if (this.transmuxers_[contentType] &&
Copy link
Contributor

Choose a reason for hiding this comment

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

Whenever codecSwitchIfNecessary_ detects that a transmuxer is needed, it creates a new instance of the desired transmuxer. It never recycles the old transmuxer. So doesn't that mean that this is always going to delete the old transmuxer?

I was going to say that we should be comparing the respective shaka.extern.TransmuxerPlugin to see if the two transmuxers are of the same type, instead of seeing if they are the same object. However, looking at the transmuxers we have now, none of them look to be stateless. Most of them have internal variables like frameIndex_ which maybe we do want to reset by remaking the transmuxer.

If that is the case, and we never want to keep the old transmuxer, this whole segment could be greatly simplified.

if (this.transmuxers_[contentType]) {
  this.transmuxers_[contentType].destroy();
  delete this.transmuxers_[contentType];
}
if (transmuxer) {
  this.transmuxers_[contentType] = transmuxer;
}

Copy link
Member Author

Choose a reason for hiding this comment

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

yes we want to keep the transmuxer, because then we don't have to generate the initialization segment again

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, also I see now that this isn't comparing the transmuxers themselves, it's comparing their transmux methods. I guess that works as a way to ensure they came from the same plugin.

this.transmuxers_[contentType].transmux != transmuxer.transmux) {
this.transmuxers_[contentType].destroy();
delete this.transmuxers_[contentType];
this.transmuxers_[contentType] = transmuxer;
} else {
transmuxer.destroy();
}
}
return false;
}

Expand Down
Loading