RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-03-23 20:00:56 +00:00
Code Issues Releases Wiki Activity

Move movie_aspect to options struct

Browse Source
This commit is contained in:
Uoti Urpala 2008-04-24 07:36:43 +03:00
parent 0a39709c15
commit 60e2c8604d
11 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cfg-common-opts.h
View File

@ -227,8 +227,8 @@
{"ssf", scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, {"ssf", scaler_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
OPT_FLAG_ON("zoom", softzoom, 0), OPT_FLAG_ON("zoom", softzoom, 0),
OPT_FLAG_OFF("nozoom", softzoom, 0), OPT_FLAG_OFF("nozoom", softzoom, 0),
{"aspect", &movie_aspect, CONF_TYPE_FLOAT, CONF_RANGE, 0.2, 3.0, NULL}, OPT_FLOATRANGE("aspect", movie_aspect, 0, 0.2, 3.0),
{"noaspect", &movie_aspect, CONF_TYPE_FLAG, 0, 0, 0, NULL}, OPT_FLAG_CONSTANTS("noaspect", movie_aspect, 0, 0, 0),
OPT_FLOATRANGE("xy", screen_size_xy, 0, 0.001, 4096), OPT_FLOATRANGE("xy", screen_size_xy, 0, 0.001, 4096),
OPT_FLAG_CONSTANTS("flip", flip, 0, -1, 1), OPT_FLAG_CONSTANTS("flip", flip, 0, -1, 1),

3
cfg-common.h
View File

@ -7,9 +7,6 @@ extern char *mp_msg_charset;
extern int mp_msg_color; extern int mp_msg_color;
extern int mp_msg_module; extern int mp_msg_module;
// codec/filter opts: (defined at libmpcodecs/vd.c)
extern float movie_aspect;
/* defined in codec-cfg.c */ /* defined in codec-cfg.c */
extern char * codecs_file; extern char * codecs_file;

4
command.c
View File

@ -2413,9 +2413,9 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
case MP_CMD_SWITCH_RATIO: case MP_CMD_SWITCH_RATIO:
if (cmd->nargs == 0 || cmd->args[0].v.f == -1) if (cmd->nargs == 0 || cmd->args[0].v.f == -1)
movie_aspect = (float) sh_video->disp_w / sh_video->disp_h; opts->movie_aspect = (float) sh_video->disp_w / sh_video->disp_h;
else else
movie_aspect = cmd->args[0].v.f; opts->movie_aspect = cmd->args[0].v.f;
mpcodecs_config_vo(sh_video, sh_video->disp_w, sh_video->disp_h, 0); mpcodecs_config_vo(sh_video, sh_video->disp_w, sh_video->disp_h, 0);
break; break;

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.,
.movie_aspect = -1.,
.flip = -1, .flip = -1,
.lavc_param = (struct lavc_param){ .lavc_param = (struct lavc_param){
.workaround_bugs = 1, // autodetect .workaround_bugs = 1, // autodetect

3
libmpcodecs/vd.c
View File

@ -111,7 +111,6 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
#include "libvo/video_out.h" #include "libvo/video_out.h"
// libvo opts: // libvo opts:
float movie_aspect=-1.0;
int vo_flags=0; int vo_flags=0;
int vd_use_slices=1; int vd_use_slices=1;
@ -242,7 +241,7 @@ csp_again:
// time to do aspect ratio corrections... // time to do aspect ratio corrections...
if(movie_aspect>-1.0) sh->aspect = movie_aspect; // cmdline overrides autodetect if(opts->movie_aspect>-1.0) sh->aspect = opts->movie_aspect; // cmdline overrides autodetect
else if(sh->stream_aspect!=0.0) sh->aspect = sh->stream_aspect; else if(sh->stream_aspect!=0.0) sh->aspect = sh->stream_aspect;
// if(!sh->aspect) sh->aspect=1.0; // if(!sh->aspect) sh->aspect=1.0;

1
libvo/aspect.c
View File

@ -22,7 +22,6 @@ float vo_panscanrange = 1.0;
float force_monitor_aspect=0; float force_monitor_aspect=0;
float monitor_aspect=0; float monitor_aspect=0;
float monitor_pixel_aspect=1; float monitor_pixel_aspect=1;
extern float movie_aspect;
static struct { static struct {
int orgw; // real width int orgw; // real width

1
libvo/old_vo_defines.h
View File

@ -18,4 +18,5 @@
#define vo_screenwidth global_vo->opts->vo_screenwidth #define vo_screenwidth global_vo->opts->vo_screenwidth
#define vo_screenheight global_vo->opts->vo_screenheight #define vo_screenheight global_vo->opts->vo_screenheight
#define vidmode global_vo->opts->vidmode #define vidmode global_vo->opts->vidmode
#define movie_aspect global_vo->opts->movie_aspect
#endif #endif

1
libvo/vo_dxr2.c
View File

@ -29,7 +29,6 @@
extern float monitor_aspect; extern float monitor_aspect;
extern float movie_aspect;
int dxr2_fd = -1; int dxr2_fd = -1;

1
libvo/vo_quartz.c
View File

@ -71,7 +71,6 @@ static int get_image_done = 0;
static int vo_quartz_fs; // we are in fullscreen static int vo_quartz_fs; // we are in fullscreen
extern float monitor_aspect; extern float monitor_aspect;
extern float movie_aspect;
static float old_movie_aspect; static float old_movie_aspect;
static int winLevel = 1; static int winLevel = 1;

1
mplayer.h
View File

@ -23,7 +23,6 @@ extern unsigned int osd_visible;
extern char * font_name; extern char * font_name;
extern char * sub_font_name; extern char * sub_font_name;
extern float font_factor; extern float font_factor;
extern float movie_aspect;
extern double force_fps; extern double force_fps;
//extern char **sub_name; //extern char **sub_name;

1
options.h
View File

@ -21,6 +21,7 @@ typedef struct MPOpts {
int sub_id; int sub_id;
float playback_speed; float playback_speed;
int softzoom; int softzoom;
float movie_aspect;
float screen_size_xy; float screen_size_xy;
int flip; int flip;
struct lavc_param { struct lavc_param {