annotate libvo/vo_dxr3.c @ 8694:79c0205ab4b5

sending 10l to Filip
author attila
date Wed, 01 Jan 2003 14:16:02 +0000
parents 9e958d71f73d
children 86c0d90cd841
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 /*
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
2 * vo_dxr3.c - DXR3/H+ video out
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
3 *
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
4 * Copyright (C) 2002 David Holm <dholm@iname.com>
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
5 *
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
6 */
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
7
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
8 /* ChangeLog added 2002-01-10
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
9 * 2002-12-24: (Hohoho)
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
10 * Added patch from Thomas Jarosch <tomj@simonv.com> which adds support
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
11 * for setting the TV norm by movie framerate.
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
12 *
8317
d1ed5c592696 Use MVCOMMAND_SYNC
mswitch
parents: 8148
diff changeset
13 * 2002-11-03:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
14 * Cleaned up syncing code and renamed setup variables so
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
15 * they can be accessed from the GUI.
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
16 *
8317
d1ed5c592696 Use MVCOMMAND_SYNC
mswitch
parents: 8148
diff changeset
17 * 2002-11-02:
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
18 * Added native overlay support, activate with :overlay
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
19 * you have to run dxr3view to modify settings (or manually
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
20 * edit the files in ~/.overlay.
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
21 *
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
22 * 2002-10-29:
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
23 * Added new sync-engine, activate with :sync option.
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
24 * Greatly improved commandline parser.
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
25 * Replaced :noprebuf with :prebuf and made noprebuf the default.
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
26 *
7945
32939f2b3d2e Fixed stupid bug relating to multiple cards on athlons
mswitch
parents: 7932
diff changeset
27 * 2002-10-28:
32939f2b3d2e Fixed stupid bug relating to multiple cards on athlons
mswitch
parents: 7932
diff changeset
28 * Fixed multicard bug on athlons
32939f2b3d2e Fixed stupid bug relating to multiple cards on athlons
mswitch
parents: 7932
diff changeset
29 *
6748
c0e8034d47e4 Disabled spuenc, it still doesn't work well with the em8300
mswitch
parents: 6647
diff changeset
30 * 2002-07-18:
c0e8034d47e4 Disabled spuenc, it still doesn't work well with the em8300
mswitch
parents: 6647
diff changeset
31 * Disabled spuenc support, this is still not stable enough =(
c0e8034d47e4 Disabled spuenc, it still doesn't work well with the em8300
mswitch
parents: 6647
diff changeset
32 *
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
33 * 2002-07-05:
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
34 * Removed lavc and fame encoder to be compatible with new libvo style.
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
35 * Added graphic equalizer support.
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
36 *
5647
5a2d49aa72c2 Disabled spuenc code due to upcoming prerelease, there are still bugs here
mswitch
parents: 5547
diff changeset
37 * 2002-04-15:
5a2d49aa72c2 Disabled spuenc code due to upcoming prerelease, there are still bugs here
mswitch
parents: 5547
diff changeset
38 * The spuenc code isn't 100% stable yet, therefore I'm disabling
5a2d49aa72c2 Disabled spuenc code due to upcoming prerelease, there are still bugs here
mswitch
parents: 5547
diff changeset
39 * it due to the upcoming stable release.
5a2d49aa72c2 Disabled spuenc code due to upcoming prerelease, there are still bugs here
mswitch
parents: 5547
diff changeset
40 *
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
41 * 2002-04-03:
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
42 * Carl George added spuenc support
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
43 *
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
44 * 2002-03-26:
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
45 * XorA added an option parser and support for selecting encoder
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
46 * codec. We thank him again.
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
47 *
5330
5766e8098794 Bugfix by XorA
mswitch
parents: 5310
diff changeset
48 * 2002-03-25:
5766e8098794 Bugfix by XorA
mswitch
parents: 5310
diff changeset
49 * A couple of bugfixes by XorA
5766e8098794 Bugfix by XorA
mswitch
parents: 5310
diff changeset
50 *
5273
8af542acc1b6 Jitter-bug fixed by Marcel Hild <hild@b4mad.net>, many many thanks goes
mswitch
parents: 5225
diff changeset
51 * 2002-03-23:
8af542acc1b6 Jitter-bug fixed by Marcel Hild <hild@b4mad.net>, many many thanks goes
mswitch
parents: 5225
diff changeset
52 * Thanks to Marcel Hild <hild@b4mad.net> the jitter-bug experienced
8af542acc1b6 Jitter-bug fixed by Marcel Hild <hild@b4mad.net>, many many thanks goes
mswitch
parents: 5225
diff changeset
53 * with some videos have been fixed, many thanks goes to him.
8af542acc1b6 Jitter-bug fixed by Marcel Hild <hild@b4mad.net>, many many thanks goes
mswitch
parents: 5225
diff changeset
54 *
5134
83b3dc5132a5 Fixed some bugs with fame, had to disable prebuffering with fame though
mswitch
parents: 5132
diff changeset
55 * 2002-03-16:
83b3dc5132a5 Fixed some bugs with fame, had to disable prebuffering with fame though
mswitch
parents: 5132
diff changeset
56 * Fixed problems with fame, it gives a better picture than avcodec,
83b3dc5132a5 Fixed some bugs with fame, had to disable prebuffering with fame though
mswitch
parents: 5132
diff changeset
57 * but is slightly slower. Most notably the wobbling effect is gone
83b3dc5132a5 Fixed some bugs with fame, had to disable prebuffering with fame though
mswitch
parents: 5132
diff changeset
58 * with fame.
83b3dc5132a5 Fixed some bugs with fame, had to disable prebuffering with fame though
mswitch
parents: 5132
diff changeset
59 *
5064
e0122262fb3c Added preliminary fame support
mswitch
parents: 4755
diff changeset
60 * 2002-03-13:
e0122262fb3c Added preliminary fame support
mswitch
parents: 4755
diff changeset
61 * Preliminary fame support added (it breaks after seeking, why?)
e0122262fb3c Added preliminary fame support
mswitch
parents: 4755
diff changeset
62 *
4755
67c33b0fb847 Accidentally mixed experimental code with stable one during last commit,
mswitch
parents: 4754
diff changeset
63 * 2002-02-18:
67c33b0fb847 Accidentally mixed experimental code with stable one during last commit,
mswitch
parents: 4754
diff changeset
64 * Fixed sync problems when pausing video (while using prebuffering)
67c33b0fb847 Accidentally mixed experimental code with stable one during last commit,
mswitch
parents: 4754
diff changeset
65 *
4723
93e959f0a6e4 Fixed bug which would cause gibberish to be printed when using :noprebuf
mswitch
parents: 4685
diff changeset
66 * 2002-02-16:
93e959f0a6e4 Fixed bug which would cause gibberish to be printed when using :noprebuf
mswitch
parents: 4685
diff changeset
67 * Fixed bug which would case invalid output when using :noprebuf
93e959f0a6e4 Fixed bug which would cause gibberish to be printed when using :noprebuf
mswitch
parents: 4685
diff changeset
68 * Removed equalization code, it caused problems on slow systems
93e959f0a6e4 Fixed bug which would cause gibberish to be printed when using :noprebuf
mswitch
parents: 4685
diff changeset
69 *
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
70 * 2002-02-13:
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
71 * Using the swscaler instead of the old hand coded shit. (Checkout man mplayer and search for sws ;).
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
72 * Using aspect function to setup a proper mpeg1, no more hassling with odd resolutions or GOP-sizes,
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
73 * this would only create jitter on some vids!
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
74 * The swscaler sometimes exits with sig8 on mpegs, I don't know why yet (just use -vc mpegpes in this
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
75 * case, and report to me if you have any avi's etc which does this...)
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
76 *
4602
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
77 * 2002-02-09:
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
78 * Thanks to the new control() method I have finally been able to enable the em8300 prebuffering.
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
79 * This should speed up playback on all systems, the vout cpu usage should rocket since I will be hogging
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
80 * the pci bus. Not to worry though, since frames are prebuffered it should be able to take a few blows
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
81 * if you start doing other stuff simultaneously.
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
82 *
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
83 * 2002-02-03:
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
84 * Removal of libmp1e, libavcodec has finally become faster (and it's code is helluva lot cleaner)
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
85 *
4480
0919d2ec5e22 Cleaned up some code
mswitch
parents: 4433
diff changeset
86 * 2002-02-02:
0919d2ec5e22 Cleaned up some code
mswitch
parents: 4433
diff changeset
87 * Cleaned out some old code which might have slowed down writes
0919d2ec5e22 Cleaned up some code
mswitch
parents: 4433
diff changeset
88 *
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
89 * 2002-01-17:
4219
70888f501b4a Fixed seeking
mswitch
parents: 4218
diff changeset
90 * Testrelease of new sync engine (using previously undocumented feature of em8300).
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
91 *
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
92 * 2002-01-15:
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
93 * Preliminary subpic support with -vc mpegpes and dvd's
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
94 * Device interfaces tries the new naming scheme by default (even though most users probably still use the old one)
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
95 *
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
96 * 2002-01-10:
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
97 * I rehauled the entire codebase. I have now changed to
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
98 * Kernighan & Ritchie codingstyle, please mail me if you
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
99 * find any inconcistencies.
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
100 */
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
101
2921
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
102 #include <linux/em8300.h>
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
103 #include <sys/ioctl.h>
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
104 #include <sys/stat.h>
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
105 #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
106 #include <sys/select.h>
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
107 #include <unistd.h>
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
108 #include <stdio.h>
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
109 #include <stdlib.h>
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
110 #include <string.h>
2921
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
111 #include <fcntl.h>
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
112 #include <stdio.h>
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
113 #include <time.h>
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
114 #include <math.h>
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
115
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
116 #include "config.h"
8123
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8092
diff changeset
117 #ifdef HAVE_MALLOC_H
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8092
diff changeset
118 #include <malloc.h>
9fc45fe0d444 *HUGE* set of compiler warning fixes, unused variables removal
arpi
parents: 8092
diff changeset
119 #endif
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
120 #include "fastmemcpy.h"
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
121
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
122 #include "video_out.h"
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
123 #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
124 #include "aspect.h"
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
125 #include "spuenc.h"
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
126 #include "sub.h"
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
127 #ifdef HAVE_NEW_GUI
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
128 #include "../Gui/interface.h"
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
129 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
130 #ifdef HAVE_X11
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
131 #include "x11_common.h"
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
132 #endif
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
133
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
134 #define SPU_SUPPORT
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
135
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8123
diff changeset
136 static vo_info_t info =
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
137 {
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
138 "DXR3/H+ video out",
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
139 "dxr3",
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
140 "David Holm <dholm@iname.com>",
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
141 ""
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
142 };
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
143 LIBVO_EXTERN (dxr3)
5377
f7402401318c lego++ bug fixed by XorA
mswitch
parents: 5361
diff changeset
144
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
145 /* Resolutions and positions */
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
146 static int v_width, v_height;
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
147 static int s_width, s_height;
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
148 static int osd_w, osd_h;
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
149 static int fullscreen = 0;
2770
b9732eaa82d9 DXR3 beta2 patch by David Holm.
atmos4
parents: 2732
diff changeset
150 static int img_format = 0;
3329
529a001496c2 Switched from rte which caused alot of problems for some users to libmp1e.
mswitch
parents: 3232
diff changeset
151
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
152 /* Configuration values
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
153 * Don't declare these static, they
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
154 * should be accessible from the gui.
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
155 */
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
156 int dxr3_prebuf = 0;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
157 int dxr3_newsync = 0;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
158 int dxr3_overlay = 0;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
159 int dxr3_device_num = 0;
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
160 int dxr3_norm = 0;
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
161
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
162 /* File descriptors */
2921
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
163 static int fd_control = -1;
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
164 static int fd_video = -1;
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
165 static int fd_spu = -1;
4602
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
166 static char fdv_name[80];
5499
58864ce0eef7 Fixed bug that would cause the dxr3 to lock if too many subpics were sent at once
mswitch
parents: 5497
diff changeset
167 static char fds_name[80];
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
168
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
169 #ifdef SPU_SUPPORT
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
170 /* on screen display/subpics */
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
171 static char *osdpicbuf = NULL;
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
172 static int osdpicbuf_w;
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
173 static int osdpicbuf_h;
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
174 static int disposd = 0;
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
175 static encodedata *spued;
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
176 static encodedata *spubuf;
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
177 #endif
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
178
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
179
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
180 /* Static variable used in ioctl's */
2921
ee37c7fc3022 dxr3-patch4 by David Holm
arpi
parents: 2866
diff changeset
181 static int ioval = 0;
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
182 static int prev_pts = 0;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
183 static int pts_offset = 0;
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
184
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
185
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
186 /* Begin overlay.h */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
187 /*
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
188 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
189
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
190 Henrik Johansson
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
191 */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
192
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
193
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
194 /* 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
195 The function is expected to:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
196 Clear the entire screen.
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
197 Fill the screen with color bgcol (0xRRGGBB)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
198 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
199 */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
200
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
201 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
202 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
203
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
204 struct coeff {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
205 float k,m;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
206 };
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
207
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
208 typedef struct {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
209 int dev;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
210
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
211 int xres, yres,depth;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
212 int xoffset,yoffset,xcorr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
213 int jitter;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
214 int stability;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
215 int keycolor;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
216 struct coeff colcal_upper[3];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
217 struct coeff colcal_lower[3];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
218 float color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
219
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
220 pattern_drawer_cb draw_pattern;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
221 void *dp_arg;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
222 } overlay_t;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
223
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
224
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
225 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
226 static int overlay_release(overlay_t *);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
227
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
228 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
229 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
230
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
231 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
232 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
233 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
234 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
235 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
236 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
237
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
238 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
239 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
240 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
241 /* End overlay.h */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
242
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
243
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
244 #ifdef HAVE_X11
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
245 #define KEY_COLOR 0x80a040
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
246 static XWindowAttributes xwin_attribs;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
247 static overlay_t *overlay_data;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
248 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
249
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
250
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
251 /* 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
252 /* End of internal clock functions */
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
253
7932
arpi
parents: 7151
diff changeset
254 static uint32_t control(uint32_t request, void *data, ...)
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
255 {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
256 switch (request) {
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6843
diff changeset
257 case VOCTRL_GUISUPPORT:
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
258 return VO_TRUE;
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6843
diff changeset
259 case VOCTRL_GUI_NOWINDOW:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
260 if (dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
261 return VO_FALSE;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
262 }
7009
98bed9e12087 - add dxr3 gui support (dialogbox, etc.)
pontscho
parents: 6843
diff changeset
263 return VO_TRUE;
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
264 case VOCTRL_SET_SPU_PALETTE:
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
265 if (ioctl(fd_spu, EM8300_IOCTL_SPU_SETPALETTE, data) < 0) {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
266 printf("VO: [dxr3] Unable to load new SPU palette!\n");
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
267 return VO_ERROR;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
268 }
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
269 return VO_TRUE;
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
270 #ifdef HAVE_X11
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
271 case VOCTRL_FULLSCREEN:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
272 if (dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
273 vo_x11_fullscreen();
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
274 if (fullscreen) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
275 overlay_signalmode(overlay_data, EM8300_OVERLAY_SIGNAL_WITH_VGA);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
276 fullscreen = 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
277 } else {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
278 overlay_signalmode(overlay_data, EM8300_OVERLAY_SIGNAL_ONLY);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
279 fullscreen = 1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
280 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
281 return VO_TRUE;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
282 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
283 return VO_FALSE;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
284 #endif
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
285 case VOCTRL_RESUME:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
286 if (dxr3_newsync) {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
287 ioctl(fd_control, EM8300_IOCTL_SCR_GET, &ioval);
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
288 pts_offset = vo_pts - (ioval << 1);
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
289 if (pts_offset < 0) {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
290 pts_offset = 0;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
291 }
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
292 }
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
293
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
294 if (dxr3_prebuf) {
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
295 ioval = EM8300_PLAYMODE_PLAY;
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
296 if (ioctl(fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval) < 0) {
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
297 printf("VO: [dxr3] Unable to set playmode!\n");
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
298 }
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
299 }
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
300 return VO_TRUE;
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
301 case VOCTRL_PAUSE:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
302 if (dxr3_prebuf) {
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
303 ioval = EM8300_PLAYMODE_PAUSED;
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
304 if (ioctl(fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval) < 0) {
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
305 printf("VO: [dxr3] Unable to set playmode!\n");
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
306 }
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
307 }
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
308 return VO_TRUE;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
309 case VOCTRL_RESET:
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
310 if (dxr3_prebuf) {
4605
b63ebfab3cdd Added switch to disable prebuffering
mswitch
parents: 4604
diff changeset
311 close(fd_video);
b63ebfab3cdd Added switch to disable prebuffering
mswitch
parents: 4604
diff changeset
312 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
313 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
314 fd_spu = open(fds_name, O_WRONLY);
4609
272b0a173417 Fixed a bug where seeking would lock mplayer
mswitch
parents: 4607
diff changeset
315 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
316 fsync(fd_spu);
4605
b63ebfab3cdd Added switch to disable prebuffering
mswitch
parents: 4604
diff changeset
317 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
318 return VO_TRUE;
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
319 case VOCTRL_QUERY_FORMAT:
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
320 {
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
321 uint32_t flag = 0;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
322
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
323 if (*((uint32_t*)data) != IMGFMT_MPEGPES)
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
324 return 0;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
325
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
326 flag = VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_SPU;
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
327 if (dxr3_prebuf)
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
328 flag |= VFCAP_TIMER;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
329 return flag;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
330 }
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
331 case VOCTRL_SET_EQUALIZER:
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
332 {
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
333 va_list ap;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
334 int value;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
335 em8300_bcs_t bcs;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
336
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
337 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
338 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
339 va_end(ap);
6748
c0e8034d47e4 Disabled spuenc, it still doesn't work well with the em8300
mswitch
parents: 6647
diff changeset
340
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
341 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
342 return VO_FALSE;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
343 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
344 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
345 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
346 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
347 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
348 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
349 else return VO_FALSE;
fad0147bd3aa - add dxr3 equ patch from "Szombathelyi [iso-8859-2] Gy«Órgy" <gyurco@freemail.hu>
pontscho
parents: 7067
diff changeset
350
6787
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
351 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
352 return VO_FALSE;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
353 return VO_TRUE;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
354 }
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
355 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
356 {
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
357 va_list ap;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
358 int *value;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
359 em8300_bcs_t bcs;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
360
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
361 va_start(ap, data);
6843
arpi
parents: 6787
diff changeset
362 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
363 va_end(ap);
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
364
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
365 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
366 return VO_FALSE;
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
367
f6a349add30d eq synced to new way, not tested, but the old one isn't working yet
alex
parents: 6748
diff changeset
368 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
369 *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
370 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
371 *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
372 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
373 *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
374 else return VO_FALSE;
fad0147bd3aa - add dxr3 equ patch from "Szombathelyi [iso-8859-2] Gy«Órgy" <gyurco@freemail.hu>
pontscho
parents: 7067
diff changeset
375
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
376 return VO_TRUE;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
377 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
378 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
379 return VO_NOTIMPL;
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
380 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4523
diff changeset
381
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
382 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
383 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
384 /* Calculate shift and precision */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
385 (*shift) = 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
386 (*prec) = 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
387
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
388 while (!(mask & 0x1)) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
389 (*shift)++;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
390 mask >>= 1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
391 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
392
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
393 while (mask & 0x1) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
394 (*prec)++;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
395 mask >>= 1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
396 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
397 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
398
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 7095
diff changeset
399 static uint32_t config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format)
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
400 {
4754
ad892563d9c4 Added VOCTRL_PAUSE and VOCTRL_RESUME
mswitch
parents: 4727
diff changeset
401 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
402 em8300_register_t reg;
5273
8af542acc1b6 Jitter-bug fixed by Marcel Hild <hild@b4mad.net>, many many thanks goes
mswitch
parents: 5225
diff changeset
403 extern float monitor_aspect;
6748
c0e8034d47e4 Disabled spuenc, it still doesn't work well with the em8300
mswitch
parents: 6647
diff changeset
404
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
405 /* 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
406 /* 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
407 /* 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
408 /* up in a lockup */
4160
ac62f8534409 hw spu support for dxr3 - patch by David Holm
arpi
parents: 4109
diff changeset
409 ioval = EM8300_SPUMODE_ON;
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
410 if (ioctl(fd_control, EM8300_IOCTL_SET_SPUMODE, &ioval) < 0) {
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
411 printf("VO: [dxr3] Unable to set subpicture mode!\n");
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
412 uninit();
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
413 return -1;
3201
039a973b3dda Newest DXR3 patch (improved 1.0rc2) by David Holm.
atmos4
parents: 3186
diff changeset
414 }
039a973b3dda Newest DXR3 patch (improved 1.0rc2) by David Holm.
atmos4
parents: 3186
diff changeset
415
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
416 /* 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
417 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
418 if (ioctl(fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval) < 0) {
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
419 printf("VO: [dxr3] Unable to set playmode!\n");
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
420 }
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
421
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
422 /* Start em8300 prebuffering and sync engine */
6618
d6c07ebda746 fix compile bug with driver 0.9+
pontscho
parents: 6212
diff changeset
423 #ifdef 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
424 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
425 reg.reg = 0;
8317
d1ed5c592696 Use MVCOMMAND_SYNC
mswitch
parents: 8148
diff changeset
426 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
427 ioctl(fd_control, EM8300_IOCTL_WRITEREG, &reg);
6618
d6c07ebda746 fix compile bug with driver 0.9+
pontscho
parents: 6212
diff changeset
428 #endif
d6c07ebda746 fix compile bug with driver 0.9+
pontscho
parents: 6212
diff changeset
429
d6c07ebda746 fix compile bug with driver 0.9+
pontscho
parents: 6212
diff changeset
430 #ifdef EM8300_IOCTL_FLUSH
4607
da09673aea00 Removed some stuff from the em8300 driver, had to compensate
mswitch
parents: 4605
diff changeset
431 /* Clean buffer by syncing it */
4609
272b0a173417 Fixed a bug where seeking would lock mplayer
mswitch
parents: 4607
diff changeset
432 ioval = EM8300_SUBDEVICE_VIDEO;
272b0a173417 Fixed a bug where seeking would lock mplayer
mswitch
parents: 4607
diff changeset
433 ioctl(fd_control, EM8300_IOCTL_FLUSH, &ioval);
272b0a173417 Fixed a bug where seeking would lock mplayer
mswitch
parents: 4607
diff changeset
434 ioval = EM8300_SUBDEVICE_AUDIO;
272b0a173417 Fixed a bug where seeking would lock mplayer
mswitch
parents: 4607
diff changeset
435 ioctl(fd_control, EM8300_IOCTL_FLUSH, &ioval);
6618
d6c07ebda746 fix compile bug with driver 0.9+
pontscho
parents: 6212
diff changeset
436 #endif
d6c07ebda746 fix compile bug with driver 0.9+
pontscho
parents: 6212
diff changeset
437
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
438 /* Sync the video device to make sure the buffers are empty
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
439 * and set the playback speed to normal. Also reset the
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
440 * em8300 internal clock.
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
441 */
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
442 fsync(fd_video);
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
443 ioval = 0x900;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
444 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
445
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
446 /* 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
447 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
448 v_width = width;
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
449 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
450
5273
8af542acc1b6 Jitter-bug fixed by Marcel Hild <hild@b4mad.net>, many many thanks goes
mswitch
parents: 5225
diff changeset
451 /* 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
452 monitor_aspect = (float) width / (float) height;
8af542acc1b6 Jitter-bug fixed by Marcel Hild <hild@b4mad.net>, many many thanks goes
mswitch
parents: 5225
diff changeset
453
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
454 /* adjust TV norm */
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
455 #ifdef EM8300_IOCTL_SET_VIDEOMODE
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
456 if (dxr3_norm != 0) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
457 if (dxr3_norm == 5) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
458 ioval = EM8300_VIDEOMODE_NTSC;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
459 } else if (dxr3_norm == 4) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
460 ioval = EM8300_VIDEOMODE_PAL60;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
461 } else if (dxr3_norm == 3) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
462 ioval = EM8300_VIDEOMODE_PAL;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
463 } else if (dxr3_norm == 2) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
464 if (vo_fps > 28) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
465 ioval = EM8300_VIDEOMODE_PAL60;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
466 } else {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
467 ioval = EM8300_VIDEOMODE_PAL;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
468 }
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
469
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
470 printf("VO: [dxr3] Auto-selected TV norm by frame rate: ");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
471 ioval == EM8300_VIDEOMODE_PAL60 ? printf("PAL-60") : printf("PAL");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
472 printf("\n");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
473 } else if (dxr3_norm == 1) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
474 if (vo_fps > 28) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
475 ioval = EM8300_VIDEOMODE_NTSC;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
476 } else {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
477 ioval = EM8300_VIDEOMODE_PAL;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
478 }
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
479
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
480 printf("VO: [dxr3] Auto-selected TV norm by frame rate: ");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
481 ioval == EM8300_VIDEOMODE_NTSC ? printf("NTSC") : printf("PAL");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
482 printf("\n");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
483 }
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
484
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
485 if (ioctl(fd_control, EM8300_IOCTL_SET_VIDEOMODE, &ioval) < 0) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
486 printf("VO: [dxr3] Unable to set TV norm!\n");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
487 }
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
488 }
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
489 #endif
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
490
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
491
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
492 /* 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
493 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
494 aspect_save_prescale(d_width, d_height);
6618
d6c07ebda746 fix compile bug with driver 0.9+
pontscho
parents: 6212
diff changeset
495 #ifdef EM8300_IOCTL_GET_VIDEOMODE
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
496 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
497 if (ioval == EM8300_VIDEOMODE_NTSC) {
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
498 printf("VO: [dxr3] Setting up for NTSC.\n");
5065
0d0694219daf This will slow down wobbling (just a bit)
mswitch
parents: 5064
diff changeset
499 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
500 } else {
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
501 printf("VO: [dxr3] Setting up for PAL/SECAM.\n");
5065
0d0694219daf This will slow down wobbling (just a bit)
mswitch
parents: 5064
diff changeset
502 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
503 }
6618
d6c07ebda746 fix compile bug with driver 0.9+
pontscho
parents: 6212
diff changeset
504 #endif
4685
e8a749c866cf Using the mplayer SwScaler instead of doing scaling manually (sometimes this dies with sig FPE
mswitch
parents: 4613
diff changeset
505 aspect(&s_width, &s_height, A_ZOOM);
5064
e0122262fb3c Added preliminary fame support
mswitch
parents: 4755
diff changeset
506 s_width -= s_width % 16;
5281
88df6d5f6ce7 Aspect code reenabled, apparently users didn't like running movies
mswitch
parents: 5275
diff changeset
507 s_height -= s_height % 16;
5064
e0122262fb3c Added preliminary fame support
mswitch
parents: 4755
diff changeset
508
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
509 /* 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
510 /* 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
511 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
512 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
513 if (tmp1 < tmp2) {
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
514 ioval = EM8300_ASPECTRATIO_4_3;
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
515 printf("VO: [dxr3] Setting aspect ratio to 4:3\n");
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
516 } else {
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
517 ioval = EM8300_ASPECTRATIO_16_9;
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
518 printf("VO: [dxr3] Setting aspect ratio to 16:9\n");
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
519 }
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
520 ioctl(fd_control, EM8300_IOCTL_SET_ASPECTRATIO, &ioval);
5064
e0122262fb3c Added preliminary fame support
mswitch
parents: 4755
diff changeset
521
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
522 #ifdef SPU_SUPPORT
7151
9e17b153b785 - fix window handling with dxr3
pontscho
parents: 7124
diff changeset
523 #ifdef HAVE_FREETYPE
9e17b153b785 - fix window handling with dxr3
pontscho
parents: 7124
diff changeset
524 s_width*=1.5;
9e17b153b785 - fix window handling with dxr3
pontscho
parents: 7124
diff changeset
525 #else
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
526 s_width*=2;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
527 s_height*=2;
7151
9e17b153b785 - fix window handling with dxr3
pontscho
parents: 7124
diff changeset
528 #endif
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
529
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
530 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
531 if (osdpicbuf == NULL) {
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
532 printf("vo_dxr3: out of mem\n");
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
533 return -1;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
534 }
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
535 spued = (encodedata *) malloc(sizeof(encodedata));
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
536 if (spued == NULL) {
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
537 free( osdpicbuf );
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
538 printf("vo_dxr3:out of mem\n");
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
539 return -1;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
540 }
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
541 spubuf = (encodedata *) malloc(sizeof(encodedata));
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
542 if (spubuf == NULL) {
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
543 free( osdpicbuf );
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
544 free( spued );
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
545 printf("vo_dxr3:out of mem\n");
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
546 return -1;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
547 }
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
548 osd_w = s_width;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
549 osd_h = s_height;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
550 osdpicbuf_w = s_width;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
551 osdpicbuf_h = s_height;
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
552
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
553 spubuf->count=0;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
554 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
555
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
556 #endif
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
557
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
558 #ifdef HAVE_X11
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
559 if (dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
560 XVisualInfo vinfo;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
561 XSetWindowAttributes xswa;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
562 XSizeHints hint;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
563 unsigned long xswamask;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
564 Colormap cmap;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
565 XColor key_color;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
566 Window junkwindow;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
567 Screen *scr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
568 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
569 em8300_overlay_screen_t ovlscr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
570 em8300_attribute_t ovlattr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
571
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
572 vo_dx = (vo_screenwidth - d_width) / 2;
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
573 vo_dy = (vo_screenheight - d_height) / 2;
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
574 vo_dwidth = d_width;
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
575 vo_dheight = d_height;
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
576 #ifdef HAVE_NEW_GUI
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
577 if (use_gui) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
578 guiGetEvent(guiSetShVideo, 0);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
579 XSetWindowBackground(mDisplay, vo_window, KEY_COLOR);
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
580 XClearWindow(mDisplay, vo_window);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
581 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
582 depth = xwin_attribs.depth;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
583 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
584 depth = 24;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
585 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
586 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
587 } else
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
588 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
589 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
590 XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
591 depth = xwin_attribs.depth;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
592 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
593 depth = 24;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
594 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
595 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
596 xswa.background_pixel = KEY_COLOR;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
597 xswa.border_pixel = 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
598 xswamask = CWBackPixel | CWBorderPixel;
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
599 hint.y = vo_dy;
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
600 hint.x = vo_dx;
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
601 hint.base_width = hint.width = vo_dwidth;
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
602 hint.base_height = hint.height = vo_dheight;
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
603 hint.flags = PPosition | PSize;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
604 vo_window = XCreateWindow(mDisplay, mRootWin, hint.x, hint.y, hint.width, hint.height, 0, depth, CopyFromParent, vinfo.visual, xswamask, &xswa);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
605 vo_x11_classhint(mDisplay, vo_window, "Viewing Window");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
606 vo_hidecursor(mDisplay, vo_window);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
607 vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PropertyChangeMask);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
608 XSetStandardProperties(mDisplay, vo_window, "DXR3 Overlay", "DXR3 Overlay", None, NULL, 0, &hint);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
609 XSetWMNormalHints(mDisplay, vo_window, &hint);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
610 XMapWindow(mDisplay, vo_window);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
611 XFlush(mDisplay);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
612 XSync(mDisplay, False);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
613 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
614
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
615 /* Start setting up overlay */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
616 XGetWindowAttributes(mDisplay, mRootWin, &xwin_attribs);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
617 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
618 overlay_read_state(overlay_data, NULL);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
619
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
620 /* Allocate keycolor */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
621 cmap = vo_x11_create_colormap(&vinfo);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
622 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
623 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
624 calculate_cvals(vinfo.blue_mask, &blue_shift, &blue_prec);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
625
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
626 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
627 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
628 key_color.blue = (KEY_COLOR & 0xff) * 256;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
629 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
630 ((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
631 ((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
632 key_color.flags = DoRed | DoGreen | DoBlue;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
633 if (!XAllocColor(mDisplay, cmap, &key_color)) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
634 printf("VO: [dxr3] Unable to allocate keycolor!\n");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
635 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
636 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
637
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
638 acq_color = ((key_color.red / 256) << 16) | ((key_color.green / 256) << 8) | key_color.blue;
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
639 if (key_color.pixel != KEY_COLOR) {
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
640 printf("VO: [dxr3] Unable to allocate exact keycolor, using closest match (%0x)\n", key_color.pixel);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
641 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
642
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
643 /* Set keycolor and activate overlay */
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
644 XSetWindowBackground(mDisplay, vo_window, key_color.pixel);
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
645 XClearWindow(mDisplay, vo_window);
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
646 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
647 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
648 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
649 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
650 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
651
6647
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
4602
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
655 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
656 {
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
657 #ifdef SPU_SUPPORT
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
658 unsigned char *buf = &osdpicbuf[(y * osdpicbuf_w) + x];
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
659 int by = 0;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
660 register int lx, ly;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
661 register int stride = 0;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
662
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
663 for (ly = 0; ly < h - 1; ly++)
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
664 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
665 for(lx = 0; lx < w; lx++ )
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
666 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
667 by+=osdpicbuf_w;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
668 stride+=srcstride;
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
669 }
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
670 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
671 #endif
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
672 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
673
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
674 extern int vo_osd_changed_flag;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
675 extern mp_osd_obj_t* vo_osd_list;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
676
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
677 static void draw_osd(void)
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
678 {
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
679 #ifdef SPU_SUPPORT
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
680 static int cleared = 0;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
681 int changed = 0;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
682
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
683 if ((disposd % 15) == 0)
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
684 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
685 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
686 mp_osd_obj_t* obj = vo_osd_list;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
687 vo_update_osd( osd_w,osd_h );
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
688 while( obj )
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
689 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
690 if ( obj->flags & OSDFLAG_VISIBLE ) { changed=1; break; }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
691 obj=obj->next;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
692 }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
693 }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
694 if ( changed )
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
695 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
696 vo_draw_text(osd_w, osd_h, draw_alpha);
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
697 memset(osdpicbuf, 0, s_width * s_height);
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
698 cleared=0;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
699 }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
700 else
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
701 {
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
702 if ( !cleared )
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
703 {
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
704 spued->count=spubuf->count;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
705 memcpy( spued->data,spubuf->data,DATASIZE );
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
706 cleared=1;
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
707 }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
708 }
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
709
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
710
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
711 /* 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
712 * 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
713 * 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
714 */
6748
c0e8034d47e4 Disabled spuenc, it still doesn't work well with the em8300
mswitch
parents: 6647
diff changeset
715 /* Subpics are not stable yet =(
7067
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
716 expect lockups if you enable */
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
717 #if 1
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
718 write(fd_spu, spued->data, spued->count);
b395b1240954 fix dxr3 subtitle handling and add some optimizations
pontscho
parents: 7009
diff changeset
719 #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
720 }
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
721 disposd++;
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
722 #endif
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
723 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
724
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
725
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
726 static uint32_t draw_frame(uint8_t * src[])
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
727 {
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
728 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
729
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
730 #ifdef SPU_SUPPORT
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
731 if (p->id == 0x20) {
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
732 write(fd_spu, p->data, p->size);
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
733 } else
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
734 #endif
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
735 write(fd_video, p->data, p->size);
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
736 return 0;
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
737 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
738
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
739 static void flip_page(void)
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
740 {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
741 #ifdef HAVE_X11
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
742 if (dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
743 int event = vo_x11_check_events(mDisplay);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
744 if (event & VO_EVENT_RESIZE) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
745 Window junkwindow;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
746 XGetWindowAttributes(mDisplay, vo_window, &xwin_attribs);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
747 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
748 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
749 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
750 if (event & VO_EVENT_EXPOSE) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
751 Window junkwindow;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
752 XSetWindowBackground(mDisplay, vo_window, KEY_COLOR);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
753 XClearWindow(mDisplay, vo_window);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
754 XGetWindowAttributes(mDisplay, vo_window, &xwin_attribs);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
755 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
756 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
757 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
758 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
759 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
760
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
761 if (dxr3_newsync) {
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
762 ioctl(fd_control, EM8300_IOCTL_SCR_GET, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
763 ioval <<= 1;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
764 if (vo_pts == 0) {
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
765 ioval = 0;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
766 ioctl(fd_control, EM8300_IOCTL_SCR_SET, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
767 pts_offset = 0;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
768 } 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
769 ioval = (vo_pts + pts_offset) >> 1;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
770 ioctl(fd_control, EM8300_IOCTL_SCR_SET, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
771 ioctl(fd_control, EM8300_IOCTL_SCR_GET, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
772 pts_offset = vo_pts - (ioval << 1);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
773 if (pts_offset < 0) {
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
774 pts_offset = 0;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
775 }
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
776 }
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
777 ioval = vo_pts + pts_offset;
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
778 ioctl(fd_video, EM8300_IOCTL_SPU_SETPTS, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
779 ioctl(fd_video, EM8300_IOCTL_VIDEO_SETPTS, &ioval);
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
780 prev_pts = vo_pts;
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
781 } else if (dxr3_prebuf) {
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
782 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
783 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
784 }
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
785 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
786
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
787 static uint32_t 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
788 {
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
789 return -1;
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
790 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
791
3208
98a587aaf505 Support for YV12 with DXR3, patch by D. Holm.
atmos4
parents: 3201
diff changeset
792 static void uninit(void)
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
793 {
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
794 printf("VO: [dxr3] Uninitializing\n");
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
795 #ifdef HAVE_X11
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
796 if (dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
797 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
798 overlay_release(overlay_data);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
799
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
800 #ifdef HAVE_NEW_GUI
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
801 if (!use_gui) {
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
802 #endif
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
803 vo_x11_uninit();
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
804
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
805 #ifdef HAVE_NEW_GUI
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
806 }
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
807 #endif
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
808 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
809 #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
810 if (fd_video) {
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
811 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
812 }
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
813 if (fd_spu) {
4095
a3f3858b8c15 useless cosmetics changes... a.k.a. cvslog killer - patch by David Holm
arpi
parents: 4063
diff changeset
814 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
815 }
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
816 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
817 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
818 }
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
819 #ifdef SPU_SUPPORT
5490
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
820 if(osdpicbuf) {
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
821 free(osdpicbuf);
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
822 }
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
823 if(spued) {
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
824 free(spued);
78bd1fa449c3 Added spuenc... should write a draw_alpha_spu perhaps =D
mswitch
parents: 5397
diff changeset
825 }
6647
c66284733f3d removed fame and lavc encoder, enabled spu encoder, added equaliuzer support
alex
parents: 6618
diff changeset
826 #endif
2645
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
827 }
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
828
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
829 static void check_events(void)
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
830 {
9d8d69fc517c ao_dxr3 by David Holm <dholm@telia.com>
arpi
parents:
diff changeset
831 }
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4269
diff changeset
832
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4269
diff changeset
833 static uint32_t preinit(const char *arg)
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4269
diff changeset
834 {
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
835 char devname[80];
4605
b63ebfab3cdd Added switch to disable prebuffering
mswitch
parents: 4604
diff changeset
836 int fdflags = O_WRONLY;
5097
3456dd4a53f1 No longer force the device into not using fame
mswitch
parents: 5065
diff changeset
837
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
838 /* Parse commandline */
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
839 while (arg) {
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
840 if (!strncmp("prebuf", arg, 6) && !dxr3_prebuf) {
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
841 printf("VO: [dxr3] Enabling prebuffering.\n");
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
842 dxr3_prebuf = 1;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
843 fdflags |= O_NONBLOCK;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
844 } else if (!strncmp("sync", arg, 4) && !dxr3_newsync) {
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
845 printf("VO: [dxr3] Using new sync engine.\n");
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
846 dxr3_newsync = 1;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
847 } else if (!strncmp("overlay", arg, 7) && !dxr3_overlay) {
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
848 #ifdef HAVE_X11
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
849 printf("VO: [dxr3] Using overlay.\n");
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
850 dxr3_overlay = 1;
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
851 #else
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
852 printf("VO: [dxr3] Error: You need to compile mplayer with x11 libraries and headers installed to use overlay.\n");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
853 #endif
8549
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
854 } else if (!strncmp("norm=", arg, 5)) {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
855 arg += 5;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
856 // dxr3_norm is 0 (-> don't change norm) by default
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
857 // but maybe someone changes this in the future
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
858
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
859 printf("VO: [dxr3] Will set TV norm to: ");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
860
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
861 if (*arg == '5') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
862 dxr3_norm = 5;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
863 printf("NTSC");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
864 } else if (*arg == '4') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
865 dxr3_norm = 4;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
866 printf("PAL-60");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
867 } else if (*arg == '3') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
868 dxr3_norm = 3;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
869 printf("PAL");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
870 } else if (*arg == '2') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
871 dxr3_norm = 2;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
872 printf("Auto-adjust to movie frame rate (PAL/PAL60)");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
873 } else if (*arg == '1') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
874 dxr3_norm = 1;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
875 printf("Auto-adjust to movie frame rate (PAL/NTSC)");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
876 } else if (*arg == '0') {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
877 dxr3_norm = 0;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
878 printf("Use current norm");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
879 } else {
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
880 dxr3_norm = 0;
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
881 printf("Unknown norm supplied. Use current norm");
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
882 }
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
883
9e958d71f73d Added patch from Thomas Jarosch
mswitch
parents: 8317
diff changeset
884 printf("\n");
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
885 } 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
886 dxr3_device_num = arg[0];
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
887 }
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
888
5377
f7402401318c lego++ bug fixed by XorA
mswitch
parents: 5361
diff changeset
889 arg = strchr(arg, ':');
f7402401318c lego++ bug fixed by XorA
mswitch
parents: 5361
diff changeset
890 if (arg) {
f7402401318c lego++ bug fixed by XorA
mswitch
parents: 5361
diff changeset
891 arg++;
f7402401318c lego++ bug fixed by XorA
mswitch
parents: 5361
diff changeset
892 }
5361
3e81a50e33ff XorA added the option of switching between fame/avcodec without
mswitch
parents: 5330
diff changeset
893 }
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
894
5225
a4a39919022a Fame support enabled, awaiting bugreports =D
mswitch
parents: 5199
diff changeset
895
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
896 /* Open the control interface */
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
897 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
898 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
899 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
900 /* Fall back to old naming scheme */
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
901 printf("VO: [dxr3] Error opening %s for writing, trying /dev/em8300 instead\n", devname);
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
902 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
903 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
904 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
905 printf("VO: [dxr3] Error opening /dev/em8300 for writing as well!\nBailing\n");
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
906 return -1;
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
907 }
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
908 } else {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
909 printf("VO: [dxr3] Opened %s\n", devname);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
910 }
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
911
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
912 /* Open the video interface */
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
913 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
914 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
915 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
916 /* Fall back to old naming scheme */
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
917 printf("VO: [dxr3] Error opening %s for writing, trying /dev/em8300_mv instead\n", devname);
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
918 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
919 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
920 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
921 printf("VO: [dxr3] Error opening /dev/em8300_mv for writing as well!\nBailing\n");
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
922 uninit();
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
923 return -1;
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
924 }
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
925 } else {
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
926 printf("VO: [dxr3] Opened %s\n", devname);
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
927 }
4602
e4a96fe4f3d2 Thanks to the new control() method I've finally been able to add prebuffering support. This
mswitch
parents: 4596
diff changeset
928 strcpy(fdv_name, devname);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
929
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
930 /* Open the subpicture interface */
5647
5a2d49aa72c2 Disabled spuenc code due to upcoming prerelease, there are still bugs here
mswitch
parents: 5547
diff changeset
931 fdflags |= O_NONBLOCK;
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
932 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
933 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
934 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
935 /* Fall back to old naming scheme */
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
936 printf("VO: [dxr3] Error opening %s for writing, trying /dev/em8300_sp instead\n", devname);
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
937 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
938 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
939 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
940 printf("VO: [dxr3] Error opening /dev/em8300_sp for writing as well!\nBailing\n");
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
941 uninit();
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
942 return -1;
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
943 }
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
944 } else {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
945 printf("VO: [dxr3] Opened %s\n", devname);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
946 }
5499
58864ce0eef7 Fixed bug that would cause the dxr3 to lock if too many subpics were sent at once
mswitch
parents: 5497
diff changeset
947 strcpy(fds_name, devname);
4513
2e3800da1ceb Switched from libmp1e to libavcodec, at least for me it runs helluva lot faster than libmp1e
mswitch
parents: 4480
diff changeset
948
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
949 #ifdef HAVE_X11
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
950 if (dxr3_overlay) {
7950
d41eb993f6e2 Prebuffering is no longer the default option.
mswitch
parents: 7945
diff changeset
951
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
952 /* Fucked up hack needed to enable overlay.
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
953 * 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
954 * 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
955 */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
956 Display *dpy;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
957 overlay_t *ov;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
958 XWindowAttributes attribs;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
959
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
960 dpy = XOpenDisplay(NULL);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
961 if (!dpy) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
962 printf("VO: [dxr3] Unable to open display during overlay hack setup!\n");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
963 return -1;
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 XGetWindowAttributes(dpy, RootWindow(dpy, DefaultScreen(dpy)), &attribs);
8037
204af38e3f20 Minor cleanups
mswitch
parents: 8031
diff changeset
966 ov = overlay_init(fd_control);
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
967 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
968 overlay_read_state(ov, NULL);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
969 overlay_set_keycolor(ov, KEY_COLOR);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
970 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
971 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
972 overlay_release(ov);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
973 XCloseDisplay(dpy);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
974 /* End of fucked up hack */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
975
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
976 /* Initialize overlay and X11 */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
977 overlay_data = overlay_init(fd_control);
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
978 #ifdef HAVE_NEW_GUI
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
979 if (!use_gui) {
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
980 #endif
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
981 if (!vo_init()) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
982 printf("VO: [dxr3] Unable to init x11!\n");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
983 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
984 }
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
985 #ifdef HAVE_NEW_GUI
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
986 }
8042
72b8f3c62d83 Missed some gui ifdefs
mswitch
parents: 8037
diff changeset
987 #endif
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
988 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
989 #endif
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
990
8088
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
991 if (dxr3_newsync) {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
992 ioctl(fd_control, EM8300_IOCTL_SCR_GET, &ioval);
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
993 pts_offset = vo_pts - (ioval << 1);
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
994 if (pts_offset < 0) {
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
995 pts_offset = 0;
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
996 }
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
997 }
59f4133fbab5 Updated docs with DXR3 overlay info
mswitch
parents: 8042
diff changeset
998
4480
0919d2ec5e22 Cleaned up some code
mswitch
parents: 4433
diff changeset
999 return 0;
4352
ed5b85b713a3 Extensions for video accelerated architecture
nick
parents: 4269
diff changeset
1000 }
8031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1001
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1002 /* Begin overlay.c */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1003 static int update_parameters(overlay_t *o)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1004 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1005 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
1006 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
1007 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
1008 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
1009 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
1010 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1011 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1012
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1013 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
1014 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1015 em8300_attribute_t attr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1016
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1017 attr.attribute = attribute;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1018 attr.value = value;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1019 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
1020 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1021 perror("Failed set attribute");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1022 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1023 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1024
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1025 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1026 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1027
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1028 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
1029 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1030 overlay_t *o;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1031
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1032 o = (overlay_t *) malloc(sizeof(overlay_t));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1033
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1034 if(!o)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1035 return NULL;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1036
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1037 memset(o,sizeof(overlay_t),0);
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 o->dev = dev;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1040 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
1041 o->color_interval=10;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1042
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1043 return o;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1044 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1045
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1046 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
1047 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1048 if(o)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1049 free(o);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1050
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1051 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1052 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1053 #define TYPE_INT 1
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1054 #define TYPE_XINT 2
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1055 #define TYPE_COEFF 3
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1056 #define TYPE_FLOAT 4
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1057
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1058 struct lut_entry {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1059 char *name;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1060 int type;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1061 void *ptr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1062 };
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1063
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1064 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
1065 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1066 struct lut_entry m[] = {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1067 {"xoffset", TYPE_INT, &o->xoffset},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1068 {"yoffset", TYPE_INT, &o->yoffset},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1069 {"xcorr", TYPE_INT, &o->xcorr},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1070 {"jitter", TYPE_INT, &o->jitter},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1071 {"stability", TYPE_INT, &o->stability},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1072 {"keycolor", TYPE_XINT, &o->keycolor},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1073 {"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
1074 {"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
1075 {"color_interval", TYPE_FLOAT, &o->color_interval},
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1076 {0,0,0}
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1077 },*p;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1078
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1079 p = malloc(sizeof(m));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1080 memcpy(p,m,sizeof(m));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1081 return p;
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
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1084 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
1085 int i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1086
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1087 for(i=0; lut[i].name; i++) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1088 if(!strcmp(name,lut[i].name)) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1089 *ptr = lut[i].ptr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1090 *type = lut[i].type;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1091 return 1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1092 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1093 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1094 return 0;
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
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1097 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
1098 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1099 char *a,*tok;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1100 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
1101 FILE *fp;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1102 struct lut_entry *lut;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1103 void *ptr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1104 int type;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1105 int j;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1106
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1107 if(!p) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1108 strcpy(fname,getenv("HOME"));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1109 strcat(fname,"/.overlay");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1110 } else
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1111 strcpy(fname,p);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1112
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1113 sprintf(tmp,"/res_%dx%dx%d",o->xres,o->yres,o->depth);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1114 strcat(fname,tmp);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1115
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1116 if(!(fp=fopen(fname,"r")))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1117 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1118
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1119 lut = new_lookuptable(o);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1120
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1121 while(!feof(fp)) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1122 if(!fgets(line,256,fp))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1123 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1124 tok=strtok(line," ");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1125 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
1126 tok=strtok(NULL," ");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1127 switch(type) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1128 case TYPE_INT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1129 sscanf(tok,"%d",(int *)ptr);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1130 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1131 case TYPE_XINT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1132 sscanf(tok,"%x",(int *)ptr);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1133 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1134 case TYPE_FLOAT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1135 sscanf(tok,"%f",(float *)ptr);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1136 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1137 case TYPE_COEFF:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1138 for(j=0;j<3;j++) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1139 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
1140 tok=strtok(NULL," ");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1141 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
1142 tok=strtok(NULL," ");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1143 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1144 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1145 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1146
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1147 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1148 }
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 update_parameters(o);
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 free(lut);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1153 fclose(fp);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1154 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1155 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1156
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1157 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
1158 update_parameters(o);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1159 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1160
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1161 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
1162 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1163 char *a;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1164 char path[128],fname[128],tmp[128];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1165 FILE *fp;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1166 char line[256],*tok;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1167 struct lut_entry *lut;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1168 int i,j;
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(!p) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1171 strcpy(fname,getenv("HOME"));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1172 strcat(fname,"/.overlay");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1173 } else
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1174 strcpy(fname,p);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1175
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1176 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
1177 if(mkdir(fname,0766))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1178 return -1;
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
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1181 sprintf(tmp,"/res_%dx%dx%d",o->xres,o->yres,o->depth);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1182 strcat(fname,tmp);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1183
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1184 if(!(fp=fopen(fname,"w")))
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1185 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1186
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1187 lut = new_lookuptable(o);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1188
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1189 for(i=0; lut[i].name; i++) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1190 fprintf(fp,"%s ",lut[i].name);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1191 switch(lut[i].type) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1192 case TYPE_INT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1193 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
1194 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1195 case TYPE_XINT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1196 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
1197 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1198 case TYPE_FLOAT:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1199 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
1200 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1201 case TYPE_COEFF:
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1202 for(j=0;j<3;j++)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1203 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
1204 ((struct coeff *)lut[i].ptr)[j].m);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1205 fprintf(fp,"\n");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1206 break;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1207 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1208 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1209
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1210 fclose(fp);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1211 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1212 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1213
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1214 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
1215 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1216 em8300_overlay_screen_t scr;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1217
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1218 o->xres = xres;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1219 o->yres = yres;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1220 o->depth = depth;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1221
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1222 scr.xsize = xres;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1223 scr.ysize = yres;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1224
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1225 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
1226 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1227 perror("Failed set screen...exiting");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1228 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1229 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1230 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1231 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1232
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1233 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
1234 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1235 if (ioctl(o->dev, EM8300_IOCTL_OVERLAY_SETMODE, &mode)==-1) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1236 perror("Failed enabling overlay..exiting");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1237 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1238 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1239 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1240 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1241
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1242 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
1243 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1244 em8300_overlay_window_t win;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1245 win.xpos = xpos;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1246 win.ypos = ypos;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1247 win.width = width;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1248 win.height = height;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1249
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1250 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
1251 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1252 perror("Failed resizing window");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1253 return -1;
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 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1256 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1257
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1258 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
1259 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1260 em8300_bcs_t bcs;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1261 bcs.brightness = brightness;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1262 bcs.contrast = contrast;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1263 bcs.saturation = saturation;
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 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
1266 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1267 perror("Failed setting bcs");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1268 return -1;
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 return 0;
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
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1273 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
1274 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1275 float y;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1276 y = x*c.k + c.m;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1277 if(y > 255)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1278 y = 255;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1279 if(y < 0)
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1280 y = 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1281 return rint(y);
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
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1284 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
1285 int r = (color & 0xff0000) >> 16;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1286 int g = (color & 0x00ff00) >> 8;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1287 int b = (color & 0x0000ff);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1288 float ru,gu,bu;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1289 float rl,gl,bl;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1290 int upper,lower;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1291
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1292 ru = r+o->color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1293 gu = g+o->color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1294 bu = b+o->color_interval;
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 rl = r-o->color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1297 gl = g-o->color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1298 bl = b-o->color_interval;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1299
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1300 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
1301 (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
1302 (col_interp(bu, o->colcal_upper[2]));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1303
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1304 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
1305 (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
1306 (col_interp(bl, o->colcal_lower[2]));
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1307
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1308 //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
1309 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
1310 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
1311 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1312 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1313
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1314 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
1315 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1316 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
1317 float delta,b;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1318 int i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1319
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1320 for(i=0; i < n; i++) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1321 sx=sx+x[i];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1322 sy=sy+y[i];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1323 sxx=sxx+x[i]*x[i];
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1324 sxy=sxy+x[i]*y[i];
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
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1327 delta=sxx*n-sx*sx;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1328
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1329 *m=(sxx*sy-sx*sxy)/delta;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1330 *k=(sxy*n-sx*sy)/delta;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1331 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1332
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1333 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
1334 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1335 em8300_overlay_calibrate_t cal;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1336 em8300_overlay_window_t win;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1337 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
1338 float k,m;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1339
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1340 int i;
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 o->draw_pattern=pd;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1343 o->dp_arg = arg;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1344
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1345 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
1346 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
1347
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1348 /* Calibrate Y-offset */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1349
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1350 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
1351
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1352 cal.cal_mode = EM8300_OVERLAY_CALMODE_YOFFSET;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1353 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
1354 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1355 perror("Failed getting Yoffset values...exiting");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1356 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1357 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1358 o->yoffset = cal.result;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1359 printf("Yoffset: %d\n",cal.result);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1360
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1361 /* Calibrate X-offset */
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 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
1364
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1365 cal.cal_mode = EM8300_OVERLAY_CALMODE_XOFFSET;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1366 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
1367 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1368 perror("Failed getting Xoffset values...exiting");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1369 return -1;
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 o->xoffset = cal.result;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1372 printf("Xoffset: %d\n",cal.result);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1373
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1374 /* Calibrate X scale correction */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1375
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1376 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
1377
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1378 cal.cal_mode = EM8300_OVERLAY_CALMODE_XCORRECTION;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1379 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
1380 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1381 perror("Failed getting Xoffset values...exiting");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1382 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1383 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1384 printf("Xcorrection: %d\n",cal.result);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1385 o->xcorr = cal.result;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1386
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1387 win.xpos = 10;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1388 win.ypos = 10;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1389 win.width = o->xres-20;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1390 win.height = o->yres-20;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1391 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
1392 perror("Failed resizing window");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1393 exit(1);
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1394 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1395
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1396 /* Calibrate key color upper limit */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1397
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1398 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
1399 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
1400 (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
1401
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1402 cal.arg = i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1403 cal.arg2 = 1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1404 cal.cal_mode = EM8300_OVERLAY_CALMODE_COLOR;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1405
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1406 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
1407 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1408 return -1 ;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1409 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1410
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1411 x[n] = i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1412 r[n] = (cal.result>>16)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1413 g[n] = (cal.result>>8)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1414 b[n] = (cal.result)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1415 n++;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1416 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1417
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1418 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
1419 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
1420 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
1421
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1422 /* Calibrate key color lower limit */
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1423
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1424 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
1425 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
1426 (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
1427
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1428 cal.arg = i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1429 cal.arg2 = 2;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1430 cal.cal_mode = EM8300_OVERLAY_CALMODE_COLOR;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1431
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1432 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
1433 {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1434 return -1 ;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1435 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1436 x[n] = i;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1437 r[n] = (cal.result>>16)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1438 g[n] = (cal.result>>8)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1439 b[n] = (cal.result)&0xff;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1440 n++;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1441 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1442
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1443 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
1444 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
1445 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
1446
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1447 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
1448
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1449 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1450 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1451
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1452
8092
f880c1de0e9b Made new overlay functions static so they won't interfere with the rest
mswitch
parents: 8091
diff changeset
1453 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
1454 if(ioctl(o->dev, EM8300_IOCTL_OVERLAY_SIGNALMODE, &mode) ==-1) {
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1455 perror("Failed set signal mix");
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1456 return -1;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1457 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1458 return 0;
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1459 }
ad62a544964c Huge update, added native overlay support (no more need for dxr3view).
mswitch
parents: 7989
diff changeset
1460 /* End overlay.c */