Mercurial > mplayer.hg
annotate libmpcodecs/vf_dsize.c @ 32204:0a81c931ecb5
Mark functs not used outside of the file as static, remove from header; fixes:
libvo/vesa_lvo.c:187: warning: no previous prototype for 'vlvo_draw_slice'
libvo/vesa_lvo.c:205: warning: no previous prototype for 'vlvo_draw_frame'
libvo/vesa_lvo.c:214: warning: no previous prototype for 'vlvo_flip_page'
libvo/vesa_lvo.c:275: warning: no previous prototype for 'vlvo_draw_osd'
libvo/vesa_lvo.c:312: warning: no previous prototype for 'vlvo_query_info'
author | diego |
---|---|
date | Fri, 17 Sep 2010 10:31:24 +0000 |
parents | a972c1a4a012 |
children | 7af3e6f901fd |
rev | line source |
---|---|
30421
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
1 /* |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
2 * This file is part of MPlayer. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
3 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
4 * MPlayer is free software; you can redistribute it and/or modify |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
5 * it under the terms of the GNU General Public License as published by |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
6 * the Free Software Foundation; either version 2 of the License, or |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
7 * (at your option) any later version. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
8 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
9 * MPlayer is distributed in the hope that it will be useful, |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
12 * GNU General Public License for more details. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
13 * |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
14 * You should have received a copy of the GNU General Public License along |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
15 * with MPlayer; if not, write to the Free Software Foundation, Inc., |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
17 */ |
bbb6ebec87a0
Add missing license headers to all files in the libmpcodecs directory.
diego
parents:
25221
diff
changeset
|
18 |
10006 | 19 #include <stdio.h> |
20 #include <stdlib.h> | |
21 #include <string.h> | |
22 #include <inttypes.h> | |
23 | |
17012 | 24 #include "config.h" |
25 #include "mp_msg.h" | |
10006 | 26 |
27 #include "img_format.h" | |
28 #include "mp_image.h" | |
29 #include "vf.h" | |
30 | |
31 struct vf_priv_s { | |
32 int w, h; | |
16040 | 33 int method; // aspect method, 0 -> downscale, 1-> upscale. +2 -> original aspect. |
34 int round; | |
10006 | 35 float aspect; |
36 }; | |
37 | |
30642
a972c1a4a012
cosmetics: Rename struct vf_instance_s --> vf_instance.
diego
parents:
30638
diff
changeset
|
38 static int config(struct vf_instance *vf, |
10006 | 39 int width, int height, int d_width, int d_height, |
40 unsigned int flags, unsigned int outfmt) | |
41 { | |
16040 | 42 if (vf->priv->aspect < 0.001) { // did the user input aspect or w,h params |
43 if (vf->priv->w == 0) vf->priv->w = d_width; | |
44 if (vf->priv->h == 0) vf->priv->h = d_height; | |
45 if (vf->priv->w == -1) vf->priv->w = width; | |
46 if (vf->priv->h == -1) vf->priv->h = height; | |
47 if (vf->priv->w == -2) vf->priv->w = vf->priv->h * (double)d_width / d_height; | |
48 if (vf->priv->w == -3) vf->priv->w = vf->priv->h * (double)width / height; | |
49 if (vf->priv->h == -2) vf->priv->h = vf->priv->w * (double)d_height / d_width; | |
50 if (vf->priv->h == -3) vf->priv->h = vf->priv->w * (double)height / width; | |
51 if (vf->priv->method > -1) { | |
17227
c2b50fc5d86a
I screwed up keep aspect param, made behavior the opposite of man page.
ods15
parents:
17012
diff
changeset
|
52 double aspect = (vf->priv->method & 2) ? ((double)height / width) : ((double)d_height / d_width); |
16040 | 53 if ((vf->priv->h > vf->priv->w * aspect) ^ (vf->priv->method & 1)) { |
54 vf->priv->h = vf->priv->w * aspect; | |
55 } else { | |
56 vf->priv->w = vf->priv->h / aspect; | |
57 } | |
58 } | |
59 if (vf->priv->round > 1) { // round up | |
60 vf->priv->w += (vf->priv->round - 1 - (vf->priv->w - 1) % vf->priv->round); | |
61 vf->priv->h += (vf->priv->round - 1 - (vf->priv->h - 1) % vf->priv->round); | |
62 } | |
10006 | 63 d_width = vf->priv->w; |
64 d_height = vf->priv->h; | |
65 } else { | |
66 if (vf->priv->aspect * height > width) { | |
18390 | 67 d_width = height * vf->priv->aspect + .5; |
10006 | 68 d_height = height; |
69 } else { | |
18390 | 70 d_height = width / vf->priv->aspect + .5; |
10006 | 71 d_width = width; |
72 } | |
73 } | |
74 return vf_next_config(vf, width, height, d_width, d_height, flags, outfmt); | |
75 } | |
76 | |
16040 | 77 static void uninit(vf_instance_t *vf) { |
78 free(vf->priv); | |
79 vf->priv = NULL; | |
80 } | |
81 | |
30638
a7b908875c14
Rename open() vf initialization function to vf_open().
diego
parents:
30633
diff
changeset
|
82 static int vf_open(vf_instance_t *vf, char *args) |
10006 | 83 { |
84 vf->config = config; | |
85 vf->draw_slice = vf_next_draw_slice; | |
16040 | 86 vf->uninit = uninit; |
10006 | 87 //vf->default_caps = 0; |
88 vf->priv = calloc(sizeof(struct vf_priv_s), 1); | |
16040 | 89 vf->priv->aspect = 0.; |
90 vf->priv->w = -1; | |
91 vf->priv->h = -1; | |
92 vf->priv->method = -1; | |
93 vf->priv->round = 1; | |
10006 | 94 if (args) { |
95 if (strchr(args, '/')) { | |
96 int w, h; | |
97 sscanf(args, "%d/%d", &w, &h); | |
98 vf->priv->aspect = (float)w/h; | |
99 } else if (strchr(args, '.')) { | |
100 sscanf(args, "%f", &vf->priv->aspect); | |
101 } else { | |
16040 | 102 sscanf(args, "%d:%d:%d:%d", &vf->priv->w, &vf->priv->h, &vf->priv->method, &vf->priv->round); |
10006 | 103 } |
104 } | |
16040 | 105 if ((vf->priv->aspect < 0.) || (vf->priv->w < -3) || (vf->priv->h < -3) || |
106 ((vf->priv->w < -1) && (vf->priv->h < -1)) || | |
107 (vf->priv->method < -1) || (vf->priv->method > 3) || | |
108 (vf->priv->round < 0)) { | |
109 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); | |
110 free(vf->priv); vf->priv = NULL; | |
111 return -1; | |
112 } | |
10006 | 113 return 1; |
114 } | |
115 | |
25221 | 116 const vf_info_t vf_info_dsize = { |
10006 | 117 "reset displaysize/aspect", |
118 "dsize", | |
119 "Rich Felker", | |
120 "", | |
30638
a7b908875c14
Rename open() vf initialization function to vf_open().
diego
parents:
30633
diff
changeset
|
121 vf_open, |
10006 | 122 NULL |
123 }; |