mirror/mpv
0
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2024-09-20 20:03:10 +02:00
Code

options: remove --panscanrange option

Browse Source 
This option allowed you to extend the range of the panscan controls, so
that you could essentially use it to scale the video. This will be
replaced by a separate option to set the zoom factor directly.
This commit is contained in:
wm4 2013-06-14 23:59:43 +02:00
parent 4579cce768
commit 67704e2977
4 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DOCS/man/en/options.rst
View File

@ -1485,14 +1485,6 @@
controls how much of the image is cropped. May not work with all video controls how much of the image is cropped. May not work with all video
output drivers. output drivers.
``--panscanrange=<-19.0-99.0>``
(experimental)
Change the range of the pan-and-scan functionality (default: 1). Positive
values mean multiples of the default range. Negative numbers mean you can
zoom in up to a factor of ``--panscanrange=+1``. E.g. ``--panscanrange=-3``
allows a zoom factor of up to 4. This feature is experimental. Do not
report bugs unless you are using ``--vo=opengl``.
``--playing-msg=<string>`` ``--playing-msg=<string>``
Print out a string after starting playback. The string is expanded for Print out a string after starting playback. The string is expanded for
properties, e.g. ``--playing-msg=file: ${filename}`` will print the string properties, e.g. ``--playing-msg=file: ${filename}`` will print the string

2
mpvcore/options.c
View File

@ -581,7 +581,6 @@ const m_option_t mp_opts[] = {
OPT_INTRANGE("fsmode-dontuse", vo.fsmode, 0, 31, 4096), OPT_INTRANGE("fsmode-dontuse", vo.fsmode, 0, 31, 4096),
OPT_FLAG("native-keyrepeat", vo.native_keyrepeat, 0), OPT_FLAG("native-keyrepeat", vo.native_keyrepeat, 0),
OPT_FLOATRANGE("panscan", vo.panscan, 0, 0.0, 1.0), OPT_FLOATRANGE("panscan", vo.panscan, 0, 0.0, 1.0),
OPT_FLOATRANGE("panscanrange", vo.panscanrange, 0, -19.0, 99.0),
OPT_FLAG("force-rgba-osd-rendering", force_rgba_osd, 0), OPT_FLAG("force-rgba-osd-rendering", force_rgba_osd, 0),
OPT_CHOICE("colormatrix", requested_colorspace, 0, OPT_CHOICE("colormatrix", requested_colorspace, 0,
({"auto", MP_CSP_AUTO}, ({"auto", MP_CSP_AUTO},
@ -747,7 +746,6 @@ const struct MPOpts mp_default_opts = {
.video_driver_list = NULL, .video_driver_list = NULL,
.cursor_autohide_delay = 1000, .cursor_autohide_delay = 1000,
.monitor_pixel_aspect = 1.0, .monitor_pixel_aspect = 1.0,
.panscanrange = 1.0,
.screen_id = -1, .screen_id = -1,
.fsscreen_id = -1, .fsscreen_id = -1,
.nomouse_input = 0, .nomouse_input = 0,

1
mpvcore/options.h
View File

@ -19,7 +19,6 @@ typedef struct mp_vo_opts {
int native_keyrepeat; int native_keyrepeat;
float panscan; float panscan;
float panscanrange;
struct m_geometry geometry; struct m_geometry geometry;
struct m_geometry autofit; struct m_geometry autofit;

11
video/out/aspect.c
View File

@ -96,14 +96,9 @@ void aspect_calc_panscan(struct vo *vo, int *out_w, int *out_h)
int fwidth, fheight; int fwidth, fheight;
aspect_calc(vo, &fwidth, &fheight); aspect_calc(vo, &fwidth, &fheight);
int vo_panscan_area; int vo_panscan_area = vo->dheight - fheight;
if (opts->panscanrange > 0) { if (!vo_panscan_area)
vo_panscan_area = vo->dheight - fheight; vo_panscan_area = vo->dwidth - fwidth;
if (!vo_panscan_area)
vo_panscan_area = vo->dwidth - fwidth;
vo_panscan_area *= opts->panscanrange;
} else
vo_panscan_area = -opts->panscanrange * vo->dheight;
*out_w = fwidth + vo_panscan_area * opts->panscan * fwidth / fheight; *out_w = fwidth + vo_panscan_area * opts->panscan * fwidth / fheight;
*out_h = fheight + vo_panscan_area * opts->panscan; *out_h = fheight + vo_panscan_area * opts->panscan;