annotate libvo/vo_dxr3.c @ 30205:089c49dd7f9f

add binary cineform hd vfw decoder to codecs.conf
author compn
date Fri, 08 Jan 2010 21:50:32 +0000
parents 0f1b5b68af32
children 5404e0c3acce
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6748
c0e8034d47e4 Disabled spuenc, it still doesn't work well with the em8300
mswitch
parents: 6647
diff changeset
1 /*
28446
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
2 * DXR3/H+ video output
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
3 *
8924
e0ec616c5985 Added patch from Tamas Kohegyi to fix subpic placement with freetype
mswitch
parents: 8728
diff changeset
4 * Copyright (C) 2002-2003 David Holm <david@realityrift.com>
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
5 *
28446
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
6 * This file is part of MPlayer.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
7 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
8 * MPlayer is free software; you can redistribute it and/or modify
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
9 * it under the terms of the GNU General Public License as published by
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
10 * the Free Software Foundation; either version 2 of the License, or
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
11 * (at your option) any later version.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
12 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
13 * MPlayer is distributed in the hope that it will be useful,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
16 * GNU General Public License for more details.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
17 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
18 * You should have received a copy of the GNU General Public License along
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
19 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27903
diff changeset
20 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
21 */
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
22
2921
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
23 #include <linux/em8300.h>
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
24 #include <sys/ioctl.h>
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
25 #include <sys/stat.h>
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
26 #include <sys/types.h>
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
27 #include <sys/select.h>
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
28 #include <unistd.h>
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
29 #include <stdio.h>
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
30 #include <stdlib.h>
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
31 #include <string.h>
2921
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
32 #include <fcntl.h>
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
33 #include <stdio.h>
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
34 #include <time.h>
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
35 #include <math.h>
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
36
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
37 #include "config.h"
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
38 #include "mp_msg.h"
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
39 #include "help_mp.h"
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
40 #include "fastmemcpy.h"
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
41
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
42 #include "video_out.h"
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
43 #include "video_out_internal.h"
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
44 #include "aspect.h"
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
45 #include "spuenc.h"
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
46 #include "sub.h"
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 25596
diff changeset
47 #ifdef CONFIG_GUI
23077
17bf4f4b0715 Gui --> gui
diego
parents: 22289
diff changeset
48 #include "gui/interface.h"
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
49 #endif
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
50 #ifdef CONFIG_X11
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
51 #include "x11_common.h"
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
52 #endif
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23655
diff changeset
53 #include "libavutil/avstring.h"
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
54
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
55 #define SPU_SUPPORT
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
56
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
57 static const vo_info_t info =
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
58 {
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
59 "DXR3/H+ video out",
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
60 "dxr3",
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
61 "David Holm <dholm@iname.com>",
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
62 ""
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
63 };
25220
c9e9ac2008c2 Mark the vo_functions_t definitions as const where possible.
reimar
parents: 25216
diff changeset
64 const LIBVO_EXTERN (dxr3)
5377
f7402401318c lego++ bug fixed by XorA
mswitch
parents: 5361
diff changeset
65
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
66 /* Resolutions and positions */
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
67 static int v_width, v_height;
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
68 static int s_width, s_height;
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
69 static int osd_w, osd_h;
8724
d19eb334c0d4 Updated changelog
mswitch
parents: 8722
diff changeset
70 static int img_format;
3329
529a001496c2 Switched from rte which caused alot of problems for some users to libmp1e.
mswitch
parents: 3232
diff changeset
71
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
72 /* Configuration values
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
73 * Don't declare these static, they
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
74 * should be accessible from the gui.
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
75 */
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
76 int dxr3_prebuf = 0;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
77 int dxr3_newsync = 0;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
78 int dxr3_overlay = 0;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
79 int dxr3_device_num = 0;
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
80 int dxr3_norm = 0;
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
81
12646
9a495bdc3a1e string handling security fixes
diego
parents: 11542
diff changeset
82 #define MAX_STR_SIZE 80 /* length for the static strings */
9a495bdc3a1e string handling security fixes
diego
parents: 11542
diff changeset
83
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
84 /* File descriptors */
2921
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
85 static int fd_control = -1;
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
86 static int fd_video = -1;
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
87 static int fd_spu = -1;
12646
9a495bdc3a1e string handling security fixes
diego
parents: 11542
diff changeset
88 static char fdv_name[MAX_STR_SIZE];
9a495bdc3a1e string handling security fixes
diego
parents: 11542
diff changeset
89 static char fds_name[MAX_STR_SIZE];
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
90
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
91 #ifdef SPU_SUPPORT
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
92 /* on screen display/subpics */
8724
d19eb334c0d4 Updated changelog
mswitch
parents: 8722
diff changeset
93 static char *osdpicbuf;
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
94 static int osdpicbuf_w;
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
95 static int osdpicbuf_h;
8724
d19eb334c0d4 Updated changelog
mswitch
parents: 8722
diff changeset
96 static int disposd;
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
97 static encodedata *spued;
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
98 static encodedata *spubuf;
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
99 #endif
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
100
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
101
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
102 /* Static variable used in ioctl's */
8724
d19eb334c0d4 Updated changelog
mswitch
parents: 8722
diff changeset
103 static int ioval;
d19eb334c0d4 Updated changelog
mswitch
parents: 8722
diff changeset
104 static int prev_pts;
d19eb334c0d4 Updated changelog
mswitch
parents: 8722
diff changeset
105 static int pts_offset;
8722
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
106 static int old_vmode = -1;
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
107
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
108
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
109 /* Begin overlay.h */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
110 /*
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
111 Simple analog overlay API for DXR3/H+ linux driver.
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
112
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
113 Henrik Johansson
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
114 */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
115
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
116
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
117 /* Pattern drawing callback used by the calibration functions.
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
118 The function is expected to:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
119 Clear the entire screen.
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
120 Fill the screen with color bgcol (0xRRGGBB)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
121 Draw a rectangle at (xpos,ypos) of size (width,height) in fgcol (0xRRGGBB)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
122 */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
123
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
124 typedef int (*pattern_drawer_cb)(int fgcol, int bgcol,
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
125 int xpos, int ypos, int width, int height, void *arg);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
126
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
127 struct coeff {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
128 float k,m;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
129 };
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
130
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
131 typedef struct {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
132 int dev;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
133
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
134 int xres, yres,depth;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
135 int xoffset,yoffset,xcorr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
136 int jitter;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
137 int stability;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
138 int keycolor;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
139 struct coeff colcal_upper[3];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
140 struct coeff colcal_lower[3];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
141 float color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
142
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
143 pattern_drawer_cb draw_pattern;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
144 void *dp_arg;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
145 } overlay_t;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
146
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
147
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
148 static overlay_t *overlay_init(int dev);
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
149 static int overlay_release(overlay_t *);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
150
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
151 static int overlay_read_state(overlay_t *o, char *path);
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
152 static int overlay_write_state(overlay_t *o, char *path);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
153
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
154 static int overlay_set_screen(overlay_t *o, int xres, int yres, int depth);
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
155 static int overlay_set_mode(overlay_t *o, int mode);
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
156 static int overlay_set_attribute(overlay_t *o, int attribute, int val);
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
157 static int overlay_set_keycolor(overlay_t *o, int color);
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
158 static int overlay_set_window(overlay_t *o, int xpos,int ypos,int width,int height);
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
159 static int overlay_set_bcs(overlay_t *o, int brightness, int contrast, int saturation);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
160
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
161 static int overlay_autocalibrate(overlay_t *o, pattern_drawer_cb pd, void *arg);
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
162 static void overlay_update_params(overlay_t *o);
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
163 static int overlay_signalmode(overlay_t *o, int mode);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
164 /* End overlay.h */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
165
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
166
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
167 #ifdef CONFIG_X11
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
168 #define KEY_COLOR 0x80a040
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
169 static XWindowAttributes xwin_attribs;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
170 static overlay_t *overlay_data;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
171 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
172
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
173
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
174 /* Functions for working with the em8300's internal clock */
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
175 /* End of internal clock functions */
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
176
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
177 static int control(uint32_t request, void *data, ...)
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
178 {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
179 switch (request) {
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6843
diff changeset
180 case VOCTRL_GUISUPPORT:
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
181 return VO_TRUE;
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6843
diff changeset
182 case VOCTRL_GUI_NOWINDOW:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
183 if (dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
184 return VO_FALSE;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
185 }
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6843
diff changeset
186 return VO_TRUE;
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
187 case VOCTRL_SET_SPU_PALETTE:
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
188 if (ioctl(fd_spu, EM8300_IOCTL_SPU_SETPALETTE, data) < 0) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
189 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToLoadNewSPUPalette);
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
190 return VO_ERROR;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
191 }
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
192 return VO_TRUE;
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
193 #ifdef CONFIG_X11
11542
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11530
diff changeset
194 case VOCTRL_ONTOP:
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11530
diff changeset
195 vo_x11_ontop();
85e503ddf65f runtime 'stay-on-top' functionality
joey
parents: 11530
diff changeset
196 return VO_TRUE;
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
197 case VOCTRL_FULLSCREEN:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
198 if (dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
199 vo_x11_fullscreen();
16941
aff6d5831e25 Fix compilation, use vo_fs instead of fullscreen variable. Not tested.
reimar
parents: 16171
diff changeset
200 overlay_signalmode(overlay_data,
aff6d5831e25 Fix compilation, use vo_fs instead of fullscreen variable. Not tested.
reimar
parents: 16171
diff changeset
201 vo_fs ? EM8300_OVERLAY_SIGNAL_ONLY :
aff6d5831e25 Fix compilation, use vo_fs instead of fullscreen variable. Not tested.
reimar
parents: 16171
diff changeset
202 EM8300_OVERLAY_SIGNAL_WITH_VGA);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
203 return VO_TRUE;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
204 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
205 return VO_FALSE;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
206 #endif
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
207 case VOCTRL_RESUME:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
208 if (dxr3_newsync) {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
209 ioctl(fd_control, EM8300_IOCTL_SCR_GET, &ioval);
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
210 pts_offset = vo_pts - (ioval << 1);
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
211 if (pts_offset < 0) {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
212 pts_offset = 0;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
213 }
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
214 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
215
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
216 if (dxr3_prebuf) {
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
217 ioval = EM8300_PLAYMODE_PLAY;
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
218 if (ioctl(fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval) < 0) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
219 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToSetPlaymode);
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
220 }
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
221 }
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
222 return VO_TRUE;
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
223 case VOCTRL_PAUSE:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
224 if (dxr3_prebuf) {
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
225 ioval = EM8300_PLAYMODE_PAUSED;
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
226 if (ioctl(fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval) < 0) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
227 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToSetPlaymode);
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
228 }
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
229 }
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
230 return VO_TRUE;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
231 case VOCTRL_RESET:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
232 if (dxr3_prebuf) {
4605
b63ebfab3cdd Added switch to disable prebuffering
mswitch
parents: 4604
diff changeset
233 close(fd_video);
b63ebfab3cdd Added switch to disable prebuffering
mswitch
parents: 4604
diff changeset
234 fd_video = open(fdv_name, O_WRONLY);
5499
58864ce0eef7 Fixed bug that would cause the dxr3 to lock if too many subpics were sent at once
mswitch
parents: 5497
diff changeset
235 close(fd_spu);
58864ce0eef7 Fixed bug that would cause the dxr3 to lock if too many subpics were sent at once
mswitch
parents: 5497
diff changeset
236 fd_spu = open(fds_name, O_WRONLY);
4609
272b0a173417 Fixed a bug where seeking would lock mplayer
mswitch
parents: 4607
diff changeset
237 fsync(fd_video);
5499
58864ce0eef7 Fixed bug that would cause the dxr3 to lock if too many subpics were sent at once
mswitch
parents: 5497
diff changeset
238 fsync(fd_spu);
4605
b63ebfab3cdd Added switch to disable prebuffering
mswitch
parents: 4604
diff changeset
239 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
240 return VO_TRUE;
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
241 case VOCTRL_QUERY_FORMAT:
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
242 {
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
243 uint32_t flag = 0;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
244
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
245 if (*((uint32_t*)data) != IMGFMT_MPEGPES)
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
246 return 0;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
247
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
248 flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_SPU;
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
249 if (dxr3_prebuf)
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
250 flag |= VFCAP_TIMER;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
251 return flag;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
252 }
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
253 case VOCTRL_SET_EQUALIZER:
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
254 {
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
255 va_list ap;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
256 int value;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
257 em8300_bcs_t bcs;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
258
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
259 va_start(ap, data);
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
260 value = va_arg(ap, int);
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
261 va_end(ap);
6748
c0e8034d47e4 Disabled spuenc, it still doesn't work well with the em8300
mswitch
parents: 6647
diff changeset
262
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
263 if (ioctl(fd_control, EM8300_IOCTL_GETBCS, &bcs) < 0)
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
264 return VO_FALSE;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
265 if (!strcasecmp(data, "brightness"))
7095
fad0147bd3aa - add dxr3 equ patch from "Szombathelyi [iso-8859-2] Gy«Órgy" <gyurco@freemail.hu>
pontscho
parents: 7067
diff changeset
266 bcs.brightness = (value+100)*5;
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
267 else if (!strcasecmp(data, "contrast"))
7095
fad0147bd3aa - add dxr3 equ patch from "Szombathelyi [iso-8859-2] Gy«Órgy" <gyurco@freemail.hu>
pontscho
parents: 7067
diff changeset
268 bcs.contrast = (value+100)*5;
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
269 else if (!strcasecmp(data, "saturation"))
7095
fad0147bd3aa - add dxr3 equ patch from "Szombathelyi [iso-8859-2] Gy«Órgy" <gyurco@freemail.hu>
pontscho
parents: 7067
diff changeset
270 bcs.saturation = (value+100)*5;
fad0147bd3aa - add dxr3 equ patch from "Szombathelyi [iso-8859-2] Gy«Órgy" <gyurco@freemail.hu>
pontscho
parents: 7067
diff changeset
271 else return VO_FALSE;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
272
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
273 if (ioctl(fd_control, EM8300_IOCTL_SETBCS, &bcs) < 0)
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
274 return VO_FALSE;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
275 return VO_TRUE;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
276 }
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
277 case VOCTRL_GET_EQUALIZER:
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
278 {
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
279 va_list ap;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
280 int *value;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
281 em8300_bcs_t bcs;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
282
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
283 va_start(ap, data);
6843
arpi
parents: 6787
diff changeset
284 value = va_arg(ap, int*);
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
285 va_end(ap);
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
286
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
287 if (ioctl(fd_control, EM8300_IOCTL_GETBCS, &bcs) < 0)
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
288 return VO_FALSE;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
289
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
290 if (!strcasecmp(data, "brightness"))
7095
fad0147bd3aa - add dxr3 equ patch from "Szombathelyi [iso-8859-2] Gy«Órgy" <gyurco@freemail.hu>
pontscho
parents: 7067
diff changeset
291 *value = (bcs.brightness/5)-100;
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
292 else if (!strcasecmp(data, "contrast"))
7095
fad0147bd3aa - add dxr3 equ patch from "Szombathelyi [iso-8859-2] Gy«Órgy" <gyurco@freemail.hu>
pontscho
parents: 7067
diff changeset
293 *value = (bcs.contrast/5)-100;
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
294 else if (!strcasecmp(data, "saturation"))
7095
fad0147bd3aa - add dxr3 equ patch from "Szombathelyi [iso-8859-2] Gy«Órgy" <gyurco@freemail.hu>
pontscho
parents: 7067
diff changeset
295 *value = (bcs.saturation/5)-100;
fad0147bd3aa - add dxr3 equ patch from "Szombathelyi [iso-8859-2] Gy«Órgy" <gyurco@freemail.hu>
pontscho
parents: 7067
diff changeset
296 else return VO_FALSE;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
297
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
298 return VO_TRUE;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
299 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
300 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
301 return VO_NOTIMPL;
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
302 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
303
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
304 void calculate_cvals(unsigned long mask, int *shift, int *prec)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
305 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
306 /* Calculate shift and precision */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
307 (*shift) = 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
308 (*prec) = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
309
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
310 while (!(mask & 0x1)) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
311 (*shift)++;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
312 mask >>= 1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
313 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
314
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
315 while (mask & 0x1) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
316 (*prec)++;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
317 mask >>= 1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
318 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
319 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
320
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
321 static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t flags, char *title, uint32_t format)
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
322 {
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
323 int tmp1, tmp2, size;
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
324 em8300_register_t reg;
5273
8af542acc1b6 Jitter-bug fixed by Marcel Hild <hild@b4mad.net>, many many thanks goes
mswitch
parents: 5225
diff changeset
325 extern float monitor_aspect;
6748
c0e8034d47e4 Disabled spuenc, it still doesn't work well with the em8300
mswitch
parents: 6647
diff changeset
326
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
327 /* Softzoom turned on, downscale */
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
328 /* This activates the subpicture processor, you can safely disable this and still send */
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
329 /* broken subpics to the em8300, if it's enabled and you send broken subpics you will end */
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
330 /* up in a lockup */
4160
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4109
diff changeset
331 ioval = EM8300_SPUMODE_ON;
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
332 if (ioctl(fd_control, EM8300_IOCTL_SET_SPUMODE, &ioval) < 0) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
333 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToSetSubpictureMode);
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
334 uninit();
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
335 return -1;
3201
039a973b3dda Newest DXR3 patch (improved 1.0rc2) by David Holm.
atmos4
parents: 3186
diff changeset
336 }
039a973b3dda Newest DXR3 patch (improved 1.0rc2) by David Holm.
atmos4
parents: 3186
diff changeset
337
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
338 /* Set the playmode to play (just in case another app has set it to something else) */
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
339 ioval = EM8300_PLAYMODE_PLAY;
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
340 if (ioctl(fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval) < 0) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
341 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToSetPlaymode);
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
342 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
343
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
344 /* Start em8300 prebuffering and sync engine */
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
345 reg.microcode_register = 1;
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
346 reg.reg = 0;
8317
d1ed5c592696 Use MVCOMMAND_SYNC
mswitch
parents: 8148
diff changeset
347 reg.val = MVCOMMAND_SYNC;
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
348 ioctl(fd_control, EM8300_IOCTL_WRITEREG, &reg);
6618
d6c07ebda746 fix compile bug with driver 0.9+
pontscho
parents: 6212
diff changeset
349
4607
da09673aea00 Removed some stuff from the em8300 driver, had to compensate
mswitch
parents: 4605
diff changeset
350 /* Clean buffer by syncing it */
4609
272b0a173417 Fixed a bug where seeking would lock mplayer
mswitch
parents: 4607
diff changeset
351 ioval = EM8300_SUBDEVICE_VIDEO;
272b0a173417 Fixed a bug where seeking would lock mplayer
mswitch
parents: 4607
diff changeset
352 ioctl(fd_control, EM8300_IOCTL_FLUSH, &ioval);
272b0a173417 Fixed a bug where seeking would lock mplayer
mswitch
parents: 4607
diff changeset
353 ioval = EM8300_SUBDEVICE_AUDIO;
272b0a173417 Fixed a bug where seeking would lock mplayer
mswitch
parents: 4607
diff changeset
354 ioctl(fd_control, EM8300_IOCTL_FLUSH, &ioval);
6618
d6c07ebda746 fix compile bug with driver 0.9+
pontscho
parents: 6212
diff changeset
355
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
356 /* Sync the video device to make sure the buffers are empty
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
357 * and set the playback speed to normal. Also reset the
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
358 * em8300 internal clock.
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
359 */
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
360 fsync(fd_video);
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
361 ioval = 0x900;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
362 ioctl(fd_control, EM8300_IOCTL_SCR_SETSPEED, &ioval);
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
363
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
364 /* Store some variables statically that we need later in another scope */
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
365 img_format = format;
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
366 v_width = width;
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
367 v_height = height;
2866
4f6190ab52e7 Added a temporary fix to the DXR3 win32 codec playback, win32 codecs might prove to play back an unscaled image!
mswitch
parents: 2770
diff changeset
368
5273
8af542acc1b6 Jitter-bug fixed by Marcel Hild <hild@b4mad.net>, many many thanks goes
mswitch
parents: 5225
diff changeset
369 /* Set monitor_aspect to avoid jitter */
8af542acc1b6 Jitter-bug fixed by Marcel Hild <hild@b4mad.net>, many many thanks goes
mswitch
parents: 5225
diff changeset
370 monitor_aspect = (float) width / (float) height;
8722
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
371
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
372 if (ioctl(fd_control, EM8300_IOCTL_GET_VIDEOMODE, &old_vmode) < 0) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
373 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToGetTVNorm);
8722
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
374 old_vmode = -1;
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
375 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
376
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
377 /* adjust TV norm */
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
378 if (dxr3_norm != 0) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
379 if (dxr3_norm == 5) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
380 ioval = EM8300_VIDEOMODE_NTSC;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
381 } else if (dxr3_norm == 4) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
382 ioval = EM8300_VIDEOMODE_PAL60;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
383 } else if (dxr3_norm == 3) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
384 ioval = EM8300_VIDEOMODE_PAL;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
385 } else if (dxr3_norm == 2) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
386 if (vo_fps > 28) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
387 ioval = EM8300_VIDEOMODE_PAL60;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
388 } else {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
389 ioval = EM8300_VIDEOMODE_PAL;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
390 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
391
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
392 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_AutoSelectedTVNormByFrameRate);
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
393 ioval == EM8300_VIDEOMODE_PAL60 ? mp_msg(MSGT_VO,MSGL_INFO, "PAL-60") : mp_msg(MSGT_VO,MSGL_INFO, "PAL");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
394 printf(".\n");
8722
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
395 } else {
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
396 if (vo_fps > 28) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
397 ioval = EM8300_VIDEOMODE_NTSC;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
398 } else {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
399 ioval = EM8300_VIDEOMODE_PAL;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
400 }
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
401
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
402 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_AutoSelectedTVNormByFrameRate);
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
403 ioval == EM8300_VIDEOMODE_NTSC ? mp_msg(MSGT_VO,MSGL_INFO, "NTSC") : mp_msg(MSGT_VO,MSGL_INFO, "PAL");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
404 printf(".\n");
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
405 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
406
8722
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
407 if (old_vmode != ioval) {
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
408 if (ioctl(fd_control, EM8300_IOCTL_SET_VIDEOMODE, &ioval) < 0) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
409 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToSetTVNorm);
8722
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
410 }
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
411 }
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
412 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
413
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
414
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
415 /* libavcodec requires a width and height that is x|16 */
5281
88df6d5f6ce7 Aspect code reenabled, apparently users didn't like running movies
mswitch
parents: 5275
diff changeset
416 aspect_save_orig(width, height);
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
417 aspect_save_prescale(d_width, d_height);
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
418 ioctl(fd_control, EM8300_IOCTL_GET_VIDEOMODE, &ioval);
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
419 if (ioval == EM8300_VIDEOMODE_NTSC) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
420 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_SettingUpForNTSC);
5065
0d0694219daf This will slow down wobbling (just a bit)
mswitch
parents: 5064
diff changeset
421 aspect_save_screenres(352, 240);
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
422 } else {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
423 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_SettingUpForPALSECAM);
5065
0d0694219daf This will slow down wobbling (just a bit)
mswitch
parents: 5064
diff changeset
424 aspect_save_screenres(352, 288);
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
425 }
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
426 aspect(&s_width, &s_height, A_ZOOM);
5064
e0122262fb3c Added preliminary fame support
mswitch
parents: 4755
diff changeset
427 s_width -= s_width % 16;
5281
88df6d5f6ce7 Aspect code reenabled, apparently users didn't like running movies
mswitch
parents: 5275
diff changeset
428 s_height -= s_height % 16;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
429
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
430 /* Try to figure out whether to use widescreen output or not */
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
431 /* Anamorphic widescreen modes makes this a pain in the ass */
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
432 tmp1 = abs(d_height - ((d_width / 4) * 3));
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
433 tmp2 = abs(d_height - (int) (d_width / 2.35));
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
434 if (tmp1 < tmp2) {
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
435 ioval = EM8300_ASPECTRATIO_4_3;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
436 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_SettingAspectRatioTo43);
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
437 } else {
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
438 ioval = EM8300_ASPECTRATIO_16_9;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
439 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_SettingAspectRatioTo169);
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
440 }
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
441 ioctl(fd_control, EM8300_IOCTL_SET_ASPECTRATIO, &ioval);
5064
e0122262fb3c Added preliminary fame support
mswitch
parents: 4755
diff changeset
442
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
443 #ifdef SPU_SUPPORT
27393
4876c89bafdd Rename font-related preprocessor directives.
diego
parents: 27377
diff changeset
444 #ifdef CONFIG_FREETYPE
8924
e0ec616c5985 Added patch from Tamas Kohegyi to fix subpic placement with freetype
mswitch
parents: 8728
diff changeset
445 if (ioval == EM8300_ASPECTRATIO_16_9) {
9458
23b1d5ef281b Patch from Tamas Kohegyi to fix subpic placement on 16:9
mswitch
parents: 8924
diff changeset
446 s_width *= d_height*1.78/s_height*(d_width*1.0/d_height)/2.35;
8924
e0ec616c5985 Added patch from Tamas Kohegyi to fix subpic placement with freetype
mswitch
parents: 8728
diff changeset
447 } else {
e0ec616c5985 Added patch from Tamas Kohegyi to fix subpic placement with freetype
mswitch
parents: 8728
diff changeset
448 s_width *= 0.84;
e0ec616c5985 Added patch from Tamas Kohegyi to fix subpic placement with freetype
mswitch
parents: 8728
diff changeset
449 }
9458
23b1d5ef281b Patch from Tamas Kohegyi to fix subpic placement on 16:9
mswitch
parents: 8924
diff changeset
450 //printf("VO: [dxr3] sw/sh:dw/dh ->%i,%i,%i,%i\n",s_width,s_height,d_width,d_height);
7151
9e17b153b785 - fix window handling with dxr3
pontscho
parents: 7124
diff changeset
451 #else
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
452 s_width*=2;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
453 s_height*=2;
7151
9e17b153b785 - fix window handling with dxr3
pontscho
parents: 7124
diff changeset
454 #endif
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
455
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
456 osdpicbuf = calloc( 1,s_width * s_height);
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
457 if (osdpicbuf == NULL) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
458 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_OutOfMemory);
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
459 return -1;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
460 }
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
461 spued = (encodedata *) malloc(sizeof(encodedata));
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
462 if (spued == NULL) {
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
463 free( osdpicbuf );
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
464 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_OutOfMemory);
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
465 return -1;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
466 }
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
467 spubuf = (encodedata *) malloc(sizeof(encodedata));
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
468 if (spubuf == NULL) {
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
469 free( osdpicbuf );
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
470 free( spued );
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
471 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_OutOfMemory);
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
472 return -1;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
473 }
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
474 osd_w = s_width;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
475 osd_h = s_height;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
476 osdpicbuf_w = s_width;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
477 osdpicbuf_h = s_height;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
478
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
479 spubuf->count=0;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
480 pixbuf_encode_rle( 0,0,osdpicbuf_w,osdpicbuf_h - 1,osdpicbuf,osdpicbuf_w,spubuf );
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
481
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
482 #endif
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
483
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
484 #ifdef CONFIG_X11
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
485 if (dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
486 XVisualInfo vinfo;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
487 XSetWindowAttributes xswa;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
488 XSizeHints hint;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
489 unsigned long xswamask;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
490 Colormap cmap;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
491 XColor key_color;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
492 Window junkwindow;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
493 Screen *scr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
494 int depth, red_shift, red_prec, green_shift, green_prec, blue_shift, blue_prec, acq_color;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
495 em8300_overlay_screen_t ovlscr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
496 em8300_attribute_t ovlattr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
497
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
498 vo_dx = (vo_screenwidth - d_width) / 2;
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
499 vo_dy = (vo_screenheight - d_height) / 2;
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
500 vo_dwidth = d_width;
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
501 vo_dheight = d_height;
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 25596
diff changeset
502 #ifdef CONFIG_GUI
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
503 if (use_gui) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
504 guiGetEvent(guiSetShVideo, 0);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
505 XSetWindowBackground(mDisplay, vo_window, KEY_COLOR);
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
506 XClearWindow(mDisplay, vo_window);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
507 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
508 depth = xwin_attribs.depth;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
509 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
510 depth = 24;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
511 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
512 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
513 } else
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
514 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
515 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
516 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
517 depth = xwin_attribs.depth;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
518 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
519 depth = 24;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
520 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
521 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23458
diff changeset
522 vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23458
diff changeset
523 d_width, d_height, flags,
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23458
diff changeset
524 CopyFromParent, "Viewing Window", title);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
525 xswa.background_pixel = KEY_COLOR;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
526 xswa.border_pixel = 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
527 xswamask = CWBackPixel | CWBorderPixel;
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23458
diff changeset
528 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
529 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
530
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
531 /* Start setting up overlay */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
532 XGetWindowAttributes(mDisplay, mRootWin, &xwin_attribs);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
533 overlay_set_screen(overlay_data, xwin_attribs.width, xwin_attribs.height, xwin_attribs.depth);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
534 overlay_read_state(overlay_data, NULL);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
535
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
536 /* Allocate keycolor */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
537 cmap = vo_x11_create_colormap(&vinfo);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
538 calculate_cvals(vinfo.red_mask, &red_shift, &red_prec);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
539 calculate_cvals(vinfo.green_mask, &green_shift, &green_prec);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
540 calculate_cvals(vinfo.blue_mask, &blue_shift, &blue_prec);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
541
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
542 key_color.red = ((KEY_COLOR >> 16) & 0xff) * 256;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
543 key_color.green = ((KEY_COLOR >> 8) & 0xff) * 256;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
544 key_color.blue = (KEY_COLOR & 0xff) * 256;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
545 key_color.pixel = (((key_color.red >> (16 - red_prec)) << red_shift) +
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
546 ((key_color.green >> (16 - green_prec)) << green_shift) +
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
547 ((key_color.blue >> (16 - blue_prec)) << blue_shift));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
548 key_color.flags = DoRed | DoGreen | DoBlue;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
549 if (!XAllocColor(mDisplay, cmap, &key_color)) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
550 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToAllocateKeycolor);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
551 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
552 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
553
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
554 acq_color = ((key_color.red / 256) << 16) | ((key_color.green / 256) << 8) | key_color.blue;
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
555 if (key_color.pixel != KEY_COLOR) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
556 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_UnableToAllocateExactKeycolor, key_color.pixel);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
557 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
558
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
559 /* Set keycolor and activate overlay */
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
560 XSetWindowBackground(mDisplay, vo_window, key_color.pixel);
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
561 XClearWindow(mDisplay, vo_window);
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
562 overlay_set_keycolor(overlay_data, key_color.pixel);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
563 overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OVERLAY);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
564 overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_RECTANGLE);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
565 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
566 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
567
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
568 return 0;
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
569 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
570
4602
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
571 static void draw_alpha(int x, int y, int w, int h, unsigned char* src, unsigned char *srca, int srcstride)
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
572 {
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
573 #ifdef SPU_SUPPORT
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
574 unsigned char *buf = &osdpicbuf[(y * osdpicbuf_w) + x];
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
575 int by = 0;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
576 register int lx, ly;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
577 register int stride = 0;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
578
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
579 for (ly = 0; ly < h - 1; ly++)
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
580 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
581 for(lx = 0; lx < w; lx++ )
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
582 if ( ( srca[stride + lx] )&&( src[stride + lx] >= 128 ) ) buf[by + lx] = 3;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
583 by+=osdpicbuf_w;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
584 stride+=srcstride;
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
585 }
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
586 pixbuf_encode_rle(x, y, osdpicbuf_w, osdpicbuf_h - 1, osdpicbuf, osdpicbuf_w, spued);
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
587 #endif
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
588 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
589
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
590 extern int vo_osd_changed_flag;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
591 extern mp_osd_obj_t* vo_osd_list;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
592
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
593 static void draw_osd(void)
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
594 {
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
595 #ifdef SPU_SUPPORT
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
596 static int cleared = 0;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
597 int changed = 0;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
598
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
599 if ((disposd % 15) == 0)
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
600 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
601 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
602 mp_osd_obj_t* obj = vo_osd_list;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
603 vo_update_osd( osd_w,osd_h );
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
604 while( obj )
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
605 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
606 if ( obj->flags & OSDFLAG_VISIBLE ) { changed=1; break; }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
607 obj=obj->next;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
608 }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
609 }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
610 if ( changed )
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
611 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
612 vo_draw_text(osd_w, osd_h, draw_alpha);
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
613 memset(osdpicbuf, 0, s_width * s_height);
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
614 cleared=0;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
615 }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
616 else
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
617 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
618 if ( !cleared )
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
619 {
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
620 spued->count=spubuf->count;
23457
a124f3abc1ec Replace implicit use of fast_memcpy via macro by explicit use to allow
reimar
parents: 23077
diff changeset
621 fast_memcpy( spued->data,spubuf->data,DATASIZE );
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
622 cleared=1;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
623 }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
624 }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
625
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
626
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
627 /* could stand some check here to see if the subpic hasn't changed
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
628 * as if it hasn't and we re-send it it will "blink" as the last one
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
629 * is turned off, and the new one (same one) is turned on
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
630 */
6748
c0e8034d47e4 Disabled spuenc, it still doesn't work well with the em8300
mswitch
parents: 6647
diff changeset
631 /* Subpics are not stable yet =(
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
632 expect lockups if you enable */
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
633 #if 1
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
634 write(fd_spu, spued->data, spued->count);
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
635 #endif
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
636 }
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
637 disposd++;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
638 #endif
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
639 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
640
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
641
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
642 static int draw_frame(uint8_t * src[])
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
643 {
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
644 vo_mpegpes_t *p = (vo_mpegpes_t *) src[0];
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
645
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
646 #ifdef SPU_SUPPORT
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
647 if (p->id == 0x20) {
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
648 write(fd_spu, p->data, p->size);
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
649 } else
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
650 #endif
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
651 write(fd_video, p->data, p->size);
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
652 return 0;
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
653 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
654
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
655 static void flip_page(void)
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
656 {
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
657 #ifdef CONFIG_X11
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
658 if (dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
659 int event = vo_x11_check_events(mDisplay);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
660 if (event & VO_EVENT_RESIZE) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
661 Window junkwindow;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
662 XGetWindowAttributes(mDisplay, vo_window, &xwin_attribs);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
663 XTranslateCoordinates(mDisplay, vo_window, mRootWin, -xwin_attribs.border_width, -xwin_attribs.border_width, &xwin_attribs.x, &xwin_attribs.y, &junkwindow);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
664 overlay_set_window(overlay_data, xwin_attribs.x, xwin_attribs.y, xwin_attribs.width, xwin_attribs.height);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
665 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
666 if (event & VO_EVENT_EXPOSE) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
667 Window junkwindow;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
668 XSetWindowBackground(mDisplay, vo_window, KEY_COLOR);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
669 XClearWindow(mDisplay, vo_window);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
670 XGetWindowAttributes(mDisplay, vo_window, &xwin_attribs);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
671 XTranslateCoordinates(mDisplay, vo_window, mRootWin, -xwin_attribs.border_width, -xwin_attribs.border_width, &xwin_attribs.x, &xwin_attribs.y, &junkwindow);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
672 overlay_set_window(overlay_data, xwin_attribs.x, xwin_attribs.y, xwin_attribs.width, xwin_attribs.height);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
673 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
674 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
675 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
676
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
677 if (dxr3_newsync) {
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
678 ioctl(fd_control, EM8300_IOCTL_SCR_GET, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
679 ioval <<= 1;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
680 if (vo_pts == 0) {
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
681 ioval = 0;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
682 ioctl(fd_control, EM8300_IOCTL_SCR_SET, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
683 pts_offset = 0;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
684 } else if ((vo_pts - pts_offset) < (ioval - 7200) || (vo_pts - pts_offset) > (ioval + 7200)) {
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
685 ioval = (vo_pts + pts_offset) >> 1;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
686 ioctl(fd_control, EM8300_IOCTL_SCR_SET, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
687 ioctl(fd_control, EM8300_IOCTL_SCR_GET, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
688 pts_offset = vo_pts - (ioval << 1);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
689 if (pts_offset < 0) {
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
690 pts_offset = 0;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
691 }
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
692 }
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
693 ioval = vo_pts + pts_offset;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
694 ioctl(fd_video, EM8300_IOCTL_SPU_SETPTS, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
695 ioctl(fd_video, EM8300_IOCTL_VIDEO_SETPTS, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
696 prev_pts = vo_pts;
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
697 } else if (dxr3_prebuf) {
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
698 ioctl(fd_spu, EM8300_IOCTL_SPU_SETPTS, &vo_pts);
4755
67c33b0fb847 Accidentally mixed experimental code with stable one during last commit,
mswitch
parents: 4754
diff changeset
699 ioctl(fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts);
67c33b0fb847 Accidentally mixed experimental code with stable one during last commit,
mswitch
parents: 4754
diff changeset
700 }
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
701 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
702
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
703 static int draw_slice(uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0)
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
704 {
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
705 return -1;
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
706 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
707
3208
98a587aaf505 Support for YV12 with DXR3, patch by D. Holm.
atmos4
parents: 3201
diff changeset
708 static void uninit(void)
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
709 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
710 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Uninitializing);
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
711 #ifdef CONFIG_X11
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
712 if (dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
713 overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
714 overlay_release(overlay_data);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
715
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 25596
diff changeset
716 #ifdef CONFIG_GUI
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
717 if (!use_gui) {
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
718 #endif
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
719 vo_x11_uninit();
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
720
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 25596
diff changeset
721 #ifdef CONFIG_GUI
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
722 }
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
723 #endif
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
724 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
725 #endif
8722
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
726 if (old_vmode != -1) {
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
727 if (ioctl(fd_control, EM8300_IOCTL_SET_VIDEOMODE, &old_vmode) < 0) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
728 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedRestoringTVNorm);
8722
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
729 }
86c0d90cd841 Added patch that makes the dxr3 return to the previous tv norm when quiting.
mswitch
parents: 8549
diff changeset
730 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
731
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
732 if (fd_video) {
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
733 close(fd_video);
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
734 }
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
735 if (fd_spu) {
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
736 close(fd_spu);
4218
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
737 }
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
738 if (fd_control) {
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
739 close(fd_control);
3931c41f740a Added new syncengine thanks to a new previously undocumented feature of the em8300, this might fix playback on both slow and fast machines (more testing needed). This also requires users to get the em8300 driver from cvs until the next version is released (will probably happen this weekend)
mswitch
parents: 4166
diff changeset
740 }
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
741 #ifdef SPU_SUPPORT
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
742 if(osdpicbuf) {
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
743 free(osdpicbuf);
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
744 }
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
745 if(spued) {
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
746 free(spued);
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
747 }
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
748 #endif
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
749 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
750
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
751 static void check_events(void)
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
752 {
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
753 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4269
diff changeset
754
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15212
diff changeset
755 static int preinit(const char *arg)
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4269
diff changeset
756 {
12646
9a495bdc3a1e string handling security fixes
diego
parents: 11542
diff changeset
757 char devname[MAX_STR_SIZE];
4605
b63ebfab3cdd Added switch to disable prebuffering
mswitch
parents: 4604
diff changeset
758 int fdflags = O_WRONLY;
5097
3456dd4a53f1 No longer force the device into not using fame
mswitch
parents: 5065
diff changeset
759
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
760 /* Parse commandline */
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
761 while (arg) {
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
762 if (!strncmp("prebuf", arg, 6) && !dxr3_prebuf) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
763 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_EnablingPrebuffering);
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
764 dxr3_prebuf = 1;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
765 } else if (!strncmp("sync", arg, 4) && !dxr3_newsync) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
766 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UsingNewSyncEngine);
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
767 dxr3_newsync = 1;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
768 } else if (!strncmp("overlay", arg, 7) && !dxr3_overlay) {
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
769 #ifdef CONFIG_X11
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
770 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UsingOverlay);
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
771 dxr3_overlay = 1;
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
772 #else
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
773 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_ErrorYouNeedToCompileMplayerWithX11);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
774 #endif
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
775 } else if (!strncmp("norm=", arg, 5)) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
776 arg += 5;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
777 // dxr3_norm is 0 (-> don't change norm) by default
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
778 // but maybe someone changes this in the future
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
779
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
780 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_WillSetTVNormTo);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
781
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
782 if (*arg == '5') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
783 dxr3_norm = 5;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
784 mp_msg(MSGT_VO,MSGL_INFO, "NTSC");
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
785 } else if (*arg == '4') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
786 dxr3_norm = 4;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
787 mp_msg(MSGT_VO,MSGL_INFO, "PAL-60");
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
788 } else if (*arg == '3') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
789 dxr3_norm = 3;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
790 mp_msg(MSGT_VO,MSGL_INFO, "PAL");
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
791 } else if (*arg == '2') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
792 dxr3_norm = 2;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
793 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_AutoAdjustToMovieFrameRatePALPAL60);
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
794 } else if (*arg == '1') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
795 dxr3_norm = 1;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
796 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_AutoAdjustToMovieFrameRatePALNTSC);
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
797 } else if (*arg == '0') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
798 dxr3_norm = 0;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
799 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UseCurrentNorm);
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
800 } else {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
801 dxr3_norm = 0;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
802 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_UseUnknownNormSuppliedCurrentNorm);
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
803 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
804
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
805 mp_msg(MSGT_VO,MSGL_INFO, ".\n");
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
806 } else if (arg[0] == '0' || arg[0] == '1' || arg[0] == '2' || arg[0] == '3') {
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
807 dxr3_device_num = arg[0];
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
808 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
809
5377
f7402401318c lego++ bug fixed by XorA
mswitch
parents: 5361
diff changeset
810 arg = strchr(arg, ':');
f7402401318c lego++ bug fixed by XorA
mswitch
parents: 5361
diff changeset
811 if (arg) {
f7402401318c lego++ bug fixed by XorA
mswitch
parents: 5361
diff changeset
812 arg++;
f7402401318c lego++ bug fixed by XorA
mswitch
parents: 5361
diff changeset
813 }
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
814 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
815
5225
a4a39919022a Fame support enabled, awaiting bugreports =D
mswitch
parents: 5199
diff changeset
816
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
817 /* Open the control interface */
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
818 sprintf(devname, "/dev/em8300-%d", dxr3_device_num);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
819 fd_control = open(devname, fdflags);
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
820 if (fd_control < 1) {
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
821 /* Fall back to old naming scheme */
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
822 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingTrying, devname);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
823 sprintf(devname, "/dev/em8300");
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
824 fd_control = open(devname, fdflags);
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
825 if (fd_control < 1) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
826 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingAsWell);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
827 return -1;
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
828 }
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
829 } else {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
830 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Opened, devname);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
831 }
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
832
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
833 /* Open the video interface */
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
834 sprintf(devname, "/dev/em8300_mv-%d", dxr3_device_num);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
835 fd_video = open(devname, fdflags);
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
836 if (fd_video < 0) {
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
837 /* Fall back to old naming scheme */
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
838 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingTryingMV, devname);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
839 sprintf(devname, "/dev/em8300_mv");
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
840 fd_video = open(devname, fdflags);
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
841 if (fd_video < 0) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
842 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingAsWellMV);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
843 uninit();
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
844 return -1;
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
845 }
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
846 } else {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
847 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Opened, devname);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
848 }
4602
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
849 strcpy(fdv_name, devname);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
850
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
851 /* Open the subpicture interface */
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
852 sprintf(devname, "/dev/em8300_sp-%d", dxr3_device_num);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
853 fd_spu = open(devname, fdflags);
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
854 if (fd_spu < 0) {
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
855 /* Fall back to old naming scheme */
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
856 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingTryingSP, devname);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
857 sprintf(devname, "/dev/em8300_sp");
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
858 fd_spu = open(devname, fdflags);
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
859 if (fd_spu < 0) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
860 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_ErrorOpeningForWritingAsWellSP);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
861 uninit();
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
862 return -1;
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
863 }
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
864 } else {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
865 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_Opened, devname);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
866 }
5499
58864ce0eef7 Fixed bug that would cause the dxr3 to lock if too many subpics were sent at once
mswitch
parents: 5497
diff changeset
867 strcpy(fds_name, devname);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
868
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
869 #ifdef CONFIG_X11
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
870 if (dxr3_overlay) {
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
871
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
872 /* Fucked up hack needed to enable overlay.
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
873 * Will be removed as soon as I figure out
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
874 * how to make it work like it should
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
875 */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
876 Display *dpy;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
877 overlay_t *ov;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
878 XWindowAttributes attribs;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
879
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
880 dpy = XOpenDisplay(NULL);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
881 if (!dpy) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
882 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToOpenDisplayDuringHackSetup);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
883 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
884 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
885 XGetWindowAttributes(dpy, RootWindow(dpy, DefaultScreen(dpy)), &attribs);
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
886 ov = overlay_init(fd_control);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
887 overlay_set_screen(ov, attribs.width, attribs.height, PlanesOfScreen(ScreenOfDisplay(dpy, 0)));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
888 overlay_read_state(ov, NULL);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
889 overlay_set_keycolor(ov, KEY_COLOR);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
890 overlay_set_mode(ov, EM8300_OVERLAY_MODE_OVERLAY);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
891 overlay_set_mode(ov, EM8300_OVERLAY_MODE_RECTANGLE);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
892 overlay_release(ov);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
893 XCloseDisplay(dpy);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
894 /* End of fucked up hack */
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
895
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
896 /* Initialize overlay and X11 */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
897 overlay_data = overlay_init(fd_control);
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 25596
diff changeset
898 #ifdef CONFIG_GUI
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
899 if (!use_gui) {
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
900 #endif
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
901 if (!vo_init()) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
902 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_UnableToInitX11);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
903 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
904 }
27343
5fe6a8adf569 Rename two GUI-related preprocessor directives:
diego
parents: 25596
diff changeset
905 #ifdef CONFIG_GUI
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
906 }
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
907 #endif
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
908 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
909 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
910
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
911 if (dxr3_newsync) {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
912 ioctl(fd_control, EM8300_IOCTL_SCR_GET, &ioval);
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
913 pts_offset = vo_pts - (ioval << 1);
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
914 if (pts_offset < 0) {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
915 pts_offset = 0;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
916 }
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
917 }
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
918
4480
0919d2ec5e22 Cleaned up some code
mswitch
parents: 4433
diff changeset
919 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4269
diff changeset
920 }
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
921
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
922 /* Begin overlay.c */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
923 static int update_parameters(overlay_t *o)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
924 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
925 overlay_set_attribute(o, EM9010_ATTRIBUTE_XOFFSET, o->xoffset);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
926 overlay_set_attribute(o, EM9010_ATTRIBUTE_YOFFSET, o->yoffset);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
927 overlay_set_attribute(o, EM9010_ATTRIBUTE_XCORR, o->xcorr);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
928 overlay_set_attribute(o, EM9010_ATTRIBUTE_STABILITY, o->stability);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
929 overlay_set_attribute(o, EM9010_ATTRIBUTE_JITTER, o->jitter);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
930 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
931 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
932
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
933 static int overlay_set_attribute(overlay_t *o, int attribute, int value)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
934 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
935 em8300_attribute_t attr;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
936
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
937 attr.attribute = attribute;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
938 attr.value = value;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
939 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SET_ATTRIBUTE, &attr)==-1)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
940 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
941 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedSettingOverlayAttribute);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
942 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
943 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
944
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
945 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
946 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
947
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
948 static overlay_t *overlay_init(int dev)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
949 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
950 overlay_t *o;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
951
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
952 o = (overlay_t *) malloc(sizeof(overlay_t));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
953
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
954 if(!o)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
955 return NULL;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
956
15026
d3e7f8966cef Fix memset() usage, patch by Ismail Donmez
rathann
parents: 13787
diff changeset
957 memset(o,0,sizeof(overlay_t));
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
958
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
959 o->dev = dev;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
960 o->xres = 1280; o->yres=1024; o->xcorr=1000;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
961 o->color_interval=10;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
962
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
963 return o;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
964 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
965
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
966 static int overlay_release(overlay_t *o)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
967 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
968 if(o)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
969 free(o);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
970
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
971 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
972 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
973 #define TYPE_INT 1
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
974 #define TYPE_XINT 2
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
975 #define TYPE_COEFF 3
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
976 #define TYPE_FLOAT 4
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
977
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
978 struct lut_entry {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
979 char *name;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
980 int type;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
981 void *ptr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
982 };
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
983
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
984 static struct lut_entry *new_lookuptable(overlay_t *o)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
985 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
986 struct lut_entry m[] = {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
987 {"xoffset", TYPE_INT, &o->xoffset},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
988 {"yoffset", TYPE_INT, &o->yoffset},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
989 {"xcorr", TYPE_INT, &o->xcorr},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
990 {"jitter", TYPE_INT, &o->jitter},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
991 {"stability", TYPE_INT, &o->stability},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
992 {"keycolor", TYPE_XINT, &o->keycolor},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
993 {"colcal_upper", TYPE_COEFF, &o->colcal_upper[0]},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
994 {"colcal_lower", TYPE_COEFF, &o->colcal_lower[0]},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
995 {"color_interval", TYPE_FLOAT, &o->color_interval},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
996 {0,0,0}
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
997 },*p;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
998
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
999 p = malloc(sizeof(m));
23458
973e53dc7df5 Do not use fast_memcpy for small size copy, esp. when the size is constant
reimar
parents: 23457
diff changeset
1000 memcpy(p,m,sizeof(m));
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1001 return p;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1002 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1003
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1004 static int lookup_parameter(overlay_t *o, struct lut_entry *lut, char *name, void **ptr, int *type) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1005 int i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1006
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1007 for(i=0; lut[i].name; i++) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1008 if(!strcmp(name,lut[i].name)) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1009 *ptr = lut[i].ptr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1010 *type = lut[i].type;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1011 return 1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1012 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1013 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1014 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1015 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1016
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1017 static int overlay_read_state(overlay_t *o, char *p)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1018 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1019 char *a,*tok;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1020 char path[128],fname[128],tmp[128],line[256];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1021 FILE *fp;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1022 struct lut_entry *lut;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1023 void *ptr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1024 int type;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1025 int j;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1026
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1027 if(!p) {
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23655
diff changeset
1028 av_strlcpy(fname, getenv("HOME"), sizeof( fname ));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1029 av_strlcat(fname,"/.overlay", sizeof( fname ));
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1030 } else
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23655
diff changeset
1031 av_strlcpy(fname, p, sizeof( fname ));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1032
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1033 sprintf(tmp,"/res_%dx%dx%d",o->xres,o->yres,o->depth);
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23655
diff changeset
1034 av_strlcat(fname, tmp, sizeof( fname ));
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1035
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1036 if(!(fp=fopen(fname,"r")))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1037 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1038
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1039 lut = new_lookuptable(o);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1040
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1041 while(!feof(fp)) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1042 if(!fgets(line,256,fp))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1043 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1044 tok=strtok(line," ");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1045 if(lookup_parameter(o,lut,tok,&ptr,&type)) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1046 tok=strtok(NULL," ");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1047 switch(type) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1048 case TYPE_INT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1049 sscanf(tok,"%d",(int *)ptr);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1050 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1051 case TYPE_XINT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1052 sscanf(tok,"%x",(int *)ptr);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1053 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1054 case TYPE_FLOAT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1055 sscanf(tok,"%f",(float *)ptr);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1056 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1057 case TYPE_COEFF:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1058 for(j=0;j<3;j++) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1059 sscanf(tok,"%f",&((struct coeff *)ptr)[j].k);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1060 tok=strtok(NULL," ");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1061 sscanf(tok,"%f",&((struct coeff *)ptr)[j].m);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1062 tok=strtok(NULL," ");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1063 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1064 break;
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1065 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1066
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1067 }
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1068 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1069
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1070 update_parameters(o);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1071
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1072 free(lut);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1073 fclose(fp);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1074 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1075 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1076
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1077 static void overlay_update_params(overlay_t *o) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1078 update_parameters(o);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1079 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1080
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1081 static int overlay_write_state(overlay_t *o, char *p)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1082 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1083 char *a;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1084 char path[128],fname[128],tmp[128];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1085 FILE *fp;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1086 char line[256],*tok;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1087 struct lut_entry *lut;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1088 int i,j;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1089
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1090 if(!p) {
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23655
diff changeset
1091 av_strlcpy(fname, getenv("HOME"), sizeof( fname ));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1092 av_strlcat(fname,"/.overlay", sizeof( fname ));
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1093 } else
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23655
diff changeset
1094 av_strlcpy(fname, p, sizeof( fname ));
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1095
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1096 if(access(fname, W_OK|X_OK|R_OK)) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1097 if(mkdir(fname,0766))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1098 return -1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1099 }
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1100
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1101 sprintf(tmp,"/res_%dx%dx%d",o->xres,o->yres,o->depth);
23703
9fb716ab06a3 Avoid code duplication and ugly config.h hack by using av_strlcat/av_strlcpy
reimar
parents: 23655
diff changeset
1102 av_strlcat(fname, tmp, sizeof( fname ));
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1103
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1104 if(!(fp=fopen(fname,"w")))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1105 return -1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1106
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1107 lut = new_lookuptable(o);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1108
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1109 for(i=0; lut[i].name; i++) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1110 fprintf(fp,"%s ",lut[i].name);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1111 switch(lut[i].type) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1112 case TYPE_INT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1113 fprintf(fp,"%d\n",*(int *)lut[i].ptr);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1114 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1115 case TYPE_XINT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1116 fprintf(fp,"%06x\n",*(int *)lut[i].ptr);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1117 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1118 case TYPE_FLOAT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1119 fprintf(fp,"%f\n",*(float *)lut[i].ptr);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1120 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1121 case TYPE_COEFF:
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1122 for(j=0;j<3;j++)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1123 fprintf(fp,"%f %f ",((struct coeff *)lut[i].ptr)[j].k,
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1124 ((struct coeff *)lut[i].ptr)[j].m);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1125 fprintf(fp,"\n");
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1126 break;
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1127 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1128 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1129
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1130 fclose(fp);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1131 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1132 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1133
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1134 static int overlay_set_screen(overlay_t *o, int xres, int yres, int depth)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1135 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1136 em8300_overlay_screen_t scr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1137
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1138 o->xres = xres;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1139 o->yres = yres;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1140 o->depth = depth;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1141
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1142 scr.xsize = xres;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1143 scr.ysize = yres;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1144
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1145 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SETSCREEN, &scr)==-1)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1146 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1147 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedSettingOverlayScreen);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1148 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1149 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1150 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1151 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1152
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1153 static int overlay_set_mode(overlay_t *o, int mode)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1154 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1155 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SETMODE, &mode)==-1) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1156 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedEnablingOverlay);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1157 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1158 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1159 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1160 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1161
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1162 static int overlay_set_window(overlay_t *o, int xpos,int ypos,int width,int height)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1163 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1164 em8300_overlay_window_t win;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1165 win.xpos = xpos;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1166 win.ypos = ypos;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1167 win.width = width;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1168 win.height = height;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1169
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1170 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SETWINDOW, &win)==-1)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1171 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1172 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedResizingOverlayWindow);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1173 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1174 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1175 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1176 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1177
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1178 static int overlay_set_bcs(overlay_t *o, int brightness, int contrast, int saturation)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1179 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1180 em8300_bcs_t bcs;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1181 bcs.brightness = brightness;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1182 bcs.contrast = contrast;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1183 bcs.saturation = saturation;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1184
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1185 if (ioctl(o->dev, EM8300_IOCTL_GETBCS, &bcs)==-1)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1186 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1187 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedSettingOverlayBcs);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1188 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1189 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1190 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1191 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1192
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1193 static int col_interp(float x, struct coeff c)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1194 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1195 float y;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1196 y = x*c.k + c.m;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1197 if(y > 255)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1198 y = 255;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1199 if(y < 0)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1200 y = 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1201 return rint(y);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1202 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1203
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1204 static int overlay_set_keycolor(overlay_t *o, int color) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1205 int r = (color & 0xff0000) >> 16;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1206 int g = (color & 0x00ff00) >> 8;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1207 int b = (color & 0x0000ff);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1208 float ru,gu,bu;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1209 float rl,gl,bl;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1210 int upper,lower;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1211
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1212 ru = r+o->color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1213 gu = g+o->color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1214 bu = b+o->color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1215
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1216 rl = r-o->color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1217 gl = g-o->color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1218 bl = b-o->color_interval;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 29087
diff changeset
1219
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1220 upper = (col_interp(ru, o->colcal_upper[0]) << 16) |
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1221 (col_interp(gu, o->colcal_upper[1]) << 8) |
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1222 (col_interp(bu, o->colcal_upper[2]));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1223
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1224 lower = (col_interp(rl, o->colcal_lower[0]) << 16) |
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1225 (col_interp(gl, o->colcal_lower[1]) << 8) |
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1226 (col_interp(bl, o->colcal_lower[2]));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1227
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1228 //printf("0x%06x 0x%06x\n",upper,lower);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1229 overlay_set_attribute(o,EM9010_ATTRIBUTE_KEYCOLOR_UPPER,upper);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1230 overlay_set_attribute(o,EM9010_ATTRIBUTE_KEYCOLOR_LOWER,lower);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1231 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1232 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1233
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1234 static void least_sq_fit(int *x, int *y, int n, float *k, float *m)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1235 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1236 float sx=0,sy=0,sxx=0,sxy=0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1237 float delta,b;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1238 int i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1239
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1240 for(i=0; i < n; i++) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1241 sx=sx+x[i];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1242 sy=sy+y[i];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1243 sxx=sxx+x[i]*x[i];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1244 sxy=sxy+x[i]*y[i];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1245 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1246
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1247 delta=sxx*n-sx*sx;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1248
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1249 *m=(sxx*sy-sx*sxy)/delta;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1250 *k=(sxy*n-sx*sy)/delta;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1251 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1252
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1253 static int overlay_autocalibrate(overlay_t *o, pattern_drawer_cb pd, void *arg)
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1254 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1255 em8300_overlay_calibrate_t cal;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1256 em8300_overlay_window_t win;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1257 int x[256],r[256],g[256],b[256],n;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1258 float k,m;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1259
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1260 int i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1261
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1262 o->draw_pattern=pd;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1263 o->dp_arg = arg;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1264
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1265 overlay_set_mode(o, EM8300_OVERLAY_MODE_OVERLAY);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1266 overlay_set_screen(o, o->xres, o->yres, o->depth);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1267
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1268 /* Calibrate Y-offset */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1269
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1270 o->draw_pattern(0x0000ff, 0, 0, 0, 355, 1, o->dp_arg);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1271
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1272 cal.cal_mode = EM8300_OVERLAY_CALMODE_YOFFSET;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1273 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_CALIBRATE, &cal))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1274 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1275 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedGettingOverlayYOffsetValues);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1276 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1277 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1278 o->yoffset = cal.result;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1279 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_YOffset,cal.result);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1280
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1281 /* Calibrate X-offset */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1282
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1283 o->draw_pattern(0x0000ff, 0, 0, 0, 2, 288, o->dp_arg);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1284
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1285 cal.cal_mode = EM8300_OVERLAY_CALMODE_XOFFSET;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1286 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_CALIBRATE, &cal))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1287 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1288 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedGettingOverlayXOffsetValues);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1289 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1290 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1291 o->xoffset = cal.result;
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1292 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_XOffset,cal.result);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1293
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1294 /* Calibrate X scale correction */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1295
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1296 o->draw_pattern(0x0000ff, 0, 355, 0, 2, 288, o->dp_arg);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1297
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1298 cal.cal_mode = EM8300_OVERLAY_CALMODE_XCORRECTION;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1299 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_CALIBRATE, &cal))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1300 {
18247
3c1418657a36 fix typo X<->Y
attila
parents: 18234
diff changeset
1301 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedGettingOverlayXScaleCorrection);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1302 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1303 }
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1304 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_DXR3_XCorrection,cal.result);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1305 o->xcorr = cal.result;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1306
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1307 win.xpos = 10;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1308 win.ypos = 10;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1309 win.width = o->xres-20;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1310 win.height = o->yres-20;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1311 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SETWINDOW, &win)==-1) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1312 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_DXR3_FailedResizingOverlayWindow);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1313 exit(1);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1314 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1315
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1316 /* Calibrate key color upper limit */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1317
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1318 for(i=128,n=0; i <= 0xff; i+=4) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1319 o->draw_pattern(i | (i << 8) | (i << 16), 0,
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1320 (o->xres-200)/2,0,200,o->yres,o->dp_arg);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1321
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1322 cal.arg = i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1323 cal.arg2 = 1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1324 cal.cal_mode = EM8300_OVERLAY_CALMODE_COLOR;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1325
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1326 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_CALIBRATE, &cal))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1327 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1328 return -1 ;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1329 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1330
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1331 x[n] = i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1332 r[n] = (cal.result>>16)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1333 g[n] = (cal.result>>8)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1334 b[n] = (cal.result)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1335 n++;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1336 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1337
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1338 least_sq_fit(x,r,n,&o->colcal_upper[0].k,&o->colcal_upper[0].m);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1339 least_sq_fit(x,g,n,&o->colcal_upper[1].k,&o->colcal_upper[1].m);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1340 least_sq_fit(x,b,n,&o->colcal_upper[2].k,&o->colcal_upper[2].m);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1341
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1342 /* Calibrate key color lower limit */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1343
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1344 for(i=128,n=0; i <= 0xff; i+=4) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1345 o->draw_pattern(i | (i << 8) | (i << 16), 0xffffff,
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1346 (o->xres-200)/2,0,200,o->yres, o->dp_arg);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1347
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1348 cal.arg = i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1349 cal.arg2 = 2;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1350 cal.cal_mode = EM8300_OVERLAY_CALMODE_COLOR;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1351
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1352 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_CALIBRATE, &cal))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1353 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1354 return -1 ;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1355 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1356 x[n] = i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1357 r[n] = (cal.result>>16)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1358 g[n] = (cal.result>>8)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1359 b[n] = (cal.result)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1360 n++;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1361 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1362
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1363 least_sq_fit(x,r,n,&o->colcal_lower[0].k,&o->colcal_lower[0].m);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1364 least_sq_fit(x,g,n,&o->colcal_lower[1].k,&o->colcal_lower[1].m);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1365 least_sq_fit(x,b,n,&o->colcal_lower[2].k,&o->colcal_lower[2].m);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1366
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1367 overlay_set_mode(o, EM8300_OVERLAY_MODE_OFF);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1368
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1369 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1370 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1371
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1372
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1373 static int overlay_signalmode(overlay_t *o, int mode) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1374 if(ioctl(o->dev, EM8300_IOCTL_OVERLAY_SIGNALMODE, &mode) ==-1) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17366
diff changeset
1375 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_DXR3_FailedSetSignalMix);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1376 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1377 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1378 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1379 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1380 /* End overlay.c */