mirror of
https://github.com/mpv-player/mpv
synced 2024-10-26 07:22:17 +02:00

This fixes that vo_xv didn't display text subtitles correctly when using anamorphic video. It didn't pass the aspect information to the subtitle renderer. Also, try to render OSD correctly with respect to aspect ratio settings: on vo_xv, the OSD is rendered into the video, and needs to be "stretched" too when playing anamorphic video. When the -monitorpixelaspect option is used, even with VOs such as vo_opengl the OSD has to be rendered with that aspect ratio. As preparation for future commits, replace the weird vsfilter_scale value with a somewhat more sensible video_par member. Also, struct mp_eosd_res is a better place for the aspect ratio parameters, as OSD needs this too. Use osd_draw_on_image() directly in vo_lavc, which fixes aspect ratio issues as well.
206 lines
6.1 KiB
C
206 lines
6.1 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 <ass/ass.h>
|
|
#include <assert.h>
|
|
#include <string.h>
|
|
|
|
#include "talloc.h"
|
|
|
|
#include "options.h"
|
|
#include "mpcommon.h"
|
|
#include "mp_msg.h"
|
|
#include "libmpdemux/stheader.h"
|
|
#include "sub.h"
|
|
#include "dec_sub.h"
|
|
#include "ass_mp.h"
|
|
#include "sd.h"
|
|
#include "subassconvert.h"
|
|
|
|
struct sd_ass_priv {
|
|
struct ass_track *ass_track;
|
|
bool vsfilter_aspect;
|
|
bool incomplete_event;
|
|
struct sub_bitmap *parts;
|
|
};
|
|
|
|
static void free_last_event(ASS_Track *track)
|
|
{
|
|
assert(track->n_events > 0);
|
|
ass_free_event(track, track->n_events - 1);
|
|
track->n_events--;
|
|
}
|
|
|
|
static int init(struct sh_sub *sh, struct osd_state *osd)
|
|
{
|
|
struct sd_ass_priv *ctx;
|
|
|
|
if (sh->initialized) {
|
|
ctx = sh->context;
|
|
} else {
|
|
ctx = talloc_zero(NULL, struct sd_ass_priv);
|
|
sh->context = ctx;
|
|
if (sh->type == 'a') {
|
|
ctx->ass_track = ass_new_track(osd->ass_library);
|
|
if (sh->extradata)
|
|
ass_process_codec_private(ctx->ass_track, sh->extradata,
|
|
sh->extradata_len);
|
|
} else
|
|
ctx->ass_track = mp_ass_default_track(osd->ass_library, sh->opts);
|
|
}
|
|
|
|
ctx->vsfilter_aspect = sh->type == 'a';
|
|
return 0;
|
|
}
|
|
|
|
static void decode(struct sh_sub *sh, struct osd_state *osd, void *data,
|
|
int data_len, double pts, double duration)
|
|
{
|
|
unsigned char *text = data;
|
|
struct sd_ass_priv *ctx = sh->context;
|
|
ASS_Track *track = ctx->ass_track;
|
|
|
|
if (sh->type == 'a') { // ssa/ass subs
|
|
ass_process_chunk(track, data, data_len,
|
|
(long long)(pts*1000 + 0.5),
|
|
(long long)(duration*1000 + 0.5));
|
|
return;
|
|
}
|
|
// plaintext subs
|
|
if (pts == MP_NOPTS_VALUE) {
|
|
mp_msg(MSGT_SUBREADER, MSGL_WARN, "Subtitle without pts, ignored\n");
|
|
return;
|
|
}
|
|
long long ipts = pts * 1000 + 0.5;
|
|
long long iduration = duration * 1000 + 0.5;
|
|
if (ctx->incomplete_event) {
|
|
ctx->incomplete_event = false;
|
|
ASS_Event *event = track->events + track->n_events - 1;
|
|
if (ipts <= event->Start)
|
|
free_last_event(track);
|
|
else
|
|
event->Duration = ipts - event->Start;
|
|
}
|
|
// Note: we rely on there being guaranteed 0 bytes after data packets
|
|
int len = strlen(text);
|
|
if (len < 5) {
|
|
// Some tracks use a whitespace (but not empty) packet to mark end
|
|
// of previous subtitle.
|
|
for (int i = 0; i < len; i++)
|
|
if (!strchr(" \f\n\r\t\v", text[i]))
|
|
goto not_all_whitespace;
|
|
return;
|
|
}
|
|
not_all_whitespace:;
|
|
char buf[500];
|
|
subassconvert_subrip(text, buf, sizeof(buf));
|
|
for (int i = 0; i < track->n_events; i++)
|
|
if (track->events[i].Start == ipts
|
|
&& (duration <= 0 || track->events[i].Duration == iduration)
|
|
&& strcmp(track->events[i].Text, buf) == 0)
|
|
return; // We've already added this subtitle
|
|
if (duration <= 0) {
|
|
iduration = 10000;
|
|
ctx->incomplete_event = true;
|
|
}
|
|
int eid = ass_alloc_event(track);
|
|
ASS_Event *event = track->events + eid;
|
|
event->Start = ipts;
|
|
event->Duration = iduration;
|
|
event->Style = track->default_style;
|
|
event->Text = strdup(buf);
|
|
}
|
|
|
|
static void get_bitmaps(struct sh_sub *sh, struct osd_state *osd,
|
|
struct sub_render_params *params,
|
|
struct sub_bitmaps *res)
|
|
{
|
|
struct sd_ass_priv *ctx = sh->context;
|
|
struct MPOpts *opts = osd->opts;
|
|
|
|
if (params->pts == MP_NOPTS_VALUE)
|
|
return;
|
|
|
|
double scale = params->dim.display_par;
|
|
bool use_vs_aspect = opts->ass_style_override
|
|
? opts->ass_vsfilter_aspect_compat : 1;
|
|
if (ctx->vsfilter_aspect && use_vs_aspect)
|
|
scale = scale * params->dim.video_par;
|
|
ASS_Renderer *renderer = osd->ass_renderer;
|
|
mp_ass_configure(renderer, opts, ¶ms->dim);
|
|
ass_set_aspect_ratio(renderer, scale, 1);
|
|
mp_ass_render_frame(renderer, ctx->ass_track, params->pts * 1000 + .5,
|
|
&ctx->parts, res);
|
|
talloc_steal(ctx, ctx->parts);
|
|
}
|
|
|
|
static void reset(struct sh_sub *sh, struct osd_state *osd)
|
|
{
|
|
struct sd_ass_priv *ctx = sh->context;
|
|
if (ctx->incomplete_event)
|
|
free_last_event(ctx->ass_track);
|
|
ctx->incomplete_event = false;
|
|
}
|
|
|
|
static void uninit(struct sh_sub *sh)
|
|
{
|
|
struct sd_ass_priv *ctx = sh->context;
|
|
|
|
ass_free_track(ctx->ass_track);
|
|
talloc_free(ctx);
|
|
}
|
|
|
|
const struct sd_functions sd_ass = {
|
|
.init = init,
|
|
.decode = decode,
|
|
.get_bitmaps = get_bitmaps,
|
|
.reset = reset,
|
|
.switch_off = reset,
|
|
.uninit = uninit,
|
|
};
|
|
|
|
|
|
struct sh_sub *sd_ass_create_from_track(struct ass_track *track,
|
|
bool vsfilter_aspect,
|
|
struct MPOpts *opts)
|
|
{
|
|
struct sh_sub *sh = talloc(NULL, struct sh_sub);
|
|
*sh = (struct sh_sub) {
|
|
.opts = opts,
|
|
.type = 'a',
|
|
.sd_driver = &sd_ass,
|
|
.context = talloc_struct(sh, struct sd_ass_priv, {
|
|
.ass_track = track,
|
|
.vsfilter_aspect = vsfilter_aspect,
|
|
}),
|
|
.initialized = true,
|
|
};
|
|
return sh;
|
|
}
|
|
|
|
struct ass_track *sub_get_ass_track(struct osd_state *osd)
|
|
{
|
|
struct sh_sub *sh = osd ? osd->sh_sub : NULL;
|
|
if (sh && sh->sd_driver == &sd_ass && sh->context) {
|
|
struct sd_ass_priv *ctx = sh->context;
|
|
return ctx->ass_track;
|
|
}
|
|
return NULL;
|
|
}
|