loadfile: discard prefetched files if demuxer options changed #15456
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Download the artifacts for this pull request: |
guidocella
force-pushed
the
prefetch-demuxer
branch
from
ab8137f to
9603a0a
Compare
kasper93
reviewed
Dec 10, 2024
options/m_option.h
Outdated
| @@ -443,7 +443,8 @@ char *format_file_size(int64_t size); | |||
| #define UPDATE_VIDEO (1 << 15) // force redraw if needed | |||
| #define UPDATE_VO (1 << 16) // reinit the VO | |||
| #define UPDATE_CLIPBOARD (1 << 17) // reinit the clipboard | |||
| #define UPDATE_OPT_LAST (1 << 17) | |||
| #define UPDATE_DEMUXER (1 << 18) // invalidate prefetched files | |||
There was a problem hiding this comment.
does this invalidate prefetched files or all demuxer cache? The name is ambiguous.
kasper93
reviewed
Dec 10, 2024
player/loadfile.c
Outdated
| } else { | ||
| if (done) { | ||
| if (correct_url && !mpctx->demuxer_changed && failed) { |
There was a problem hiding this comment.
It is hard to read for me. Not sure I get it right, but I would try to reduce demuxer_changed checks,
if (correct_url && !mpctx->demuxer_changed && !failed) {
MP_VERBOSE(mpctx, "Using prefetched/prefetching URL.\n");
} else {
if (correct_url && failed) {
MP_VERBOSE(mpctx, "Prefetched URL failed, retrying.\n");
} else if (mpctx->demuxer_changed) {
if (done) {
MP_VERBOSE(mpctx, "Dropping finished prefetch because demuxer options changed.\n");
} else {
MP_VERBOSE(mpctx, "Aborting ongoing prefetch because demuxer options changed.\n");
}
} else {
if (done) {
MP_VERBOSE(mpctx, "Dropping finished prefetch of wrong URL.\n");
} else {
MP_VERBOSE(mpctx, "Aborting ongoing prefetch of wrong URL.\n");
}
}
cancel_open(mpctx);
}
When using --prefetch-playlist, if demuxer options are changed in the time window between the start of prefetching and the playback of the next file, the old values are used. This includes setting demuxer options in legacy extension auto profiles. Fix this by setting a flag when demuxer options change and not using the prefetched data when that flag is true. UPDATE_DEMUXER is not added to demux.c's options because those already support updates while playing.
guidocella
force-pushed
the
prefetch-demuxer
branch
from
9603a0a to
cfa8f91
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When using --prefetch-playlist, if demuxer options are changed in the time window between the start of prefetching and the playback of the next file, the old values are used. This includes setting demuxer options in legacy extension auto profiles.
Fix this by setting a flag when demuxer options change and not using the prefetched data when that flag is true.
UPDATE_DEMUXER is not added to demux.c's options because those already support updates while playing.