diff options
author | wm4 <wm4@nowhere> | 2013-01-22 13:28:31 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-01-23 10:55:00 +0100 |
commit | f2dcdca0c2dc5f904323659b65b29a2b6f00fd88 (patch) | |
tree | 0ae1f6d9f1ef82e34795965327bb8ab076eb7b2c /video/filter/vf.c | |
parent | c9396c0aabb6c1b710e1cdaa3fb123182dc91279 (diff) | |
download | mpv-f2dcdca0c2dc5f904323659b65b29a2b6f00fd88.tar.bz2 mpv-f2dcdca0c2dc5f904323659b65b29a2b6f00fd88.tar.xz |
video: move handling of -x/-y/-xy options to VO
Now the calculations of the final display size are done after the filter
chain. This makes the difference between display aspect ratio and window
size a bit more clear, especially in the -xy case.
With an empty filter chain, the behavior of the options should be the
same, except that they don't affect vo_image and vo_lavc anymore.
Diffstat (limited to 'video/filter/vf.c')
-rw-r--r-- | video/filter/vf.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/video/filter/vf.c b/video/filter/vf.c index a4b78ab5ab..5b466031c7 100644 --- a/video/filter/vf.c +++ b/video/filter/vf.c @@ -514,16 +514,12 @@ void vf_uninit_filter_chain(vf_instance_t *vf) } } -// When cropping an image that had old_w/old_h/*d_width/*d_height to the new -// size new_w/new_h, adjust *d_width/*d_height such that the new image has -// the same pixel aspect ratio. -void vf_rescale_dsize(struct vf_instance *vf, int *d_width, int *d_height, - int old_w, int old_h, int new_w, int new_h) +// When changing the size of an image that had old_w/old_h with +// DAR *d_width/*d_height to the new size new_w/new_h, adjust +// *d_width/*d_height such that the new image has the same pixel aspect ratio. +void vf_rescale_dsize(int *d_width, int *d_height, int old_w, int old_h, + int new_w, int new_h) { - // No idea what this is about - if (vf->opts->screen_size_x || vf->opts->screen_size_y) - return; - *d_width = *d_width * new_w / old_w; *d_height = *d_height * new_h / old_h; } |