mirror of
https://github.com/mpv-player/mpv
synced 2025-01-17 20:48:46 +00:00
52f9abefa3
This fixes a crash with vo_gl when the switch_ratio slave command is used while a displaying an animated subtitle. switch_ratio will cause a config() call to vo_gl, which will reset all state, including the EOSD state. Next time the EOSD is rendered, its change detection will indicate that only subtitle positions have changed. The render code will attempt to access the EOSD data structures which have been deleted with config(). Fix this by forcing the change detection to indicate a full change if config() has been called. This only happens when doing switch_ratio with vo_gl, and the current subtitle is only changing positions, i.e. mp_eosd_images_t.changed == 1.
290 lines
9.9 KiB
C
290 lines
9.9 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 <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <stdbool.h>
|
|
|
|
#include "config.h"
|
|
#include "mp_msg.h"
|
|
#include "options.h"
|
|
|
|
#include "mp_image.h"
|
|
#include "vf.h"
|
|
|
|
#include "libvo/video_out.h"
|
|
|
|
#include "sub/ass_mp.h"
|
|
#include "sub/sub.h"
|
|
|
|
//===========================================================================//
|
|
|
|
extern float sub_delay;
|
|
|
|
struct vf_priv_s {
|
|
struct vo *vo;
|
|
#ifdef CONFIG_ASS
|
|
ASS_Renderer *renderer_realaspect;
|
|
ASS_Renderer *renderer_vsfilter;
|
|
bool prev_visibility;
|
|
double scale_ratio;
|
|
#endif
|
|
};
|
|
#define video_out (vf->priv->vo)
|
|
|
|
static int query_format(struct vf_instance *vf, unsigned int fmt); /* forward declaration */
|
|
static void draw_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y);
|
|
|
|
static int config(struct vf_instance *vf,
|
|
int width, int height, int d_width, int d_height,
|
|
unsigned int flags, unsigned int outfmt){
|
|
|
|
if ((width <= 0) || (height <= 0) || (d_width <= 0) || (d_height <= 0))
|
|
{
|
|
mp_msg(MSGT_CPLAYER, MSGL_ERR, "VO: invalid dimensions!\n");
|
|
return 0;
|
|
}
|
|
|
|
const vo_info_t *info = video_out->driver->info;
|
|
mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name,
|
|
width, height,
|
|
d_width, d_height,
|
|
vo_format_name(outfmt),
|
|
(flags&VOFLAG_FULLSCREEN)?" [fs]":"",
|
|
(flags&VOFLAG_MODESWITCHING)?" [vm]":"",
|
|
(flags&VOFLAG_SWSCALE)?" [zoom]":"",
|
|
(flags&VOFLAG_FLIPPING)?" [flip]":"");
|
|
mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name);
|
|
mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author);
|
|
if(info->comment && strlen(info->comment) > 0)
|
|
mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment);
|
|
|
|
// save vo's stride capability for the wanted colorspace:
|
|
vf->default_caps=query_format(vf,outfmt);
|
|
vf->draw_slice = (vf->default_caps & VOCAP_NOSLICES) ? NULL : draw_slice;
|
|
|
|
if (vo_config(video_out, width, height, d_width, d_height, flags, outfmt))
|
|
return 0;
|
|
|
|
#ifdef CONFIG_ASS
|
|
vf->priv->scale_ratio = (double) d_width / d_height * height / width;
|
|
|
|
if (vf->priv->renderer_realaspect) {
|
|
mp_ass_configure(vf->priv->renderer_realaspect, vf->opts, width, height,
|
|
vf->default_caps & VFCAP_EOSD_UNSCALED);
|
|
mp_ass_configure(vf->priv->renderer_vsfilter, vf->opts, width, height,
|
|
vf->default_caps & VFCAP_EOSD_UNSCALED);
|
|
}
|
|
|
|
// force EOSD change detection reset
|
|
vf->priv->prev_visibility = false;
|
|
#endif
|
|
|
|
return 1;
|
|
}
|
|
|
|
static int control(struct vf_instance *vf, int request, void* data)
|
|
{
|
|
switch(request){
|
|
case VFCTRL_GET_DEINTERLACE:
|
|
{
|
|
if(!video_out) return CONTROL_FALSE; // vo not configured?
|
|
return vo_control(video_out, VOCTRL_GET_DEINTERLACE, data) == VO_TRUE;
|
|
}
|
|
case VFCTRL_SET_DEINTERLACE:
|
|
{
|
|
if(!video_out) return CONTROL_FALSE; // vo not configured?
|
|
return vo_control(video_out, VOCTRL_SET_DEINTERLACE, data) == VO_TRUE;
|
|
}
|
|
case VFCTRL_GET_YUV_COLORSPACE:
|
|
return vo_control(video_out, VOCTRL_GET_YUV_COLORSPACE, data) == true;
|
|
case VFCTRL_SET_YUV_COLORSPACE:
|
|
return vo_control(video_out, VOCTRL_SET_YUV_COLORSPACE, data) == true;
|
|
case VFCTRL_DRAW_OSD:
|
|
if(!video_out->config_ok) return CONTROL_FALSE; // vo not configured?
|
|
vo_draw_osd(video_out, data);
|
|
return CONTROL_TRUE;
|
|
case VFCTRL_SET_EQUALIZER:
|
|
{
|
|
vf_equalizer_t *eq=data;
|
|
if(!video_out->config_ok) return CONTROL_FALSE; // vo not configured?
|
|
struct voctrl_set_equalizer_args param = {eq->item, eq->value};
|
|
return vo_control(video_out, VOCTRL_SET_EQUALIZER, ¶m) == VO_TRUE;
|
|
}
|
|
case VFCTRL_GET_EQUALIZER:
|
|
{
|
|
vf_equalizer_t *eq=data;
|
|
if(!video_out->config_ok) return CONTROL_FALSE; // vo not configured?
|
|
struct voctrl_get_equalizer_args param = {eq->item, &eq->value};
|
|
return vo_control(video_out, VOCTRL_GET_EQUALIZER, ¶m) == VO_TRUE;
|
|
}
|
|
#ifdef CONFIG_ASS
|
|
case VFCTRL_INIT_EOSD:
|
|
{
|
|
vf->priv->renderer_realaspect = ass_renderer_init(data);
|
|
if (!vf->priv->renderer_realaspect)
|
|
return CONTROL_FALSE;
|
|
vf->priv->renderer_vsfilter = ass_renderer_init(data);
|
|
if (!vf->priv->renderer_vsfilter) {
|
|
ass_renderer_done(vf->priv->renderer_realaspect);
|
|
return CONTROL_FALSE;
|
|
}
|
|
mp_ass_configure_fonts(vf->priv->renderer_realaspect);
|
|
mp_ass_configure_fonts(vf->priv->renderer_vsfilter);
|
|
vf->priv->prev_visibility = false;
|
|
return CONTROL_TRUE;
|
|
}
|
|
case VFCTRL_DRAW_EOSD:
|
|
{
|
|
struct osd_state *osd = data;
|
|
mp_eosd_images_t images = {NULL, 2};
|
|
ASS_Renderer *renderer;
|
|
double scale;
|
|
if (osd->vsfilter_aspect && vf->opts->ass_vsfilter_aspect_compat) {
|
|
renderer = vf->priv->renderer_vsfilter;
|
|
scale = vf->priv->scale_ratio;
|
|
} else {
|
|
renderer = vf->priv->renderer_realaspect;
|
|
scale = 1;
|
|
}
|
|
if (!video_out->config_ok || !renderer)
|
|
return CONTROL_FALSE;
|
|
if (osd->ass_track_changed)
|
|
vf->priv->prev_visibility = false;
|
|
osd->ass_track_changed = false;
|
|
if (sub_visibility && osd->ass_track && (osd->pts != MP_NOPTS_VALUE)) {
|
|
struct mp_eosd_res res = {0};
|
|
if (vo_control(video_out, VOCTRL_GET_EOSD_RES, &res) == VO_TRUE) {
|
|
ass_set_frame_size(renderer, res.w, res.h);
|
|
ass_set_margins(renderer, res.mt, res.mb, res.ml, res.mr);
|
|
ass_set_aspect_ratio(renderer, scale, 1);
|
|
}
|
|
|
|
if (osd->ass_force_reload) {
|
|
mp_ass_reload_options(vf->priv->renderer_realaspect, vf->opts);
|
|
mp_ass_reload_options(vf->priv->renderer_vsfilter, vf->opts);
|
|
}
|
|
images.imgs = ass_render_frame(renderer, osd->ass_track,
|
|
(osd->pts+sub_delay) * 1000 + .5,
|
|
&images.changed);
|
|
if (!vf->priv->prev_visibility || osd->ass_force_reload)
|
|
images.changed = 2;
|
|
osd->ass_force_reload = false;
|
|
vf->priv->prev_visibility = true;
|
|
} else
|
|
vf->priv->prev_visibility = false;
|
|
return vo_control(video_out, VOCTRL_DRAW_EOSD, &images) == VO_TRUE;
|
|
}
|
|
#endif
|
|
}
|
|
return CONTROL_UNKNOWN;
|
|
}
|
|
|
|
static int query_format(struct vf_instance *vf, unsigned int fmt){
|
|
int flags = vo_control(video_out, VOCTRL_QUERY_FORMAT, &fmt);
|
|
// draw_slice() accepts stride, draw_frame() doesn't:
|
|
if(flags)
|
|
if(fmt==IMGFMT_YV12 || fmt==IMGFMT_I420 || fmt==IMGFMT_IYUV)
|
|
flags|=VFCAP_ACCEPT_STRIDE;
|
|
return flags;
|
|
}
|
|
|
|
static void get_image(struct vf_instance *vf,
|
|
mp_image_t *mpi){
|
|
if (!video_out->config_ok)
|
|
return;
|
|
// GET_IMAGE is required for hardware-accelerated formats
|
|
if(vo_directrendering ||
|
|
IMGFMT_IS_HWACCEL(mpi->imgfmt))
|
|
vo_control(video_out, VOCTRL_GET_IMAGE, mpi);
|
|
}
|
|
|
|
static int put_image(struct vf_instance *vf,
|
|
mp_image_t *mpi, double pts){
|
|
if(!video_out->config_ok) return 0; // vo not configured?
|
|
// first check, maybe the vo/vf plugin implements draw_image using mpi:
|
|
if (vo_draw_image(video_out, mpi, pts) >= 0)
|
|
return 1;
|
|
// nope, fallback to old draw_frame/draw_slice:
|
|
if(!(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK))){
|
|
// blit frame:
|
|
// if(mpi->flags&MP_IMGFLAG_PLANAR)
|
|
if(vf->default_caps&VFCAP_ACCEPT_STRIDE)
|
|
vo_draw_slice(video_out, mpi->planes,mpi->stride,mpi->w,mpi->h,mpi->x,mpi->y);
|
|
else
|
|
vo_draw_frame(video_out, mpi->planes);
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
static void start_slice(struct vf_instance *vf,
|
|
mp_image_t *mpi) {
|
|
if(!video_out->config_ok) return; // vo not configured?
|
|
vo_control(video_out, VOCTRL_START_SLICE,mpi);
|
|
}
|
|
|
|
static void draw_slice(struct vf_instance *vf,
|
|
unsigned char** src, int* stride, int w,int h, int x, int y){
|
|
if(!video_out->config_ok) return; // vo not configured?
|
|
vo_draw_slice(video_out, src,stride,w,h,x,y);
|
|
}
|
|
|
|
static void uninit(struct vf_instance *vf)
|
|
{
|
|
if (vf->priv) {
|
|
/* Allow VO (which may live on to work with another instance of vf_vo)
|
|
* to get rid of numbered-mpi references that will now be invalid. */
|
|
vo_seek_reset(video_out);
|
|
#ifdef CONFIG_ASS
|
|
if (vf->priv->renderer_realaspect) {
|
|
ass_renderer_done(vf->priv->renderer_realaspect);
|
|
ass_renderer_done(vf->priv->renderer_vsfilter);
|
|
}
|
|
#endif
|
|
free(vf->priv);
|
|
}
|
|
}
|
|
//===========================================================================//
|
|
|
|
static int vf_open(vf_instance_t *vf, char *args){
|
|
vf->config=config;
|
|
vf->control=control;
|
|
vf->query_format=query_format;
|
|
vf->get_image=get_image;
|
|
vf->put_image=put_image;
|
|
vf->draw_slice=draw_slice;
|
|
vf->start_slice=start_slice;
|
|
vf->uninit=uninit;
|
|
vf->priv=calloc(1, sizeof(struct vf_priv_s));
|
|
vf->priv->vo = (struct vo *)args;
|
|
if(!video_out) return 0; // no vo ?
|
|
return 1;
|
|
}
|
|
|
|
const vf_info_t vf_info_vo = {
|
|
"libvo wrapper",
|
|
"vo",
|
|
"A'rpi",
|
|
"for internal use",
|
|
vf_open,
|
|
NULL
|
|
};
|
|
|
|
//===========================================================================//
|