diff options
| author | wm4 <wm4@nowhere> | 2014-01-22 00:26:01 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-01-22 00:35:52 +0100 |
| commit | 38d29c487c2fba8aa0c568b5f2d346498b985e39 (patch) | |
| tree | d24d9a457788409953ba5a493b3f18c47e121a05 /video/out/aspect.h | |
| parent | 0f2acd4a80be53638c19bfee2fcac2e72c06fa29 (diff) | |
| download | mpv-38d29c487c2fba8aa0c568b5f2d346498b985e39.tar.bz2 mpv-38d29c487c2fba8aa0c568b5f2d346498b985e39.tar.xz | |
vo: merge get rid of vo.aspdat field
Rename vo_get_src_dst_rects() to mp_get_src_dst_rects() and make it
independent from the VO (it takes a comical amount of parameters now to
pass all required state). Add a convenience wrapper with the name
vo_get_src_dst_rects() to vo.c. Replace all aspdat and vo usages with
immediate parameters.
Functionally, nothing should change, except that the window size is
clamped to a minimum of size 1 much earlier, and some log messages
change the prefix (don't bother with vo.vo_log stuff).
Diffstat (limited to 'video/out/aspect.h')
| -rw-r--r-- | video/out/aspect.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/video/out/aspect.h b/video/out/aspect.h index afff7e5dcb..db8aa37040 100644 --- a/video/out/aspect.h +++ b/video/out/aspect.h @@ -18,11 +18,17 @@ #ifndef MPLAYER_ASPECT_H #define MPLAYER_ASPECT_H -/* Stuff for correct aspect scaling. */ -struct vo; - -void aspect_save_videores(struct vo *vo, int w, int h, int d_w, int d_h); -void aspect_calc_panscan(struct vo *vo, int *out_w, int *out_h); +struct mp_log; +struct mp_vo_opts; +struct mp_image_params; +struct mp_rect; +struct mp_osd_res; +void mp_get_src_dst_rects(struct mp_log *log, struct mp_vo_opts *opts, + struct mp_image_params *video, + int window_w, int window_h, double monitor_par, + struct mp_rect *out_src, + struct mp_rect *out_dst, + struct mp_osd_res *out_osd); #endif /* MPLAYER_ASPECT_H */ |