RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-08 18:53:30 +00:00
Code Issues Releases Wiki Activity

Move flip and softzoom to options struct

Browse Source
This commit is contained in:
Uoti Urpala 2008-04-24 07:14:05 +03:00
parent 0dc3a72273
commit 1351b50ea5
6 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cfg-common-opts.h
View File

@ -225,14 +225,14 @@
// scaling: // scaling:
{"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL}, {"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL},
{"ssf", scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"ssf", scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
{"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1, NULL}, OPT_FLAG_ON("zoom", softzoom, 0),
{"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0, NULL}, OPT_FLAG_OFF("nozoom", softzoom, 0),
{"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL}, {"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL},
{"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL}, {"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL},
{"xy", &screen_size_xy, CONF_TYPE_FLOAT, CONF_RANGE, 0.001, 4096, NULL}, {"xy", &screen_size_xy, CONF_TYPE_FLOAT, CONF_RANGE, 0.001, 4096, NULL},
{"flip", &flip, CONF_TYPE_FLAG, 0, -1, 1, NULL}, OPT_FLAG_CONSTANTS("flip", flip, 0, -1, 1),
{"noflip", &flip, CONF_TYPE_FLAG, 0, -1, 0, NULL}, OPT_FLAG_CONSTANTS("noflip", flip, 0, -1, 0),
{"tsfastparse", "-tsfastparse is no longer a valid option.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL {"tsfastparse", "-tsfastparse is no longer a valid option.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL
}, },
{"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL}, {"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL},

2
cfg-common.h
View File

@ -10,8 +10,6 @@ extern int mp_msg_module;
// codec/filter opts: (defined at libmpcodecs/vd.c) // codec/filter opts: (defined at libmpcodecs/vd.c)
extern float screen_size_xy; extern float screen_size_xy;
extern float movie_aspect; extern float movie_aspect;
extern int softzoom;
extern int flip;
/* defined in codec-cfg.c */ /* defined in codec-cfg.c */
extern char * codecs_file; extern char * codecs_file;

1
defaultopts.c
View File

@ -14,6 +14,7 @@ void set_default_mplayer_options(struct MPOpts *opts)
.video_id = -1, .video_id = -1,
.sub_id = -2, .sub_id = -2,
.playback_speed = 1., .playback_speed = 1.,
.flip = -1,
.lavc_param = (struct lavc_param){ .lavc_param = (struct lavc_param){
.workaround_bugs = 1, // autodetect .workaround_bugs = 1, // autodetect
.error_resilience = 2, .error_resilience = 2,

16
libmpcodecs/vd.c
View File

@ -111,8 +111,6 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
#include "libvo/video_out.h" #include "libvo/video_out.h"
// libvo opts: // libvo opts:
int softzoom=0;
int flip=-1;
int opt_screen_size_x=0; int opt_screen_size_x=0;
int opt_screen_size_y=0; int opt_screen_size_y=0;
float screen_size_xy=0; float screen_size_xy=0;
@ -232,14 +230,14 @@ csp_again:
sh->vfilter=vf; sh->vfilter=vf;
// autodetect flipping // autodetect flipping
if(flip==-1){ if(opts->flip==-1){
flip=0; opts->flip=0;
if(sh->codec->outflags[j]&CODECS_FLAG_FLIP) if(sh->codec->outflags[j]&CODECS_FLAG_FLIP)
if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP)) if(!(sh->codec->outflags[j]&CODECS_FLAG_NOFLIP))
flip=1; opts->flip=1;
} }
if(vo_flags&VFCAP_FLIPPED) flip^=1; if(vo_flags&VFCAP_FLIPPED) opts->flip^=1;
if(flip && !(vo_flags&VFCAP_FLIP)){ if(opts->flip && !(vo_flags&VFCAP_FLIP)){
// we need to flip, but no flipping filter avail. // we need to flip, but no flipping filter avail.
vf_add_before_vo(&vf, "flip", NULL); vf_add_before_vo(&vf, "flip", NULL);
sh->vfilter = vf; sh->vfilter = vf;
@ -292,8 +290,8 @@ csp_again:
vocfg_flags = (opts->fullscreen ? VOFLAG_FULLSCREEN:0) vocfg_flags = (opts->fullscreen ? VOFLAG_FULLSCREEN:0)
| (opts->vidmode ? VOFLAG_MODESWITCHING:0) | (opts->vidmode ? VOFLAG_MODESWITCHING:0)
| (softzoom ? VOFLAG_SWSCALE:0) | (opts->softzoom ? VOFLAG_SWSCALE:0)
| (flip ? VOFLAG_FLIPPING:0); | (opts->flip ? VOFLAG_FLIPPING:0);
// Time to config libvo! // Time to config libvo!
mp_msg(MSGT_CPLAYER,MSGL_V,"VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n", mp_msg(MSGT_CPLAYER,MSGL_V,"VO Config (%dx%d->%dx%d,flags=%d,'%s',0x%X)\n",

3
mplayer.h
View File

@ -36,9 +36,6 @@ extern char * filename;
extern int stream_cache_size; extern int stream_cache_size;
extern int autosync; extern int autosync;
// libmpcodecs:
extern int flip;
extern int frame_dropping; extern int frame_dropping;
extern int auto_quality; extern int auto_quality;

2
options.h
View File

@ -18,6 +18,8 @@ typedef struct MPOpts {
int video_id; int video_id;
int sub_id; int sub_id;
float playback_speed; float playback_speed;
int softzoom;
int flip;
struct lavc_param { struct lavc_param {
int workaround_bugs; int workaround_bugs;
int error_resilience; int error_resilience;