annotate libmpcodecs/vf_vo.c @ 30488:595410bd114e

libass: fix PAR correction
author greg
date Tue, 09 Feb 2010 17:36:24 +0000
parents bbb6ebec87a0
children a7b908875c14
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30421
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30065
diff changeset
1 /*
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30065
diff changeset
2 * This file is part of MPlayer.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30065
diff changeset
3 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30065
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: 30065
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: 30065
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: 30065
diff changeset
7 * (at your option) any later version.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30065
diff changeset
8 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30065
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: 30065
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: 30065
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: 30065
diff changeset
12 * GNU General Public License for more details.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30065
diff changeset
13 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30065
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: 30065
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: 30065
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: 30065
diff changeset
17 */
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30065
diff changeset
18
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
19 #include <stdio.h>
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
20 #include <stdlib.h>
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
21 #include <string.h>
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
22
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 15212
diff changeset
23 #include "config.h"
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 15212
diff changeset
24 #include "mp_msg.h"
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
25
5607
1972c3475d93 mp_image.h and img_format.h moved to libmpcodecs
arpi
parents: 5565
diff changeset
26 #include "mp_image.h"
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
27 #include "vf.h"
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
28
17012
6ff3379a0862 Unify include path handling, -I.. is in CFLAGS.
diego
parents: 15212
diff changeset
29 #include "libvo/video_out.h"
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
30
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26754
diff changeset
31 #ifdef CONFIG_ASS
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
32 #include "libass/ass_mp.h"
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
33 extern ass_track_t* ass_track;
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
34 #endif
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
35
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
36 //===========================================================================//
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
37
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
38 extern int sub_visibility;
20197
acc196e4b3cc Fix typo in sub_delay external specification.
eugeni
parents: 19582
diff changeset
39 extern float sub_delay;
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
40
20906
160974ca8bf2 Use vf control for reading pts from vf_vo
uau
parents: 20706
diff changeset
41 struct vf_priv_s {
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
42 double pts;
25219
e82ecde2cbd4 Mark several uses of vo_functions_t as const to stop some of the current
reimar
parents: 23134
diff changeset
43 const vo_functions_t *vo;
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26754
diff changeset
44 #ifdef CONFIG_ASS
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20446
diff changeset
45 ass_renderer_t* ass_priv;
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 21427
diff changeset
46 int prev_visibility;
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
47 #endif
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
48 };
20906
160974ca8bf2 Use vf control for reading pts from vf_vo
uau
parents: 20706
diff changeset
49 #define video_out (vf->priv->vo)
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
50
7731
1f8961f2b34c compiler warning fixes
arpi
parents: 7687
diff changeset
51 static int query_format(struct vf_instance_s* vf, unsigned int fmt); /* forward declaration */
28611
00c0123b6df3 Add VOCAP_NOSLICES and use it to allow vo_vdpau to not support slices for
reimar
parents: 28546
diff changeset
52 static void draw_slice(struct vf_instance_s* vf, unsigned char** src, int* stride, int w,int h, int x, int y);
7731
1f8961f2b34c compiler warning fixes
arpi
parents: 7687
diff changeset
53
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
54 static int config(struct vf_instance_s* vf,
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
55 int width, int height, int d_width, int d_height,
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
56 unsigned int flags, unsigned int outfmt){
5559
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
57
6197
48d0e89e8b21 report error if bad dimensions requested (<=0)
alex
parents: 6157
diff changeset
58 if ((width <= 0) || (height <= 0) || (d_width <= 0) || (d_height <= 0))
48d0e89e8b21 report error if bad dimensions requested (<=0)
alex
parents: 6157
diff changeset
59 {
48d0e89e8b21 report error if bad dimensions requested (<=0)
alex
parents: 6157
diff changeset
60 mp_msg(MSGT_CPLAYER, MSGL_ERR, "VO: invalid dimensions!\n");
48d0e89e8b21 report error if bad dimensions requested (<=0)
alex
parents: 6157
diff changeset
61 return 0;
48d0e89e8b21 report error if bad dimensions requested (<=0)
alex
parents: 6157
diff changeset
62 }
48d0e89e8b21 report error if bad dimensions requested (<=0)
alex
parents: 6157
diff changeset
63
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7731
diff changeset
64 if(video_out->info)
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7731
diff changeset
65 { const vo_info_t *info = video_out->info;
5559
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
66 mp_msg(MSGT_CPLAYER,MSGL_INFO,"VO: [%s] %dx%d => %dx%d %s %s%s%s%s\n",info->short_name,
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
67 width, height,
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
68 d_width, d_height,
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
69 vo_format_name(outfmt),
15212
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 10052
diff changeset
70 (flags&VOFLAG_FULLSCREEN)?" [fs]":"",
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 10052
diff changeset
71 (flags&VOFLAG_MODESWITCHING)?" [vm]":"",
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 10052
diff changeset
72 (flags&VOFLAG_SWSCALE)?" [zoom]":"",
05aa13cdf92f replace VO and VF numeric flags with #defined identifiers
henry
parents: 10052
diff changeset
73 (flags&VOFLAG_FLIPPING)?" [flip]":"");
5559
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
74 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Description: %s\n",info->name);
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
75 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Author: %s\n", info->author);
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
76 if(info->comment && strlen(info->comment) > 0)
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
77 mp_msg(MSGT_CPLAYER,MSGL_V,"VO: Comment: %s\n", info->comment);
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
78 }
7a73663095fc print VO info
arpi
parents: 5519
diff changeset
79
7687
a9a19a991a70 support for VFCAP_ACCEPT_STRIDE in vo drivers
arpi
parents: 7368
diff changeset
80 // save vo's stride capability for the wanted colorspace:
23134
1de2a46a0987 Add -ass-hinting option for setting font hinting method.
eugeni
parents: 22232
diff changeset
81 vf->default_caps=query_format(vf,outfmt);
28611
00c0123b6df3 Add VOCAP_NOSLICES and use it to allow vo_vdpau to not support slices for
reimar
parents: 28546
diff changeset
82 vf->draw_slice = (vf->default_caps & VOCAP_NOSLICES) ? NULL : draw_slice;
7687
a9a19a991a70 support for VFCAP_ACCEPT_STRIDE in vo drivers
arpi
parents: 7368
diff changeset
83
22232
d0b60d14d8d7 Move common vo initialization code to video_out.c
reimar
parents: 21506
diff changeset
84 if(config_video_out(video_out,width,height,d_width,d_height,flags,"MPlayer",outfmt))
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
85 return 0;
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 7731
diff changeset
86
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26754
diff changeset
87 #ifdef CONFIG_ASS
20446
e8adc3778348 Split ass_configure() into several smaller functions.
eugeni
parents: 20197
diff changeset
88 if (vf->priv->ass_priv)
23134
1de2a46a0987 Add -ass-hinting option for setting font hinting method.
eugeni
parents: 22232
diff changeset
89 ass_configure(vf->priv->ass_priv, width, height, !!(vf->default_caps & VFCAP_EOSD_UNSCALED));
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
90 #endif
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
91
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5508
diff changeset
92 ++vo_config_count;
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
93 return 1;
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
94 }
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
95
6832
54578e5a8050 ... removed from vf's control(), sing struct for equalizer. based on patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
arpi
parents: 6786
diff changeset
96 static int control(struct vf_instance_s* vf, int request, void* data)
6780
5bf3ed8a17c4 equalizer reworked
alex
parents: 6197
diff changeset
97 {
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5607
diff changeset
98 switch(request){
20973
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
99 case VFCTRL_GET_DEINTERLACE:
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
100 {
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
101 if(!video_out) return CONTROL_FALSE; // vo not configured?
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
102 return(video_out->control(VOCTRL_GET_DEINTERLACE, data)
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
103 == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE;
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
104 }
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
105 case VFCTRL_SET_DEINTERLACE:
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
106 {
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
107 if(!video_out) return CONTROL_FALSE; // vo not configured?
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
108 return(video_out->control(VOCTRL_SET_DEINTERLACE, data)
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
109 == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE;
c0bcec5150a3 Add deinterlace property, patch by Carl Eugen Hoyos
reimar
parents: 20906
diff changeset
110 }
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5607
diff changeset
111 case VFCTRL_DRAW_OSD:
6157
alex
parents: 6138
diff changeset
112 if(!vo_config_count) return CONTROL_FALSE; // vo not configured?
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5607
diff changeset
113 video_out->draw_osd();
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5607
diff changeset
114 return CONTROL_TRUE;
10052
b358b7509e1a sort of a hack, but at least this lets the framerate-increasing
rfelker
parents: 9593
diff changeset
115 case VFCTRL_FLIP_PAGE:
b358b7509e1a sort of a hack, but at least this lets the framerate-increasing
rfelker
parents: 9593
diff changeset
116 {
b358b7509e1a sort of a hack, but at least this lets the framerate-increasing
rfelker
parents: 9593
diff changeset
117 if(!vo_config_count) return CONTROL_FALSE; // vo not configured?
b358b7509e1a sort of a hack, but at least this lets the framerate-increasing
rfelker
parents: 9593
diff changeset
118 video_out->flip_page();
b358b7509e1a sort of a hack, but at least this lets the framerate-increasing
rfelker
parents: 9593
diff changeset
119 return CONTROL_TRUE;
b358b7509e1a sort of a hack, but at least this lets the framerate-increasing
rfelker
parents: 9593
diff changeset
120 }
6780
5bf3ed8a17c4 equalizer reworked
alex
parents: 6197
diff changeset
121 case VFCTRL_SET_EQUALIZER:
5bf3ed8a17c4 equalizer reworked
alex
parents: 6197
diff changeset
122 {
6832
54578e5a8050 ... removed from vf's control(), sing struct for equalizer. based on patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
arpi
parents: 6786
diff changeset
123 vf_equalizer_t *eq=data;
6780
5bf3ed8a17c4 equalizer reworked
alex
parents: 6197
diff changeset
124 if(!vo_config_count) return CONTROL_FALSE; // vo not configured?
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 25813
diff changeset
125 return (video_out->control(VOCTRL_SET_EQUALIZER, eq->item, eq->value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE;
6780
5bf3ed8a17c4 equalizer reworked
alex
parents: 6197
diff changeset
126 }
5bf3ed8a17c4 equalizer reworked
alex
parents: 6197
diff changeset
127 case VFCTRL_GET_EQUALIZER:
5bf3ed8a17c4 equalizer reworked
alex
parents: 6197
diff changeset
128 {
6832
54578e5a8050 ... removed from vf's control(), sing struct for equalizer. based on patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>
arpi
parents: 6786
diff changeset
129 vf_equalizer_t *eq=data;
6780
5bf3ed8a17c4 equalizer reworked
alex
parents: 6197
diff changeset
130 if(!vo_config_count) return CONTROL_FALSE; // vo not configured?
26754
63630c09e237 cosmetics: Remove pointless parentheses from return calls.
diego
parents: 25813
diff changeset
131 return (video_out->control(VOCTRL_GET_EQUALIZER, eq->item, &eq->value) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE;
6780
5bf3ed8a17c4 equalizer reworked
alex
parents: 6197
diff changeset
132 }
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26754
diff changeset
133 #ifdef CONFIG_ASS
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
134 case VFCTRL_INIT_EOSD:
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
135 {
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20446
diff changeset
136 vf->priv->ass_priv = ass_renderer_init((ass_library_t*)data);
20446
e8adc3778348 Split ass_configure() into several smaller functions.
eugeni
parents: 20197
diff changeset
137 if (!vf->priv->ass_priv) return CONTROL_FALSE;
20706
6ae01628975f Initialize fontconfig in VFCTRL_INIT_EOSD handler.
eugeni
parents: 20477
diff changeset
138 ass_configure_fonts(vf->priv->ass_priv);
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 21427
diff changeset
139 vf->priv->prev_visibility = 0;
20446
e8adc3778348 Split ass_configure() into several smaller functions.
eugeni
parents: 20197
diff changeset
140 return CONTROL_TRUE;
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
141 }
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
142 case VFCTRL_DRAW_EOSD:
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
143 {
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 21427
diff changeset
144 mp_eosd_images_t images = {NULL, 2};
20906
160974ca8bf2 Use vf control for reading pts from vf_vo
uau
parents: 20706
diff changeset
145 double pts = vf->priv->pts;
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
146 if (!vo_config_count || !vf->priv->ass_priv) return CONTROL_FALSE;
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
147 if (sub_visibility && vf->priv->ass_priv && ass_track && (pts != MP_NOPTS_VALUE)) {
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
148 mp_eosd_res_t res;
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
149 memset(&res, 0, sizeof(res));
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
150 if (video_out->control(VOCTRL_GET_EOSD_RES, &res) == VO_TRUE) {
30488
595410bd114e libass: fix PAR correction
greg
parents: 30421
diff changeset
151 double dar = (double) (res.w - res.ml - res.mr) / (res.h - res.mt - res.mb);
20446
e8adc3778348 Split ass_configure() into several smaller functions.
eugeni
parents: 20197
diff changeset
152 ass_set_frame_size(vf->priv->ass_priv, res.w, res.h);
e8adc3778348 Split ass_configure() into several smaller functions.
eugeni
parents: 20197
diff changeset
153 ass_set_margins(vf->priv->ass_priv, res.mt, res.mb, res.ml, res.mr);
30065
d5d20b8256b7 Some ugly hacks to make compiling against a newer external version of libass work.
reimar
parents: 30063
diff changeset
154 #if defined(LIBASS_VERSION) && LIBASS_VERSION >= 0x00908000
30488
595410bd114e libass: fix PAR correction
greg
parents: 30421
diff changeset
155 ass_set_aspect_ratio(vf->priv->ass_priv, dar, (double)res.srcw/res.srch);
30065
d5d20b8256b7 Some ugly hacks to make compiling against a newer external version of libass work.
reimar
parents: 30063
diff changeset
156 #else
21427
c37fae0e2b5a Set video aspect ratio for libass in vf_vo.
eugeni
parents: 21161
diff changeset
157 ass_set_aspect_ratio(vf->priv->ass_priv, (double)res.w / res.h);
30065
d5d20b8256b7 Some ugly hacks to make compiling against a newer external version of libass work.
reimar
parents: 30063
diff changeset
158 #endif
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
159 }
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
160
25813
ba7bd4f7e322 Add global ass_force_reload flag.
eugeni
parents: 25221
diff changeset
161 images.imgs = ass_mp_render_frame(vf->priv->ass_priv, ass_track, (pts+sub_delay) * 1000 + .5, &images.changed);
21506
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 21427
diff changeset
162 if (!vf->priv->prev_visibility)
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 21427
diff changeset
163 images.changed = 2;
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 21427
diff changeset
164 vf->priv->prev_visibility = 1;
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 21427
diff changeset
165 } else
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 21427
diff changeset
166 vf->priv->prev_visibility = 0;
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 21427
diff changeset
167 vf->priv->prev_visibility = sub_visibility;
8174acbf0633 Speed up ASS subtitles display by detecting changes between two consecutive
eugeni
parents: 21427
diff changeset
168 return (video_out->control(VOCTRL_DRAW_EOSD, &images) == VO_TRUE) ? CONTROL_TRUE : CONTROL_FALSE;
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
169 }
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
170 #endif
20906
160974ca8bf2 Use vf control for reading pts from vf_vo
uau
parents: 20706
diff changeset
171 case VFCTRL_GET_PTS:
160974ca8bf2 Use vf control for reading pts from vf_vo
uau
parents: 20706
diff changeset
172 {
160974ca8bf2 Use vf control for reading pts from vf_vo
uau
parents: 20706
diff changeset
173 *(double *)data = vf->priv->pts;
160974ca8bf2 Use vf control for reading pts from vf_vo
uau
parents: 20706
diff changeset
174 return CONTROL_TRUE;
160974ca8bf2 Use vf control for reading pts from vf_vo
uau
parents: 20706
diff changeset
175 }
5643
3d9de27d9bd0 OSD handled by vf control()
arpi
parents: 5607
diff changeset
176 }
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
177 // return video_out->control(request,data);
5519
868c13f78f08 vf control codes added, autoq support
arpi
parents: 5511
diff changeset
178 return CONTROL_UNKNOWN;
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
179 }
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
180
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
181 static int query_format(struct vf_instance_s* vf, unsigned int fmt){
5565
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5559
diff changeset
182 int flags=video_out->control(VOCTRL_QUERY_FORMAT,&fmt);
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5559
diff changeset
183 // draw_slice() accepts stride, draw_frame() doesn't:
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5559
diff changeset
184 if(flags)
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5559
diff changeset
185 if(fmt==IMGFMT_YV12 || fmt==IMGFMT_I420 || fmt==IMGFMT_IYUV)
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5559
diff changeset
186 flags|=VFCAP_ACCEPT_STRIDE;
0b301fec999a capabilities support -> automatic insertion of scale, expand, pp
arpi
parents: 5559
diff changeset
187 return flags;
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
188 }
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
189
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
190 static void get_image(struct vf_instance_s* vf,
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
191 mp_image_t *mpi){
28546
e887c2dd6c62 Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need to
reimar
parents: 27341
diff changeset
192 if(!vo_config_count) return;
e887c2dd6c62 Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need to
reimar
parents: 27341
diff changeset
193 // GET_IMAGE is required for hardware-accelerated formats
e887c2dd6c62 Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need to
reimar
parents: 27341
diff changeset
194 if(vo_directrendering ||
e887c2dd6c62 Move direct-rendering hack from vo_xvmc to vf_vo, so it does not need to
reimar
parents: 27341
diff changeset
195 IMGFMT_IS_XVMC(mpi->imgfmt) || IMGFMT_IS_VDPAU(mpi->imgfmt))
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
196 video_out->control(VOCTRL_GET_IMAGE,mpi);
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
197 }
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
198
7368
a894e99c1e51 changing return type of put_image void->int
arpi
parents: 7220
diff changeset
199 static int put_image(struct vf_instance_s* vf,
17906
20aca9baf5d8 passing pts through the filter layer (lets see if pts or cola comes out at the end)
michael
parents: 17012
diff changeset
200 mp_image_t *mpi, double pts){
7368
a894e99c1e51 changing return type of put_image void->int
arpi
parents: 7220
diff changeset
201 if(!vo_config_count) return 0; // vo not configured?
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 17906
diff changeset
202 // record pts (potentially modified by filters) for main loop
20906
160974ca8bf2 Use vf control for reading pts from vf_vo
uau
parents: 20706
diff changeset
203 vf->priv->pts = pts;
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
204 // first check, maybe the vo/vf plugin implements draw_image using mpi:
7368
a894e99c1e51 changing return type of put_image void->int
arpi
parents: 7220
diff changeset
205 if(video_out->control(VOCTRL_DRAW_IMAGE,mpi)==VO_TRUE) return 1; // done.
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
206 // nope, fallback to old draw_frame/draw_slice:
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
207 if(!(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK))){
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
208 // blit frame:
7687
a9a19a991a70 support for VFCAP_ACCEPT_STRIDE in vo drivers
arpi
parents: 7368
diff changeset
209 // if(mpi->flags&MP_IMGFLAG_PLANAR)
a9a19a991a70 support for VFCAP_ACCEPT_STRIDE in vo drivers
arpi
parents: 7368
diff changeset
210 if(vf->default_caps&VFCAP_ACCEPT_STRIDE)
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
211 video_out->draw_slice(mpi->planes,mpi->stride,mpi->w,mpi->h,mpi->x,mpi->y);
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
212 else
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
213 video_out->draw_frame(mpi->planes);
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
214 }
7368
a894e99c1e51 changing return type of put_image void->int
arpi
parents: 7220
diff changeset
215 return 1;
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
216 }
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
217
9560
ae2ce6ebc1fa Pass start slice to the vo it make dr + slice implemantation easier
albeu
parents: 8148
diff changeset
218 static void start_slice(struct vf_instance_s* vf,
ae2ce6ebc1fa Pass start slice to the vo it make dr + slice implemantation easier
albeu
parents: 8148
diff changeset
219 mp_image_t *mpi) {
ae2ce6ebc1fa Pass start slice to the vo it make dr + slice implemantation easier
albeu
parents: 8148
diff changeset
220 if(!vo_config_count) return; // vo not configured?
ae2ce6ebc1fa Pass start slice to the vo it make dr + slice implemantation easier
albeu
parents: 8148
diff changeset
221 video_out->control(VOCTRL_START_SLICE,mpi);
ae2ce6ebc1fa Pass start slice to the vo it make dr + slice implemantation easier
albeu
parents: 8148
diff changeset
222 }
ae2ce6ebc1fa Pass start slice to the vo it make dr + slice implemantation easier
albeu
parents: 8148
diff changeset
223
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
224 static void draw_slice(struct vf_instance_s* vf,
7220
e3ecccc7e505 warning fixes by Dominik Mierzejewski <dominik@rangers.eu.org>
arpi
parents: 7125
diff changeset
225 unsigned char** src, int* stride, int w,int h, int x, int y){
5511
7a24a067f0af vo_config_count now counts calls to vo->config()
arpi
parents: 5508
diff changeset
226 if(!vo_config_count) return; // vo not configured?
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
227 video_out->draw_slice(src,stride,w,h,x,y);
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
228 }
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
229
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
230 static void uninit(struct vf_instance_s* vf)
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
231 {
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
232 if (vf->priv) {
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 26754
diff changeset
233 #ifdef CONFIG_ASS
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
234 if (vf->priv->ass_priv)
20477
de4a66d99f41 Libass interface reworked:
eugeni
parents: 20446
diff changeset
235 ass_renderer_done(vf->priv->ass_priv);
19582
52a319698894 fix build failure when ASS is disabled
aurel
parents: 19576
diff changeset
236 #endif
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
237 free(vf->priv);
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
238 }
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
239 }
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
240 //===========================================================================//
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
241
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
242 static int open(vf_instance_t *vf, char* args){
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
243 vf->config=config;
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
244 vf->control=control;
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
245 vf->query_format=query_format;
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
246 vf->get_image=get_image;
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
247 vf->put_image=put_image;
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
248 vf->draw_slice=draw_slice;
9560
ae2ce6ebc1fa Pass start slice to the vo it make dr + slice implemantation easier
albeu
parents: 8148
diff changeset
249 vf->start_slice=start_slice;
19576
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
250 vf->uninit=uninit;
3e7ce339d74b Add EOSD support to vf_vo.
eugeni
parents: 19463
diff changeset
251 vf->priv=calloc(1, sizeof(struct vf_priv_s));
25219
e82ecde2cbd4 Mark several uses of vo_functions_t as const to stop some of the current
reimar
parents: 23134
diff changeset
252 vf->priv->vo = (const vo_functions_t *)args;
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
253 if(!video_out) return 0; // no vo ?
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
254 // if(video_out->preinit(args)) return 0; // preinit failed
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
255 return 1;
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
256 }
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
257
25221
00fff9a3b735 Make all vf_info_t structs const
reimar
parents: 25219
diff changeset
258 const vf_info_t vf_info_vo = {
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
259 "libvo wrapper",
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
260 "vo",
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
261 "A'rpi",
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
262 "for internal use",
9593
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9560
diff changeset
263 open,
e9a2af584986 Add the new -vf option wich is the same as vop in reverse order.
albeu
parents: 9560
diff changeset
264 NULL
5507
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
265 };
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
266
d0d029fda134 video filter layer - written from scratch, but inspired a lot by Fredrik Kuivinen's patch
arpi
parents:
diff changeset
267 //===========================================================================//