2011-01-16 18:03:08 +00:00
|
|
|
/*
|
|
|
|
* 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"
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "demux/stheader.h"
|
2012-08-25 18:22:39 +00:00
|
|
|
#include "sub/sd.h"
|
|
|
|
#include "sub/sub.h"
|
|
|
|
#include "sub/dec_sub.h"
|
2012-11-09 00:06:43 +00:00
|
|
|
#include "core/options.h"
|
2011-01-16 18:03:08 +00:00
|
|
|
|
|
|
|
extern const struct sd_functions sd_ass;
|
2012-08-16 15:21:21 +00:00
|
|
|
extern const struct sd_functions sd_lavc;
|
sub: add sd_spu.c to wrap spudec, cleanup mplayer.c
This unifies the subtitle rendering path. Now all subtitle rendering
goes through sd_ass.c/sd_lavc.c/sd_spu.c.
Before that commit, the spudec.h functions were used directly in
mplayer.c, which introduced many special cases. Add sd_spu.c, which is
just a small wrapper connecting the new subtitle render API with the
dusty old vobsub decoder in spudec.c.
One detail that changes is that we always pass the palette as extra
data, instead of passing the libdvdread palette as pointer to spudec
directly. This is a bit roundabout, but actually makes the code simpler
and more elegant: the difference between DVD and non-DVD dvdsubs is
reduced.
Ideally, we would just delete spudec.c and use libavcodec's DVD sub
decoder. However, DVD playback with demux_mpg produces packets
incompatible to lavc. There are incompatibilities the other way around
as well: packets from libavformat's vobsub demuxer are incompatible to
spudec.c. So we define a new subtitle codec name for demux_mpg subs,
"dvd_subtitle_mpg", which only sd_spu can decode.
There is actually code in spudec.c to "assemble" fragments into complete
packets, but using the whole spudec.c is easier than trying to move this
code into demux_mpg to fix subtitle packets.
As additional complication, Libav 9.x can't decode DVD subs correctly,
so use sd_spu in that case as well.
2013-04-28 23:13:22 +00:00
|
|
|
extern const struct sd_functions sd_spu;
|
|
|
|
|
|
|
|
static const struct sd_functions *sd_list[] = {
|
|
|
|
#ifdef CONFIG_ASS
|
|
|
|
&sd_ass,
|
|
|
|
#endif
|
|
|
|
&sd_lavc,
|
|
|
|
&sd_spu,
|
|
|
|
NULL
|
|
|
|
};
|
2011-01-16 18:03:08 +00:00
|
|
|
|
|
|
|
void sub_init(struct sh_sub *sh, struct osd_state *osd)
|
|
|
|
{
|
sub: add sd_spu.c to wrap spudec, cleanup mplayer.c
This unifies the subtitle rendering path. Now all subtitle rendering
goes through sd_ass.c/sd_lavc.c/sd_spu.c.
Before that commit, the spudec.h functions were used directly in
mplayer.c, which introduced many special cases. Add sd_spu.c, which is
just a small wrapper connecting the new subtitle render API with the
dusty old vobsub decoder in spudec.c.
One detail that changes is that we always pass the palette as extra
data, instead of passing the libdvdread palette as pointer to spudec
directly. This is a bit roundabout, but actually makes the code simpler
and more elegant: the difference between DVD and non-DVD dvdsubs is
reduced.
Ideally, we would just delete spudec.c and use libavcodec's DVD sub
decoder. However, DVD playback with demux_mpg produces packets
incompatible to lavc. There are incompatibilities the other way around
as well: packets from libavformat's vobsub demuxer are incompatible to
spudec.c. So we define a new subtitle codec name for demux_mpg subs,
"dvd_subtitle_mpg", which only sd_spu can decode.
There is actually code in spudec.c to "assemble" fragments into complete
packets, but using the whole spudec.c is easier than trying to move this
code into demux_mpg to fix subtitle packets.
As additional complication, Libav 9.x can't decode DVD subs correctly,
so use sd_spu in that case as well.
2013-04-28 23:13:22 +00:00
|
|
|
sh->sd_driver = NULL;
|
|
|
|
for (int n = 0; sd_list[n]; n++) {
|
|
|
|
if (sd_list[n]->supports_format(sh->gsh->codec)) {
|
|
|
|
sh->sd_driver = sd_list[n];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2011-01-16 18:03:08 +00:00
|
|
|
|
|
|
|
if (sh->sd_driver) {
|
2012-08-16 15:21:21 +00:00
|
|
|
if (sh->sd_driver->init(sh, osd) < 0)
|
|
|
|
return;
|
2012-08-25 18:22:39 +00:00
|
|
|
osd->sh_sub = sh;
|
2012-10-04 15:16:36 +00:00
|
|
|
osd->switch_sub_id++;
|
2011-01-16 18:03:08 +00:00
|
|
|
sh->initialized = true;
|
|
|
|
sh->active = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-28 19:12:11 +00:00
|
|
|
bool sub_accept_packets_in_advance(struct sh_sub *sh)
|
|
|
|
{
|
|
|
|
return sh->active && sh->sd_driver->accept_packets_in_advance;
|
|
|
|
}
|
|
|
|
|
2011-01-16 18:03:08 +00:00
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
VO, sub: refactor
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.
2012-10-19 17:25:18 +00:00
|
|
|
void sub_get_bitmaps(struct osd_state *osd, struct mp_osd_res dim, double pts,
|
2012-10-04 15:16:36 +00:00
|
|
|
struct sub_bitmaps *res)
|
2012-08-25 18:22:39 +00:00
|
|
|
{
|
|
|
|
struct MPOpts *opts = osd->opts;
|
|
|
|
|
2012-10-04 15:16:36 +00:00
|
|
|
*res = (struct sub_bitmaps) {0};
|
2012-08-25 18:22:39 +00:00
|
|
|
if (!opts->sub_visibility || !osd->sh_sub || !osd->sh_sub->active) {
|
2012-08-28 16:12:27 +00:00
|
|
|
/* 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.
|
|
|
|
*/
|
2012-10-04 15:16:36 +00:00
|
|
|
osd->switch_sub_id++;
|
|
|
|
} else {
|
|
|
|
if (osd->sh_sub->sd_driver->get_bitmaps)
|
VO, sub: refactor
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.
2012-10-19 17:25:18 +00:00
|
|
|
osd->sh_sub->sd_driver->get_bitmaps(osd->sh_sub, osd, dim, pts, res);
|
2012-08-25 18:22:39 +00:00
|
|
|
}
|
2012-10-04 15:16:36 +00:00
|
|
|
|
|
|
|
res->bitmap_id += osd->switch_sub_id;
|
|
|
|
res->bitmap_pos_id += osd->switch_sub_id;
|
|
|
|
osd->switch_sub_id = 0;
|
2012-08-25 18:22:39 +00:00
|
|
|
}
|
|
|
|
|
2013-04-28 19:12:11 +00:00
|
|
|
char *sub_get_text(struct osd_state *osd, double pts)
|
|
|
|
{
|
|
|
|
struct MPOpts *opts = osd->opts;
|
|
|
|
char *text = NULL;
|
|
|
|
if (!opts->sub_visibility || !osd->sh_sub || !osd->sh_sub->active) {
|
|
|
|
// -
|
|
|
|
} else {
|
|
|
|
if (osd->sh_sub->sd_driver->get_text)
|
|
|
|
text = osd->sh_sub->sd_driver->get_text(osd->sh_sub, osd, pts);
|
|
|
|
}
|
|
|
|
return text;
|
|
|
|
}
|
|
|
|
|
2011-01-16 18:03:08 +00:00
|
|
|
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)
|
|
|
|
{
|
2012-08-25 18:22:39 +00:00
|
|
|
if (sh->active && sh->sd_driver->switch_off) {
|
|
|
|
assert(osd->sh_sub == sh);
|
2011-01-16 18:03:08 +00:00
|
|
|
sh->sd_driver->switch_off(sh, osd);
|
2012-08-25 18:22:39 +00:00
|
|
|
osd->sh_sub = NULL;
|
|
|
|
}
|
2011-01-16 18:03:08 +00:00
|
|
|
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;
|
|
|
|
}
|