Skip to content

fix: Subtitle/audio mismatch under certain conditions and with multiple default tracks #1044

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

Merged
PartyDonut merged 2 commits into from
Aug 9, 2026
+16 −4
Merged

fix: Subtitle/audio mismatch under certain conditions and with multiple default tracks #1044

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd5466f
fix: apply audio/subtitle selection after mpv parses tracks
aviadlevy Jul 3, 2026
10090bc
fix: avoid null assertion in the mpv track-wait timeout
aviadlevy Aug 9, 2026
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
20 changes: 16 additions & 4 deletions lib/wrappers/players/lib_mpv.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,16 +426,27 @@ class LibMPV extends BasePlayer {
@override
Future<void> seek(Duration position) async => _player?.seek(position);

// mpv parses tracks asynchronously after open(); at playback start the list is still empty, so a
// positional lookup would miss and leave mpv on its own default pick. Wait (capped) for [index].
Future<void> _awaitTrack(int index, int Function(mpv.Tracks) count) async {
final player = _player;
if (player == null || index < 0 || count(player.state.tracks) > index + 2) return;
await player.stream.tracks
.firstWhere((tracks) => count(tracks) > index + 2)
.timeout(const Duration(seconds: 5), onTimeout: () => player.state.tracks);
}

@override
Future<int> setAudioTrack(AudioStreamModel? model, PlaybackModel playbackModel) async {
final wantedAudioStream = model ?? playbackModel.defaultAudioStream;
if (wantedAudioStream == null) return -1;
if (wantedAudioStream.index == AudioStreamModel.no().index) {
await _player?.setAudioTrack(mpv.AudioTrack.no());
} else {
final index = (playbackModel.audioStreams?.indexOf(wantedAudioStream) ?? -1) - 1;
await _awaitTrack(index, (tracks) => tracks.audio.length);
final internalTracks = audioTracks.getRange(2, audioTracks.length).toList();
final audioTrack =
internalTracks.elementAtOrNull((playbackModel.audioStreams?.indexOf(wantedAudioStream) ?? -1) - 1);
final audioTrack = internalTracks.elementAtOrNull(index);
if (audioTrack != null) {
await _player?.setAudioTrack(audioTrack);
}
Expand All @@ -455,9 +466,10 @@ class LibMPV extends BasePlayer {
return -1;
}
_currentSubtitleCodec = wantedSubtitle.codec;
final index = playbackModel.subStreams?.sublist(1).indexWhere((element) => element.id == wantedSubtitle.id) ?? -1;
if (!wantedSubtitle.isExternal) await _awaitTrack(index, (tracks) => tracks.subtitle.length);
final internalTrack = subTracks.getRange(2, subTracks.length).toList();
final index = playbackModel.subStreams?.sublist(1).indexWhere((element) => element.id == wantedSubtitle.id);
final subTrack = internalTrack.elementAtOrNull(index ?? -1);
final subTrack = internalTrack.elementAtOrNull(index);
if (wantedSubtitle.isExternal && wantedSubtitle.url != null && subTrack == null) {
await _player?.setSubtitleTrack(mpv.SubtitleTrack.uri(wantedSubtitle.url!));
} else if (subTrack != null) {
Expand Down
Loading