mirror of
https://github.com/mpv-player/mpv
synced 2025-01-03 05:22:23 +00:00
e9e883e3b2
Making OSD/subtitle bitmaps refcounted was planend a longer time ago, e.g. the sub_bitmaps.packed field (which refcounts the subtitle bitmap data) was added in 2016. But nothing benefited much from it, because struct sub_bitmaps was usually stack allocated, and there was this weird callback stuff through osd_draw(). Make it possible to get actually refcounted subtitle bitmaps on the OSD API level. For this, we just copy all subtitle data other than the bitmaps with sub_bitmaps_copy(). At first, I had planned some fancy refcount shit, but when that was a big mess and hard to debug and just boiled to emulating malloc(), I made it a full allocation+copy. This affects mostly the parts array. With crazy ASS subtitles, this parts array can get pretty big (thousands of elements or more), in which case the extra alloc/copy could become performance relevant. But then again this is just pure bullshit, and I see no need to care. In practice, this extra work most likely gets drowned out by libass murdering a single core (while mpv is waiting for it) anyway. So fuck it. I just wanted this so draw_bmp.c requires only a single call to render everything. VOs also can benefit from this, because the weird callback shit isn't necessary anymore (simpler code), but I haven't done anything about it yet. In general I'd hope this will work towards simplifying the OSD layer, which is prerequisite for making actual further improvements. I haven't tested some cases such as the "overlay-add" command. Maybe it crashes now? Who knows, who cares. In addition, it might be worthwhile to reduce the code duplication between all the things that output subtitle bitmaps (with repacking, image allocation, etc.), but that's orthogonal.
93 lines
3.0 KiB
C
93 lines
3.0 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);
|
|
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 char *codec_name,
|
|
char *extradata, int extradata_len);
|
|
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;
|
|
|
|
#endif
|