mirror of https://github.com/mpv-player/mpv
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. |
||
|---|---|---|
| .. | ||
| javascript | ||
| lua | ||
| audio.c | ||
| client.c | ||
| client.h | ||
| command.c | ||
| command.h | ||
| configfiles.c | ||
| core.h | ||
| external_files.c | ||
| external_files.h | ||
| javascript.c | ||
| loadfile.c | ||
| lua.c | ||
| main.c | ||
| misc.c | ||
| osd.c | ||
| playloop.c | ||
| screenshot.c | ||
| screenshot.h | ||
| scripting.c | ||
| sub.c | ||
| video.c | ||