diff options
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 54 | ||||
| -rw-r--r-- | libmpcodecs/vf_dsize.c | 46 |
2 files changed, 96 insertions, 4 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index ed33a23849..fe152dd6b5 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -4354,7 +4354,7 @@ spal: 768x576 (square pixel PAL) .RE . .TP -.B dsize[=aspect|w:h] +.B dsize[=aspect|w:h:aspect-method:r] Changes the intended display size/\:aspect at an arbitrary point in the filter chain. Aspect can be given as a fraction (4/\:3) or floating point number @@ -4366,6 +4366,58 @@ Note that this filter does do any scaling itself; it just affects what later scalers (software or hardware) will do when auto-scaling to correct aspect. +.RSs +.IPs <w>,<h> +New display width and height. +Can also be these special values: +.RSss + 0: original display width and height +.br +-1: original video width and height (default) +.br +-2: Calculate w/\:h using the other dimension and the original display +aspect ratio. +.br +-3: Calculate w/\:h using the other dimension and the original video +aspect ratio. +.REss +.sp 1 +.I EXAMPLE: +.PD 0 +.RSs +.IP dsize=800:-2 +Specifies a display resolution of 800x600 for a 4/3 aspect video, or +800x450 for a 16/9 aspect video. +.RE +.IPs <aspect\-method> +Modifies width and height according to original aspect ratios. +.RSss +-1: Ignore original aspect ratio (default). +.br + 0: Keep display aspect ratio by using <w> and <h> as maximum +resolution. +.br + 1: Keep display aspect ratio by using <w> and <h> as minimum +resolution. +.br + 2: Keep video aspect ratio by using <w> and <h> as maximum +resolution. +.br + 3: Keep video aspect ratio by using <w> and <h> as minimum +resolution. +.REss +.sp 1 +.I EXAMPLE: +.PD 0 +.RSs +.IP dsize=800:600:0 +Specifies a display resolution of at most 800x600, or smaller, in order +to keep aspect. +.RE +.PD 1 +.IPs <r> +Rounds up to make both width and height divisible by <r> (default: 1). +.RE . .TP .B yuy2\ \ \ diff --git a/libmpcodecs/vf_dsize.c b/libmpcodecs/vf_dsize.c index 7806dc81d3..c6de0e73ee 100644 --- a/libmpcodecs/vf_dsize.c +++ b/libmpcodecs/vf_dsize.c @@ -12,6 +12,8 @@ struct vf_priv_s { int w, h; + int method; // aspect method, 0 -> downscale, 1-> upscale. +2 -> original aspect. + int round; float aspect; }; @@ -19,7 +21,27 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) { - if (vf->priv->w && vf->priv->h) { + if (vf->priv->aspect < 0.001) { // did the user input aspect or w,h params + if (vf->priv->w == 0) vf->priv->w = d_width; + if (vf->priv->h == 0) vf->priv->h = d_height; + if (vf->priv->w == -1) vf->priv->w = width; + if (vf->priv->h == -1) vf->priv->h = height; + if (vf->priv->w == -2) vf->priv->w = vf->priv->h * (double)d_width / d_height; + if (vf->priv->w == -3) vf->priv->w = vf->priv->h * (double)width / height; + if (vf->priv->h == -2) vf->priv->h = vf->priv->w * (double)d_height / d_width; + if (vf->priv->h == -3) vf->priv->h = vf->priv->w * (double)height / width; + if (vf->priv->method > -1) { + double aspect = (vf->priv->method & 2) ? ((double)d_height / d_width) : ((double)height / width); + if ((vf->priv->h > vf->priv->w * aspect) ^ (vf->priv->method & 1)) { + vf->priv->h = vf->priv->w * aspect; + } else { + vf->priv->w = vf->priv->h / aspect; + } + } + if (vf->priv->round > 1) { // round up + vf->priv->w += (vf->priv->round - 1 - (vf->priv->w - 1) % vf->priv->round); + vf->priv->h += (vf->priv->round - 1 - (vf->priv->h - 1) % vf->priv->round); + } d_width = vf->priv->w; d_height = vf->priv->h; } else { @@ -34,13 +56,23 @@ static int config(struct vf_instance_s* vf, return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt); } +static void uninit(vf_instance_t *vf) { + free(vf->priv); + vf->priv = NULL; +} + static int open(vf_instance_t *vf, char* args) { vf->config = config; vf->draw_slice = vf_next_draw_slice; + vf->uninit = uninit; //vf->default_caps = 0; vf->priv = calloc(sizeof(struct vf_priv_s), 1); - vf->priv->aspect = 4.0/3.0; + vf->priv->aspect = 0.; + vf->priv->w = -1; + vf->priv->h = -1; + vf->priv->method = -1; + vf->priv->round = 1; if (args) { if (strchr(args, '/')) { int w, h; @@ -49,9 +81,17 @@ static int open(vf_instance_t *vf, char* args) } else if (strchr(args, '.')) { sscanf(args, "%f", &vf->priv->aspect); } else { - sscanf(args, "%d:%d", &vf->priv->w, &vf->priv->h); + sscanf(args, "%d:%d:%d:%d", &vf->priv->w, &vf->priv->h, &vf->priv->method, &vf->priv->round); } } + if ((vf->priv->aspect < 0.) || (vf->priv->w < -3) || (vf->priv->h < -3) || + ((vf->priv->w < -1) && (vf->priv->h < -1)) || + (vf->priv->method < -1) || (vf->priv->method > 3) || + (vf->priv->round < 0)) { + mp_msg(MSGT_VFILTER, MSGL_ERR, "[dsize] Illegal value(s): aspect: %f w: %d h: %d aspect_method: %d round: %d\n", vf->priv->aspect, vf->priv->w, vf->priv->h, vf->priv->method, vf->priv->round); + free(vf->priv); vf->priv = NULL; + return -1; + } return 1; } |