mirror of https://github.com/mpv-player/mpv
cosmetics: vf_vo.c: reformat
This commit is contained in:
parent
4f1e4eae99
commit
a3b4f64df4
|
@ -33,8 +33,6 @@
|
||||||
#include "sub/ass_mp.h"
|
#include "sub/ass_mp.h"
|
||||||
#include "sub/sub.h"
|
#include "sub/sub.h"
|
||||||
|
|
||||||
//===========================================================================//
|
|
||||||
|
|
||||||
extern float sub_delay;
|
extern float sub_delay;
|
||||||
|
|
||||||
struct vf_priv_s {
|
struct vf_priv_s {
|
||||||
|
@ -48,47 +46,49 @@ struct vf_priv_s {
|
||||||
};
|
};
|
||||||
#define video_out (vf->priv->vo)
|
#define video_out (vf->priv->vo)
|
||||||
|
|
||||||
static int query_format(struct vf_instance *vf, unsigned int fmt); /* forward declaration */
|
static int query_format(struct vf_instance *vf, unsigned int fmt);
|
||||||
static void draw_slice(struct vf_instance *vf, unsigned char** src, int* stride, int w,int h, int x, int y);
|
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,
|
static int config(struct vf_instance *vf,
|
||||||
int width, int height, int d_width, int d_height,
|
int width, int height, int d_width, int d_height,
|
||||||
unsigned int flags, unsigned int outfmt){
|
unsigned int flags, unsigned int outfmt)
|
||||||
|
{
|
||||||
|
|
||||||
if ((width <= 0) || (height <= 0) || (d_width <= 0) || (d_height <= 0))
|
if ((width <= 0) || (height <= 0) || (d_width <= 0) || (d_height <= 0)) {
|
||||||
{
|
mp_msg(MSGT_CPLAYER, MSGL_ERR, "VO: invalid dimensions!\n");
|
||||||
mp_msg(MSGT_CPLAYER, MSGL_ERR, "VO: invalid dimensions!\n");
|
return 0;
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const vo_info_t *info = video_out->driver->info;
|
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,
|
mp_msg(MSGT_CPLAYER, MSGL_INFO, "VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",
|
||||||
width, height,
|
info->short_name,
|
||||||
d_width, d_height,
|
width, height,
|
||||||
vo_format_name(outfmt),
|
d_width, d_height,
|
||||||
(flags&VOFLAG_FULLSCREEN)?" [fs]":"",
|
vo_format_name(outfmt),
|
||||||
(flags&VOFLAG_MODESWITCHING)?" [vm]":"",
|
(flags & VOFLAG_FULLSCREEN) ? " [fs]" : "",
|
||||||
(flags&VOFLAG_SWSCALE)?" [zoom]":"",
|
(flags & VOFLAG_MODESWITCHING) ? " [vm]" : "",
|
||||||
(flags&VOFLAG_FLIPPING)?" [flip]":"");
|
(flags & VOFLAG_SWSCALE) ? " [zoom]" : "",
|
||||||
mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name);
|
(flags & VOFLAG_FLIPPING) ? " [flip]" : "");
|
||||||
mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author);
|
mp_msg(MSGT_CPLAYER, MSGL_V, "VO: Description: %s\n", info->name);
|
||||||
if(info->comment && strlen(info->comment) > 0)
|
mp_msg(MSGT_CPLAYER, MSGL_V, "VO: Author: %s\n", info->author);
|
||||||
mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment);
|
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:
|
// save vo's stride capability for the wanted colorspace:
|
||||||
vf->default_caps=query_format(vf,outfmt);
|
vf->default_caps = query_format(vf, outfmt);
|
||||||
vf->draw_slice = (vf->default_caps & VOCAP_NOSLICES) ? NULL : draw_slice;
|
vf->draw_slice = (vf->default_caps & VOCAP_NOSLICES) ? NULL : draw_slice;
|
||||||
|
|
||||||
if (vo_config(video_out, width, height, d_width, d_height, flags, outfmt))
|
if (vo_config(video_out, width, height, d_width, d_height, flags, outfmt))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
#ifdef CONFIG_ASS
|
#ifdef CONFIG_ASS
|
||||||
vf->priv->scale_ratio = (double) d_width / d_height * height / width;
|
vf->priv->scale_ratio = (double) d_width / d_height * height / width;
|
||||||
|
|
||||||
if (vf->priv->renderer_realaspect) {
|
if (vf->priv->renderer_realaspect) {
|
||||||
mp_ass_configure(vf->priv->renderer_realaspect, vf->opts, width, height,
|
mp_ass_configure(vf->priv->renderer_realaspect, vf->opts, width, height,
|
||||||
vf->default_caps & VFCAP_EOSD_UNSCALED);
|
vf->default_caps & VFCAP_EOSD_UNSCALED);
|
||||||
mp_ass_configure(vf->priv->renderer_vsfilter, vf->opts, width, height,
|
mp_ass_configure(vf->priv->renderer_vsfilter, vf->opts, width, height,
|
||||||
vf->default_caps & VFCAP_EOSD_UNSCALED);
|
vf->default_caps & VFCAP_EOSD_UNSCALED);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -99,44 +99,46 @@ static int config(struct vf_instance *vf,
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int control(struct vf_instance *vf, int request, void* data)
|
static int control(struct vf_instance *vf, int request, void *data)
|
||||||
{
|
{
|
||||||
switch(request){
|
switch (request) {
|
||||||
case VFCTRL_GET_DEINTERLACE:
|
case VFCTRL_GET_DEINTERLACE:
|
||||||
{
|
if (!video_out)
|
||||||
if(!video_out) return CONTROL_FALSE; // vo not configured?
|
return CONTROL_FALSE; // vo not configured?
|
||||||
return vo_control(video_out, VOCTRL_GET_DEINTERLACE, data) == VO_TRUE;
|
return vo_control(video_out, VOCTRL_GET_DEINTERLACE, data) == VO_TRUE;
|
||||||
}
|
|
||||||
case VFCTRL_SET_DEINTERLACE:
|
case VFCTRL_SET_DEINTERLACE:
|
||||||
{
|
if (!video_out)
|
||||||
if(!video_out) return CONTROL_FALSE; // vo not configured?
|
return CONTROL_FALSE; // vo not configured?
|
||||||
return vo_control(video_out, VOCTRL_SET_DEINTERLACE, data) == VO_TRUE;
|
return vo_control(video_out, VOCTRL_SET_DEINTERLACE, data) == VO_TRUE;
|
||||||
}
|
|
||||||
case VFCTRL_GET_YUV_COLORSPACE:
|
case VFCTRL_GET_YUV_COLORSPACE:
|
||||||
return vo_control(video_out, VOCTRL_GET_YUV_COLORSPACE, data) == true;
|
return vo_control(video_out, VOCTRL_GET_YUV_COLORSPACE, data) == true;
|
||||||
case VFCTRL_SET_YUV_COLORSPACE:
|
case VFCTRL_SET_YUV_COLORSPACE:
|
||||||
return vo_control(video_out, VOCTRL_SET_YUV_COLORSPACE, data) == true;
|
return vo_control(video_out, VOCTRL_SET_YUV_COLORSPACE, data) == true;
|
||||||
case VFCTRL_DRAW_OSD:
|
case VFCTRL_DRAW_OSD:
|
||||||
if(!video_out->config_ok) return CONTROL_FALSE; // vo not configured?
|
if (!video_out->config_ok)
|
||||||
vo_draw_osd(video_out, data);
|
return CONTROL_FALSE; // vo not configured?
|
||||||
return CONTROL_TRUE;
|
vo_draw_osd(video_out, data);
|
||||||
case VFCTRL_SET_EQUALIZER:
|
return CONTROL_TRUE;
|
||||||
{
|
case VFCTRL_SET_EQUALIZER: {
|
||||||
vf_equalizer_t *eq=data;
|
vf_equalizer_t *eq = data;
|
||||||
if(!video_out->config_ok) return CONTROL_FALSE; // vo not configured?
|
if (!video_out->config_ok)
|
||||||
struct voctrl_set_equalizer_args param = {eq->item, eq->value};
|
return CONTROL_FALSE; // vo not configured?
|
||||||
return vo_control(video_out, VOCTRL_SET_EQUALIZER, ¶m) == VO_TRUE;
|
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:
|
case VFCTRL_GET_EQUALIZER: {
|
||||||
{
|
vf_equalizer_t *eq = data;
|
||||||
vf_equalizer_t *eq=data;
|
if (!video_out->config_ok)
|
||||||
if(!video_out->config_ok) return CONTROL_FALSE; // vo not configured?
|
return CONTROL_FALSE; // vo not configured?
|
||||||
struct voctrl_get_equalizer_args param = {eq->item, &eq->value};
|
struct voctrl_get_equalizer_args param = {
|
||||||
return vo_control(video_out, VOCTRL_GET_EQUALIZER, ¶m) == VO_TRUE;
|
eq->item, &eq->value
|
||||||
|
};
|
||||||
|
return vo_control(video_out, VOCTRL_GET_EQUALIZER, ¶m) == VO_TRUE;
|
||||||
}
|
}
|
||||||
#ifdef CONFIG_ASS
|
#ifdef CONFIG_ASS
|
||||||
case VFCTRL_INIT_EOSD:
|
case VFCTRL_INIT_EOSD: {
|
||||||
{
|
|
||||||
vf->priv->renderer_realaspect = ass_renderer_init(data);
|
vf->priv->renderer_realaspect = ass_renderer_init(data);
|
||||||
if (!vf->priv->renderer_realaspect)
|
if (!vf->priv->renderer_realaspect)
|
||||||
return CONTROL_FALSE;
|
return CONTROL_FALSE;
|
||||||
|
@ -150,10 +152,9 @@ static int control(struct vf_instance *vf, int request, void* data)
|
||||||
vf->priv->prev_visibility = false;
|
vf->priv->prev_visibility = false;
|
||||||
return CONTROL_TRUE;
|
return CONTROL_TRUE;
|
||||||
}
|
}
|
||||||
case VFCTRL_DRAW_EOSD:
|
case VFCTRL_DRAW_EOSD: {
|
||||||
{
|
|
||||||
struct osd_state *osd = data;
|
struct osd_state *osd = data;
|
||||||
mp_eosd_images_t images = {NULL, 2};
|
mp_eosd_images_t images = { NULL, 2 };
|
||||||
ASS_Renderer *renderer;
|
ASS_Renderer *renderer;
|
||||||
double scale;
|
double scale;
|
||||||
if (osd->vsfilter_aspect && vf->opts->ass_vsfilter_aspect_compat) {
|
if (osd->vsfilter_aspect && vf->opts->ass_vsfilter_aspect_compat) {
|
||||||
|
@ -169,7 +170,7 @@ static int control(struct vf_instance *vf, int request, void* data)
|
||||||
vf->priv->prev_visibility = false;
|
vf->priv->prev_visibility = false;
|
||||||
osd->ass_track_changed = false;
|
osd->ass_track_changed = false;
|
||||||
if (sub_visibility && osd->ass_track && (osd->pts != MP_NOPTS_VALUE)) {
|
if (sub_visibility && osd->ass_track && (osd->pts != MP_NOPTS_VALUE)) {
|
||||||
struct mp_eosd_res res = {0};
|
struct mp_eosd_res res = { 0 };
|
||||||
if (vo_control(video_out, VOCTRL_GET_EOSD_RES, &res) == VO_TRUE) {
|
if (vo_control(video_out, VOCTRL_GET_EOSD_RES, &res) == VO_TRUE) {
|
||||||
ass_set_frame_size(renderer, res.w, res.h);
|
ass_set_frame_size(renderer, res.w, res.h);
|
||||||
ass_set_margins(renderer, res.mt, res.mb, res.ml, res.mr);
|
ass_set_margins(renderer, res.mt, res.mb, res.ml, res.mr);
|
||||||
|
@ -181,7 +182,7 @@ static int control(struct vf_instance *vf, int request, void* data)
|
||||||
mp_ass_reload_options(vf->priv->renderer_vsfilter, vf->opts);
|
mp_ass_reload_options(vf->priv->renderer_vsfilter, vf->opts);
|
||||||
}
|
}
|
||||||
images.imgs = ass_render_frame(renderer, osd->ass_track,
|
images.imgs = ass_render_frame(renderer, osd->ass_track,
|
||||||
(osd->pts+sub_delay) * 1000 + .5,
|
(osd->pts + sub_delay) * 1000 + .5,
|
||||||
&images.changed);
|
&images.changed);
|
||||||
if (!vf->priv->prev_visibility || osd->ass_force_reload)
|
if (!vf->priv->prev_visibility || osd->ass_force_reload)
|
||||||
images.changed = 2;
|
images.changed = 2;
|
||||||
|
@ -196,53 +197,58 @@ static int control(struct vf_instance *vf, int request, void* data)
|
||||||
return CONTROL_UNKNOWN;
|
return CONTROL_UNKNOWN;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int query_format(struct vf_instance *vf, unsigned int fmt){
|
static int query_format(struct vf_instance *vf, unsigned int fmt)
|
||||||
|
{
|
||||||
int flags = vo_control(video_out, VOCTRL_QUERY_FORMAT, &fmt);
|
int flags = vo_control(video_out, VOCTRL_QUERY_FORMAT, &fmt);
|
||||||
// draw_slice() accepts stride, draw_frame() doesn't:
|
// draw_slice() accepts stride, draw_frame() doesn't:
|
||||||
if(flags)
|
if (flags)
|
||||||
if(fmt==IMGFMT_YV12 || fmt==IMGFMT_I420 || fmt==IMGFMT_IYUV)
|
if (fmt == IMGFMT_YV12 || fmt == IMGFMT_I420 || fmt == IMGFMT_IYUV)
|
||||||
flags|=VFCAP_ACCEPT_STRIDE;
|
flags |= VFCAP_ACCEPT_STRIDE;
|
||||||
return flags;
|
return flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void get_image(struct vf_instance *vf,
|
static void get_image(struct vf_instance *vf,
|
||||||
mp_image_t *mpi){
|
mp_image_t *mpi)
|
||||||
|
{
|
||||||
if (!video_out->config_ok)
|
if (!video_out->config_ok)
|
||||||
return;
|
return;
|
||||||
// GET_IMAGE is required for hardware-accelerated formats
|
// GET_IMAGE is required for hardware-accelerated formats
|
||||||
if(vo_directrendering ||
|
if (vo_directrendering || IMGFMT_IS_HWACCEL(mpi->imgfmt))
|
||||||
IMGFMT_IS_HWACCEL(mpi->imgfmt))
|
vo_control(video_out, VOCTRL_GET_IMAGE, mpi);
|
||||||
vo_control(video_out, VOCTRL_GET_IMAGE, mpi);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int put_image(struct vf_instance *vf,
|
static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
|
||||||
mp_image_t *mpi, double pts){
|
{
|
||||||
if(!video_out->config_ok) return 0; // vo not configured?
|
if (!video_out->config_ok)
|
||||||
// first check, maybe the vo/vf plugin implements draw_image using mpi:
|
return 0;
|
||||||
if (vo_draw_image(video_out, mpi, pts) >= 0)
|
// first check, maybe the vo/vf plugin implements draw_image using mpi:
|
||||||
return 1;
|
if (vo_draw_image(video_out, mpi, pts) >= 0)
|
||||||
// nope, fallback to old draw_frame/draw_slice:
|
return 1;
|
||||||
if(!(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK))){
|
// nope, fallback to old draw_frame/draw_slice:
|
||||||
// blit frame:
|
if (!(mpi->flags & (MP_IMGFLAG_DIRECT | MP_IMGFLAG_DRAW_CALLBACK))) {
|
||||||
// if(mpi->flags&MP_IMGFLAG_PLANAR)
|
// blit frame:
|
||||||
if(vf->default_caps&VFCAP_ACCEPT_STRIDE)
|
if (vf->default_caps & VFCAP_ACCEPT_STRIDE)
|
||||||
vo_draw_slice(video_out, mpi->planes,mpi->stride,mpi->w,mpi->h,mpi->x,mpi->y);
|
vo_draw_slice(video_out, mpi->planes, mpi->stride, mpi->w, mpi->h,
|
||||||
else
|
mpi->x, mpi->y);
|
||||||
vo_draw_frame(video_out, mpi->planes);
|
else
|
||||||
}
|
vo_draw_frame(video_out, mpi->planes);
|
||||||
return 1;
|
}
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void start_slice(struct vf_instance *vf,
|
static void start_slice(struct vf_instance *vf, mp_image_t *mpi)
|
||||||
mp_image_t *mpi) {
|
{
|
||||||
if(!video_out->config_ok) return; // vo not configured?
|
if (!video_out->config_ok)
|
||||||
vo_control(video_out, VOCTRL_START_SLICE,mpi);
|
return;
|
||||||
|
vo_control(video_out, VOCTRL_START_SLICE, mpi);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void draw_slice(struct vf_instance *vf,
|
static void draw_slice(struct vf_instance *vf, unsigned char **src,
|
||||||
unsigned char** src, int* stride, int w,int h, int x, int y){
|
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);
|
if (!video_out->config_ok)
|
||||||
|
return;
|
||||||
|
vo_draw_slice(video_out, src, stride, w, h, x, y);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void uninit(struct vf_instance *vf)
|
static void uninit(struct vf_instance *vf)
|
||||||
|
@ -260,20 +266,21 @@ static void uninit(struct vf_instance *vf)
|
||||||
free(vf->priv);
|
free(vf->priv);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//===========================================================================//
|
|
||||||
|
|
||||||
static int vf_open(vf_instance_t *vf, char *args){
|
static int vf_open(vf_instance_t *vf, char *args)
|
||||||
vf->config=config;
|
{
|
||||||
vf->control=control;
|
vf->config = config;
|
||||||
vf->query_format=query_format;
|
vf->control = control;
|
||||||
vf->get_image=get_image;
|
vf->query_format = query_format;
|
||||||
vf->put_image=put_image;
|
vf->get_image = get_image;
|
||||||
vf->draw_slice=draw_slice;
|
vf->put_image = put_image;
|
||||||
vf->start_slice=start_slice;
|
vf->draw_slice = draw_slice;
|
||||||
vf->uninit=uninit;
|
vf->start_slice = start_slice;
|
||||||
vf->priv=calloc(1, sizeof(struct vf_priv_s));
|
vf->uninit = uninit;
|
||||||
|
vf->priv = calloc(1, sizeof(struct vf_priv_s));
|
||||||
vf->priv->vo = (struct vo *)args;
|
vf->priv->vo = (struct vo *)args;
|
||||||
if(!video_out) return 0; // no vo ?
|
if (!video_out)
|
||||||
|
return 0;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -285,5 +292,3 @@ const vf_info_t vf_info_vo = {
|
||||||
vf_open,
|
vf_open,
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
//===========================================================================//
|
|
||||||
|
|
Loading…
Reference in New Issue