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.

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;
 }