mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 20:03:10 +02:00
4d11f32162
Remove VFCTRL_DRAW_OSD, VFCAP_EOSD_FILTER, VFCAP_EOSD_RGBA, VFCAP_EOSD, VOCTRL_DRAW_EOSD, VOCTRL_GET_EOSD_RES, VOCTRL_QUERY_EOSD_FORMAT. Remove draw_osd_with_eosd(), which rendered the OSD by calling VOCTRL_DRAW_EOSD. Change VOs to call osd_draw() directly, which takes a callback as argument. (This basically works like the old OSD API, except multiple OSD bitmap formats are supported and caching is possible.) Remove all mentions of "eosd". It's simply "osd" now. Make OSD size per-OSD-object, as they can be different when using vf_sub. Include display_par/video_par in resolution change detection. Fix the issue with margin borders in vo_corevideo.
108 lines
3.2 KiB
C
108 lines
3.2 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#include <stdlib.h>
|
|
#include <stdbool.h>
|
|
#include <assert.h>
|
|
|
|
#include "config.h"
|
|
#include "libmpdemux/stheader.h"
|
|
#include "sub/sd.h"
|
|
#include "sub/sub.h"
|
|
#include "sub/dec_sub.h"
|
|
#include "options.h"
|
|
|
|
extern const struct sd_functions sd_ass;
|
|
extern const struct sd_functions sd_lavc;
|
|
|
|
void sub_init(struct sh_sub *sh, struct osd_state *osd)
|
|
{
|
|
struct MPOpts *opts = sh->opts;
|
|
|
|
assert(!osd->sh_sub);
|
|
#ifdef CONFIG_ASS
|
|
if (opts->ass_enabled && is_text_sub(sh->type))
|
|
sh->sd_driver = &sd_ass;
|
|
#endif
|
|
if (strchr("bpxv", sh->type))
|
|
sh->sd_driver = &sd_lavc;
|
|
if (sh->sd_driver) {
|
|
if (sh->sd_driver->init(sh, osd) < 0)
|
|
return;
|
|
osd->sh_sub = sh;
|
|
osd->switch_sub_id++;
|
|
sh->initialized = true;
|
|
sh->active = true;
|
|
}
|
|
}
|
|
|
|
void sub_decode(struct sh_sub *sh, struct osd_state *osd, void *data,
|
|
int data_len, double pts, double duration)
|
|
{
|
|
if (sh->active && sh->sd_driver->decode)
|
|
sh->sd_driver->decode(sh, osd, data, data_len, pts, duration);
|
|
}
|
|
|
|
void sub_get_bitmaps(struct osd_state *osd, struct mp_osd_res dim, double pts,
|
|
struct sub_bitmaps *res)
|
|
{
|
|
struct MPOpts *opts = osd->opts;
|
|
|
|
*res = (struct sub_bitmaps) {0};
|
|
if (!opts->sub_visibility || !osd->sh_sub || !osd->sh_sub->active) {
|
|
/* Change ID in case we just switched from visible subtitles
|
|
* to current state. Hopefully, unnecessarily claiming that
|
|
* things may have changed is harmless for empty contents.
|
|
* Increase osd-> values ahead so that _next_ returned id
|
|
* is also guaranteed to differ from this one.
|
|
*/
|
|
osd->switch_sub_id++;
|
|
} else {
|
|
if (osd->sh_sub->sd_driver->get_bitmaps)
|
|
osd->sh_sub->sd_driver->get_bitmaps(osd->sh_sub, osd, dim, pts, res);
|
|
}
|
|
|
|
res->bitmap_id += osd->switch_sub_id;
|
|
res->bitmap_pos_id += osd->switch_sub_id;
|
|
osd->switch_sub_id = 0;
|
|
}
|
|
|
|
void sub_reset(struct sh_sub *sh, struct osd_state *osd)
|
|
{
|
|
if (sh->active && sh->sd_driver->reset)
|
|
sh->sd_driver->reset(sh, osd);
|
|
}
|
|
|
|
void sub_switchoff(struct sh_sub *sh, struct osd_state *osd)
|
|
{
|
|
if (sh->active && sh->sd_driver->switch_off) {
|
|
assert(osd->sh_sub == sh);
|
|
sh->sd_driver->switch_off(sh, osd);
|
|
osd->sh_sub = NULL;
|
|
}
|
|
sh->active = false;
|
|
}
|
|
|
|
void sub_uninit(struct sh_sub *sh)
|
|
{
|
|
assert (!sh->active);
|
|
if (sh->initialized && sh->sd_driver->uninit)
|
|
sh->sd_driver->uninit(sh);
|
|
sh->initialized = false;
|
|
}
|