mirror of
https://github.com/mpv-player/mpv
synced 2024-12-19 05:15:12 +00:00
4009e99b9c
First of all, this never worked. Or if it ever did, it was in some select few scenarios.c9474dc9ed
is what originally added support for the auto choice. However, that commit worked by propagating a value to a fake option used internally. This shouldn't have ever worked because the underlying m_config_cache was never updated so the value shouldn't have been preserved when accessed in sd_lavc. And indeed with some testing, the value there is always 0 unsurprisingly. This was later rewritten inba7cc07106
along with a lot of other sub changes, but with that, it was still mostly broken. The reason is because one of the key parts of having to hit this logic (prefer_forced) required `--no-subs-with-matching-audio` to be set. If the audio language matches the subtitle language (the requirement also excludes forced subs), the option makes no subtitle selection in the first place so pick->forced_only_def is not set to true and nothing even happens. Another way around this would be to attempt to change your OS language (like with the LANG environment variable) so that the subtitle track gets selected but then audio_matches mistakenly becomes false because it compares the OS language to the audio language which then make preferred_forced 0, so nothing happens. I don't think there's a scenario where pick->forced_only_def is actually set to true (thus meaning `auto` is useless), but maybe someone could contrive something very strange. Regardless, it's definitely not something even remotely common.fbe8f99194
changed track selection again but didn't consider this particular case. The net result is that DVD/PGS subs become equivalent to --sub-forced-only being yes, so this a change in behavior and probably not a good one. Note that I wasn't able to actually observe any difference in a PGS sample. It still displayed subtitles fine but that sample probably didn't have the right flags to hit the sub-forced-only logic. Anyways, the auto feature is extremely questionable at best and in my view, not actually worth it. It is meant to be used with `--no-subs-with-matching-audio` to display forced pictures in subtitle tracks that are not marked as forced, but that contradicts that particular option's purpose and description in the manual (secretly selecting a track under certain conditions even though it says not to). Instead of trying to shove all this logic into select_default_track which is already insanely complicated as it is, recognize that this is a trivial lua script. If you absolutely want to turn --sub-forced-only on under these certain conditions (DVD/PGS subtitles, matching audio and subtitle languages, etc.), just look at the current-tracks property and do your thing. The very, very niche behavior that this option tried to accomplish basically never worked, no user even knows what this option does, and well it's just not worth supporting in core mpv code. Drop all this code for sanity's sake and change --sub-forced-only back to a bool.
110 lines
3.8 KiB
C
110 lines
3.8 KiB
C
#ifndef MPLAYER_SD_H
|
|
#define MPLAYER_SD_H
|
|
|
|
#include "dec_sub.h"
|
|
#include "demux/packet.h"
|
|
#include "misc/bstr.h"
|
|
|
|
// up to 210 ms overlaps or gaps are removed
|
|
#define SUB_GAP_THRESHOLD 0.210
|
|
// don't change timings if durations are smaller
|
|
#define SUB_GAP_KEEP 0.4
|
|
|
|
struct sd {
|
|
struct mpv_global *global;
|
|
struct mp_log *log;
|
|
struct mp_subtitle_opts *opts;
|
|
|
|
const struct sd_functions *driver;
|
|
void *priv;
|
|
|
|
struct attachment_list *attachments;
|
|
struct mp_codec_params *codec;
|
|
|
|
// Set to false as soon as the decoder discards old subtitle events.
|
|
// (only needed if sd_functions.accept_packets_in_advance == false)
|
|
bool preload_ok;
|
|
};
|
|
|
|
struct sd_functions {
|
|
const char *name;
|
|
bool accept_packets_in_advance;
|
|
int (*init)(struct sd *sd);
|
|
void (*decode)(struct sd *sd, struct demux_packet *packet);
|
|
void (*reset)(struct sd *sd);
|
|
void (*select)(struct sd *sd, bool selected);
|
|
void (*uninit)(struct sd *sd);
|
|
|
|
bool (*accepts_packet)(struct sd *sd, double pts); // implicit default if NULL: true
|
|
int (*control)(struct sd *sd, enum sd_ctrl cmd, void *arg);
|
|
|
|
struct sub_bitmaps *(*get_bitmaps)(struct sd *sd, struct mp_osd_res dim,
|
|
int format, double pts);
|
|
char *(*get_text)(struct sd *sd, double pts, enum sd_text_type type);
|
|
struct sd_times (*get_times)(struct sd *sd, double pts);
|
|
};
|
|
|
|
// lavc_conv.c
|
|
struct lavc_conv;
|
|
struct lavc_conv *lavc_conv_create(struct mp_log *log,
|
|
const struct mp_codec_params *mp_codec);
|
|
char *lavc_conv_get_extradata(struct lavc_conv *priv);
|
|
char **lavc_conv_decode(struct lavc_conv *priv, struct demux_packet *packet,
|
|
double *sub_pts, double *sub_duration);
|
|
void lavc_conv_reset(struct lavc_conv *priv);
|
|
void lavc_conv_uninit(struct lavc_conv *priv);
|
|
|
|
struct sd_filter {
|
|
struct mpv_global *global;
|
|
struct mp_log *log;
|
|
struct mp_sub_filter_opts *opts;
|
|
const struct sd_filter_functions *driver;
|
|
|
|
void *priv;
|
|
|
|
// Static codec parameters. Set by sd; cannot be changed by filter.
|
|
char *codec;
|
|
char *event_format;
|
|
};
|
|
|
|
struct sd_filter_functions {
|
|
bool (*init)(struct sd_filter *ft);
|
|
|
|
// Filter an ASS event (usually in the Matroska format, but event_format
|
|
// can be used to determine details).
|
|
// Returning NULL is interpreted as dropping the event completely.
|
|
// Returning pkt makes it no-op.
|
|
// If the returned packet is not pkt or NULL, it must have been properly
|
|
// allocated.
|
|
// pkt is owned by the caller (and freed by the caller when needed).
|
|
// Note: as by normal demux_packet rules, you must not modify any fields in
|
|
// it, or the data referenced by it. You must create a new demux_packet
|
|
// when modifying data.
|
|
struct demux_packet *(*filter)(struct sd_filter *ft,
|
|
struct demux_packet *pkt);
|
|
|
|
void (*uninit)(struct sd_filter *ft);
|
|
};
|
|
|
|
extern const struct sd_filter_functions sd_filter_sdh;
|
|
extern const struct sd_filter_functions sd_filter_regex;
|
|
extern const struct sd_filter_functions sd_filter_jsre;
|
|
|
|
|
|
// convenience utils for filters with ass codec
|
|
|
|
// num commas to skip at an ass-event before the "Text" field (always last)
|
|
// (doesn't change, can be retrieved once on filter init)
|
|
int sd_ass_fmt_offset(const char *event_format);
|
|
|
|
// the event (pkt->buffer) "Text" content according to the calculated offset.
|
|
// on malformed event: warns and returns (bstr){NULL,0}
|
|
bstr sd_ass_pkt_text(struct sd_filter *ft, struct demux_packet *pkt, int offset);
|
|
|
|
// convert \0-terminated "Text" (ass) content to plaintext, possibly in-place.
|
|
// result.start is out, result.len is MIN(out_siz, strlen(in)) or smaller.
|
|
// if there's room: out[result.len] is set to \0. out == in is allowed.
|
|
bstr sd_ass_to_plaintext(char *out, size_t out_siz, const char *in);
|
|
|
|
#endif
|