annotate libvo/aspect.h @ 29516:87897065b7d7

Fix aspect_fit to work correctly when borders need to be added on top and bottom, previous code accidentally compared against screen dimensions, resulting in cropping instead of added borders.
author reimar
date Thu, 27 Aug 2009 12:38:22 +0000
parents d3700065005f
children b1a437cdc60d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28446
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
1 /*
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
2 * This file is part of MPlayer.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
3 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
5 * it under the terms of the GNU General Public License as published by
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
7 * (at your option) any later version.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
8 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
12 * GNU General Public License for more details.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
13 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
14 * You should have received a copy of the GNU General Public License along
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
17 */
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 28051
diff changeset
18
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25927
diff changeset
19 #ifndef MPLAYER_ASPECT_H
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25927
diff changeset
20 #define MPLAYER_ASPECT_H
2053
720ca9249e4e Monitor aspect stuff.
atmos4
parents:
diff changeset
21 /* Stuff for correct aspect scaling. */
720ca9249e4e Monitor aspect stuff.
atmos4
parents:
diff changeset
22
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 2249
diff changeset
23 extern int vo_panscan_x;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 2249
diff changeset
24 extern int vo_panscan_y;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 2249
diff changeset
25 extern float vo_panscan_amount;
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 2249
diff changeset
26
28051
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 26029
diff changeset
27 void panscan_init(void);
9e739bdb049c Get rid of pointless 'extern' keywords.
diego
parents: 26029
diff changeset
28 void panscan_calc(void);
6307
72c87b2ec779 added panscan support for xmga/xvidix
pontscho
parents: 2249
diff changeset
29
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
30 void aspect_save_orig(int orgw, int orgh);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
31
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
32 void aspect_save_prescale(int prew, int preh);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
33
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
34 void aspect_save_screenres(int scrw, int scrh);
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
35
29515
d3700065005f Forgotten changes to aspect code to handle -wid with -fs.
reimar
parents: 28446
diff changeset
36 #define A_WINZOOM 2 ///< zoom to fill window size
2249
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
37 #define A_ZOOM 1
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
38 #define A_NOZOOM 0
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
39
48f0ac1e9d13 Update to new (cleaner, more bugfree, better) aspect api. vo_gl vo_gl2 and vo_xmga are untested!
atmos4
parents: 2055
diff changeset
40 void aspect(int *srcw, int *srch, int zoom);
25927
f4c83afa0683 Add aspect_fit declaration missing for w32_common.
reimar
parents: 25535
diff changeset
41 void aspect_fit(int *srcw, int *srch, int fitw, int fith);
2053
720ca9249e4e Monitor aspect stuff.
atmos4
parents:
diff changeset
42
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25927
diff changeset
43 #endif /* MPLAYER_ASPECT_H */