summaryrefslogtreecommitdiffstats
path: root/player
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2020-02-16 01:02:17 +0100
committerwm4 <wm4@nowhere>2020-02-16 02:07:24 +0100
commit0b35b4c91796fb020e13d955efd450021eb5eedb (patch)
tree2223d7c7f32afc60efb12b0051343e99e6bf727b /player
parente162bcb5a09b5ad514636684314e8e797ab2a47b (diff)
downloadmpv-0b35b4c91796fb020e13d955efd450021eb5eedb.tar.bz2
mpv-0b35b4c91796fb020e13d955efd450021eb5eedb.tar.xz
sub: make filter_sdh a "proper" filter, allow runtime changes
Until now, filter_sdh was simply a function that was called by sd_ass directly (if enabled). I want to add another filter, so it's time to turn this into a somewhat more general subtitle filtering infrastructure. I pondered whether to reuse the audio/video filtering stuff - but better not. Also, since subtitles are horrible and tend to refuse proper abstraction, it's still messed into sd_ass, instead of working on the dec_sub.c level. Actually mpv used to have subtitle "filters" and even made subtitle converters part of it, but it was fairly horrible, so don't do that again. In addition, make runtime changes possible. Since this was supposed to be a quick hack, I just decided to put all subtitle filter options into a separate option group (=> simpler change notification), to manually push the change through the playloop (like it was sort of before for OSD options), and to recreate the sub filter chain completely in every change. Should be good enough. One strangeness is that due to prefetching and such, most subtitle packets (or those some time ahead) are actually done filtering when we change, so the user still needs to manually seek to actually refresh everything. And since subtitle data is usually cached in ASS_Track (for other terrible but user-friendly reasons), we also must clear the subtitle data, but of course only on seek, since otherwise all subtitles would just disappear. What a fucking mess, but such is life. We could trigger a "refresh seek" to make this more automatic, but I don't feel like it currently. This is slightly inefficient (lots of allocations and copying), but I decided that it doesn't matter. Could matter slightly for crazy ASS subtitles that render with thousands of events. Not very well tested. Still seems to work, but I didn't have many test cases.
Diffstat (limited to 'player')
-rw-r--r--player/command.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/player/command.c b/player/command.c
index 21c595ce57..37ace97ba6 100644
--- a/player/command.c
+++ b/player/command.c
@@ -6115,12 +6115,14 @@ void mp_option_change_callback(void *ctx, struct m_config_option *co, int flags,
if (flags & UPDATE_TERM)
mp_update_logging(mpctx, false);
- if (flags & UPDATE_OSD) {
+ if (flags & (UPDATE_OSD | UPDATE_SUB_FILT)) {
for (int n = 0; n < NUM_PTRACKS; n++) {
struct track *track = mpctx->current_track[n][STREAM_SUB];
struct dec_sub *sub = track ? track->d_sub : NULL;
- if (sub)
- sub_update_opts(track->d_sub);
+ if (sub) {
+ sub_control(track->d_sub, SD_CTRL_UPDATE_OPTS,
+ (void *)(uintptr_t)flags);
+ }
}
osd_changed(mpctx->osd);
mp_wakeup_core(mpctx);