mirror of https://github.com/mpv-player/mpv
cosmetics: vf_vo.c: reformat
This commit is contained in:
Uoti Urpala
parent
4f1e4eae99
commit
a3b4f64df4
|
|
@ -33,8 +33,6 @@
|
|||
#include "sub/ass_mp.h"
|
||||
#include "sub/sub.h"
|
||||
|
||||
//===========================================================================//
|
||||
|
||||
extern float sub_delay;
|
||||
|
||||
struct vf_priv_s {
|
||||
|
|
@ -48,21 +46,23 @@ struct vf_priv_s {
|
|||
};
|
||||
#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 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 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))
|
||||
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,
|
||||
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),
|
||||
|
|
@ -103,40 +103,42 @@ 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?
|
||||
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?
|
||||
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?
|
||||
if (!video_out->config_ok)
|
||||
return CONTROL_FALSE; // vo not configured?
|
||||
vo_draw_osd(video_out, data);
|
||||
return CONTROL_TRUE;
|
||||
case VFCTRL_SET_EQUALIZER:
|
||||
{
|
||||
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};
|
||||
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:
|
||||
{
|
||||
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};
|
||||
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:
|
||||
{
|
||||
case VFCTRL_INIT_EOSD: {
|
||||
vf->priv->renderer_realaspect = ass_renderer_init(data);
|
||||
if (!vf->priv->renderer_realaspect)
|
||||
return CONTROL_FALSE;
|
||||
|
|
@ -150,8 +152,7 @@ static int control(struct vf_instance *vf, int request, void* data)
|
|||
vf->priv->prev_visibility = false;
|
||||
return CONTROL_TRUE;
|
||||
}
|
||||
case VFCTRL_DRAW_EOSD:
|
||||
{
|
||||
case VFCTRL_DRAW_EOSD: {
|
||||
struct osd_state *osd = data;
|
||||
mp_eosd_images_t images = { NULL, 2 };
|
||||
ASS_Renderer *renderer;
|
||||
|
|
@ -196,7 +197,8 @@ static int control(struct vf_instance *vf, int request, void* data)
|
|||
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);
|
||||
// draw_slice() accepts stride, draw_frame() doesn't:
|
||||
if (flags)
|
||||
|
|
@ -206,42 +208,46 @@ static int query_format(struct vf_instance *vf, unsigned int fmt){
|
|||
}
|
||||
|
||||
static void get_image(struct vf_instance *vf,
|
||||
mp_image_t *mpi){
|
||||
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))
|
||||
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?
|
||||
static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
|
||||
{
|
||||
if (!video_out->config_ok)
|
||||
return 0;
|
||||
// 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);
|
||||
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?
|
||||
static void start_slice(struct vf_instance *vf, mp_image_t *mpi)
|
||||
{
|
||||
if (!video_out->config_ok)
|
||||
return;
|
||||
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?
|
||||
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_draw_slice(video_out, src, stride, w, h, x, y);
|
||||
}
|
||||
|
||||
|
|
@ -260,9 +266,9 @@ static void uninit(struct vf_instance *vf)
|
|||
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->query_format = query_format;
|
||||
|
|
@ -273,7 +279,8 @@ static int vf_open(vf_instance_t *vf, char *args){
|
|||
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 ?
|
||||
if (!video_out)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -285,5 +292,3 @@ const vf_info_t vf_info_vo = {
|
|||
vf_open,
|
||||
NULL
|
||||
};
|
||||
|
||||
//===========================================================================//
|
||||
|
|
|
|||
Loading…
Reference in New Issue