annotate libvo/vosub_vidix.c @ 36838:7df9dd22f234

Don't set win32 as audio driver if none has been given. Select from the list of audio drivers instead. Having win32 as selected item in the combo box although this isn't used by MPlayer by default is confusing as well. Besides that, there seem to be issues with this driver when changing from or to it during playback.
author ib
date Tue, 25 Feb 2014 13:16:35 +0000
parents 5d3f93051de9
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
1 /*
27509
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
2 * vidix interface to any mplayer vo driver
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
3 * (partly based on vesa_lvo.c)
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
4 *
27509
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
5 * copyright (C) 2002 Nick Kurshev <nickols_k@mail.ru>
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
6 * copyright (C) Alex Beregszaszi
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
7 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
8 * This file is part of MPlayer.
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
9 *
27509
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
10 * MPlayer is free software; you can redistribute it and/or modify
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
11 * it under the terms of the GNU General Public License as published by
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
12 * the Free Software Foundation; either version 2 of the License, or
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
13 * (at your option) any later version.
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
14 *
27509
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
15 * MPlayer is distributed in the hope that it will be useful,
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
18 * GNU General Public License for more details.
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
19 *
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
20 * You should have received a copy of the GNU General Public License along
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
21 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
d97a607821f1 Replace casual GPL notices by proper license headers.
diego
parents: 27398
diff changeset
22 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
23 */
938d37ad4f85 preliminary version
nick
parents:
diff changeset
24
938d37ad4f85 preliminary version
nick
parents:
diff changeset
25 #include <inttypes.h>
938d37ad4f85 preliminary version
nick
parents:
diff changeset
26 #include <unistd.h>
938d37ad4f85 preliminary version
nick
parents:
diff changeset
27 #include <fcntl.h>
10981
c312dafb528f mingw port
faust3
parents: 10605
diff changeset
28 #ifndef __MINGW32__
c312dafb528f mingw port
faust3
parents: 10605
diff changeset
29 #include <sys/ioctl.h>
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
30 #include <sys/mman.h>
10981
c312dafb528f mingw port
faust3
parents: 10605
diff changeset
31 #endif
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
32 #include <stdio.h>
938d37ad4f85 preliminary version
nick
parents:
diff changeset
33 #include <stdlib.h>
938d37ad4f85 preliminary version
nick
parents:
diff changeset
34 #include <string.h>
35903
389d43c448b3 Add missing strings.h #includes for strcasecmp().
diego
parents: 35887
diff changeset
35 #include <strings.h>
4372
9b6430df4de5 improvements
nick
parents: 4362
diff changeset
36 #include <errno.h>
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
37
938d37ad4f85 preliminary version
nick
parents:
diff changeset
38 #include "config.h"
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
39 #include "mp_msg.h"
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
40 #include "help_mp.h"
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
41
27079
df448e1248b2 remove now useless vidixlib.h file
ben
parents: 27008
diff changeset
42 #include "vidix/vidix.h"
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
43 #include "fastmemcpy.h"
32469
3fef2e17a03f Move osd.[ch] and osd_template.c from libvo to sub.
cigaes
parents: 32467
diff changeset
44 #include "sub/osd.h"
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
45 #include "video_out.h"
32467
fbe5c829c69b Move libvo/sub.[ch] from libvo to sub.
cigaes
parents: 29263
diff changeset
46 #include "sub/sub.h"
25212
ca7a751f5481 Use proper type for vidix_preinit parameter instead of void *
reimar
parents: 24817
diff changeset
47 #include "vosub_vidix.h"
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
48
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
49 #include "libmpcodecs/vf.h"
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 11865
diff changeset
50 #include "libmpcodecs/vfcap.h"
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 11865
diff changeset
51 #include "libmpcodecs/mp_image.h"
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
52
4929
939eacee89ab Use as much buffers as possible
nick
parents: 4895
diff changeset
53 #define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
54
27084
e4497d289c3c Remove useless typedef for VDXContext.
ben
parents: 27079
diff changeset
55 static VDXContext *vidix_handler = NULL;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
56 static uint8_t *vidix_mem = NULL;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
57 static uint8_t next_frame;
5052
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
58 static unsigned image_Bpp,image_height,image_width,src_format,forced_fourcc=0;
4372
9b6430df4de5 improvements
nick
parents: 4362
diff changeset
59 static int video_on=0;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
60
938d37ad4f85 preliminary version
nick
parents:
diff changeset
61 static vidix_capability_t vidix_cap;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
62 static vidix_playback_t vidix_play;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
63 static vidix_fourcc_t vidix_fourcc;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
64 static vo_functions_t * vo_server;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
65 static vidix_yuv_t dstrides;
33305
ddb45e9443ec Remove the variable arguments from the libvo control() functions.
iive
parents: 33301
diff changeset
66 /*static uint32_t (*server_control)(uint32_t request, void *data);*/
4739
a2df307ed979 Screenshot on the fly
nick
parents: 4654
diff changeset
67
4234
0ec1d81c8f94 sorry, i really wanted to add vidix_start and stop as int, to detect if something went into the wrong way (also implement check in vo_xvidix)
alex
parents: 4231
diff changeset
68 int vidix_start(void)
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
69 {
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
70 int err;
4270
178c84b1090e clearing safely the buffer, queryfourcc returns 0x2 (hw accel, noconv.), setting eq only if drivers i able
alex
parents: 4255
diff changeset
71 if((err=vdlPlaybackOn(vidix_handler))!=0)
178c84b1090e clearing safely the buffer, queryfourcc returns 0x2 (hw accel, noconv.), setting eq only if drivers i able
alex
parents: 4255
diff changeset
72 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
73 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_CantStartPlayback,strerror(err));
4270
178c84b1090e clearing safely the buffer, queryfourcc returns 0x2 (hw accel, noconv.), setting eq only if drivers i able
alex
parents: 4255
diff changeset
74 return -1;
178c84b1090e clearing safely the buffer, queryfourcc returns 0x2 (hw accel, noconv.), setting eq only if drivers i able
alex
parents: 4255
diff changeset
75 }
4379
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
76 video_on=1;
4234
0ec1d81c8f94 sorry, i really wanted to add vidix_start and stop as int, to detect if something went into the wrong way (also implement check in vo_xvidix)
alex
parents: 4231
diff changeset
77 return 0;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
78 }
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
79
4234
0ec1d81c8f94 sorry, i really wanted to add vidix_start and stop as int, to detect if something went into the wrong way (also implement check in vo_xvidix)
alex
parents: 4231
diff changeset
80 int vidix_stop(void)
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
81 {
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
82 int err;
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
83 if((err=vdlPlaybackOff(vidix_handler))!=0)
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
84 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
85 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_CantStopPlayback,strerror(err));
4234
0ec1d81c8f94 sorry, i really wanted to add vidix_start and stop as int, to detect if something went into the wrong way (also implement check in vo_xvidix)
alex
parents: 4231
diff changeset
86 return -1;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
87 }
4372
9b6430df4de5 improvements
nick
parents: 4362
diff changeset
88 video_on=0;
4234
0ec1d81c8f94 sorry, i really wanted to add vidix_start and stop as int, to detect if something went into the wrong way (also implement check in vo_xvidix)
alex
parents: 4231
diff changeset
89 return 0;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
90 }
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
91
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
92 void vidix_term( void )
938d37ad4f85 preliminary version
nick
parents:
diff changeset
93 {
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
94 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
95 mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_term() was called\n"); }
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
96 vidix_stop();
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
97 vdlClose(vidix_handler);
25213
4a2b738ec787 Remove casts that are (no longer) necessary
reimar
parents: 25212
diff changeset
98 // vo_server->control=server_control;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
99 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
100
33321
96bd14d567b7 Fix draw_frame/draw_slice return types.
reimar
parents: 33305
diff changeset
101 static int vidix_draw_slice_420(uint8_t *image[], int stride[], int w,int h,int x,int y)
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
102 {
938d37ad4f85 preliminary version
nick
parents:
diff changeset
103 uint8_t *src;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
104 uint8_t *dest;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
105 int i;
4324
09f15844c960 don't render UV planes if interleaved (also add support later)
alex
parents: 4317
diff changeset
106
09f15844c960 don't render UV planes if interleaved (also add support later)
alex
parents: 4317
diff changeset
107 /* Plane Y */
4032
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
108 dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
109 dest += dstrides.y*y + x;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
110 src = image[0];
938d37ad4f85 preliminary version
nick
parents:
diff changeset
111 for(i=0;i<h;i++){
938d37ad4f85 preliminary version
nick
parents:
diff changeset
112 memcpy(dest,src,w);
938d37ad4f85 preliminary version
nick
parents:
diff changeset
113 src+=stride[0];
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
114 dest += dstrides.y;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
115 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
116
4324
09f15844c960 don't render UV planes if interleaved (also add support later)
alex
parents: 4317
diff changeset
117 if (vidix_play.flags & VID_PLAY_INTERLEAVED_UV)
09f15844c960 don't render UV planes if interleaved (also add support later)
alex
parents: 4317
diff changeset
118 {
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
119 int hi,wi;
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
120 uint8_t *src2;
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
121 dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.v;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
122 dest += dstrides.y*y/2 + x; // <- is this correct ?
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
123 h/=2;
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
124 w/=2;
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
125 src = image[1];
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
126 src2 = image[2];
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
127 for(hi = 0; hi < h; hi++)
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
128 {
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
129 for(wi = 0; wi < w; wi++)
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
130 {
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
131 dest[2*wi+0] = src[wi];
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
132 dest[2*wi+1] = src2[wi];
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
133 }
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
134 dest += dstrides.y;
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
135 src += stride[1];
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
136 src2+= stride[2];
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
137 }
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
138 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27509
diff changeset
139 else
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
140 {
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
141 /* Plane V */
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
142 dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.v;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
143 dest += dstrides.v*y/4 + x;
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
144 src = image[1];
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
145 for(i=0;i<h/2;i++){
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
146 memcpy(dest,src,w/2);
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
147 src+=stride[1];
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
148 dest+=dstrides.v/2;
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
149 }
4324
09f15844c960 don't render UV planes if interleaved (also add support later)
alex
parents: 4317
diff changeset
150
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
151 /* Plane U */
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
152 dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.u;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
153 dest += dstrides.u*y/4 + x;
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
154 src = image[2];
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
155 for(i=0;i<h/2;i++){
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
156 memcpy(dest,src,w/2);
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
157 src+=stride[2];
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
158 dest += dstrides.u/2;
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
159 }
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
160 return 0;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
161 }
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
162 return -1;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
163 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
164
33321
96bd14d567b7 Fix draw_frame/draw_slice return types.
reimar
parents: 33305
diff changeset
165 static int vidix_draw_slice_410(uint8_t *image[], int stride[], int w,int h,int x,int y)
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
166 {
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
167 uint8_t *src;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
168 uint8_t *dest;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
169 int i;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
170
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
171 /* Plane Y */
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
172 dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
173 dest += dstrides.y*y + x;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
174 src = image[0];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
175 for(i=0;i<h;i++){
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
176 memcpy(dest,src,w);
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
177 src+=stride[0];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
178 dest += dstrides.y;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
179 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27509
diff changeset
180
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
181 if (vidix_play.flags & VID_PLAY_INTERLEAVED_UV)
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
182 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
183 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_InterleavedUvForYuv410pNotSupported);
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
184 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27509
diff changeset
185 else
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
186 {
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
187 /* Plane V */
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
188 dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.v;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
189 dest += dstrides.v*y/8 + x;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
190 src = image[1];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
191 for(i=0;i<h/4;i++){
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
192 memcpy(dest,src,w/4);
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
193 src+=stride[1];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
194 dest+=dstrides.v/4;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
195 }
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
196
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
197 /* Plane U */
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
198 dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.u;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
199 dest += dstrides.u*y/8 + x;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
200 src = image[2];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
201 for(i=0;i<h/4;i++){
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
202 memcpy(dest,src,w/4);
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
203 src+=stride[2];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
204 dest += dstrides.u/4;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
205 }
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
206 return 0;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
207 }
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
208 return -1;
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
209 }
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
210
33321
96bd14d567b7 Fix draw_frame/draw_slice return types.
reimar
parents: 33305
diff changeset
211 static int vidix_draw_slice_packed(uint8_t *image[], int stride[], int w,int h,int x,int y)
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
212 {
938d37ad4f85 preliminary version
nick
parents:
diff changeset
213 uint8_t *src;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
214 uint8_t *dest;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
215 int i;
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
216
4032
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
217 dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
218 dest += dstrides.y*y + x;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
219 src = image[0];
938d37ad4f85 preliminary version
nick
parents:
diff changeset
220 for(i=0;i<h;i++){
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
221 memcpy(dest,src,w*image_Bpp);
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
222 src+=stride[0];
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
223 dest += dstrides.y;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
224 }
4240
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
225 return 0;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
226 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
227
33321
96bd14d567b7 Fix draw_frame/draw_slice return types.
reimar
parents: 33305
diff changeset
228 static int vidix_draw_slice_nv12(uint8_t *image[], int stride[], int w,int h,int x,int y)
27398
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
229 {
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
230 uint8_t *src;
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
231 uint8_t *dest;
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
232 int i;
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
233
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
234 /* Plane Y */
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
235 dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y;
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
236 dest += dstrides.y*y + x;
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
237 src = image[0];
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
238 for(i=0;i<h;i++){
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
239 memcpy(dest,src,w);
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
240 src+=stride[0];
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
241 dest += dstrides.y;
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
242 }
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
243
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
244 /* Plane UV */
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
245 dest = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.u;
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
246 dest += dstrides.u*y/2 + x;
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
247 src = image[1];
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
248 for(i=0;i<h/2;i++){
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
249 memcpy(dest,src,w);
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
250 src+=stride[1];
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
251 dest+=dstrides.u;
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
252 }
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
253 return 0;
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
254 }
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
255
33321
96bd14d567b7 Fix draw_frame/draw_slice return types.
reimar
parents: 33305
diff changeset
256 static int vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
257 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
258 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawsliceWasCalled);
10605
alex
parents: 10272
diff changeset
259 return -1;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
260 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
261
7685
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
262 static uint32_t vidix_draw_image(mp_image_t *mpi){
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
263 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
264 mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_draw_image() was called\n"); }
7685
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
265
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
266 // if -dr or -slices then do nothing:
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
267 if(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK)) return VO_TRUE;
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
268
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
269 vo_server->draw_slice(mpi->planes,mpi->stride,
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
270 vidix_play.src.w,vidix_play.src.h,vidix_play.src.x,vidix_play.src.y);
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
271 return VO_TRUE;
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
272 }
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
273
26982
853faa7a9bdd declare some functions as static
ben
parents: 26977
diff changeset
274 static void vidix_flip_page(void)
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
275 {
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
276 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
277 mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_flip_page() was called\n"); }
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
278 if(vo_doublebuffering)
938d37ad4f85 preliminary version
nick
parents:
diff changeset
279 {
4032
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
280 vdlPlaybackFrameSelect(vidix_handler,next_frame);
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
281 next_frame=(next_frame+1)%vidix_play.num_frames;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27509
diff changeset
282 }
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
283 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
284
938d37ad4f85 preliminary version
nick
parents:
diff changeset
285 static void draw_alpha(int x0,int y0, int w,int h, unsigned char* src, unsigned char *srca, int stride)
938d37ad4f85 preliminary version
nick
parents:
diff changeset
286 {
4032
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
287 uint32_t apitch,bespitch;
35887
dfc7a72eb50f Use uint8_t to avoid signed vs. unsigned char issues.
reimar
parents: 33321
diff changeset
288 uint8_t *lvo_mem = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y;
4032
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
289 apitch = vidix_play.dest.pitch.y-1;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
290 switch(vidix_play.fourcc){
27398
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
291 case IMGFMT_NV12:
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
292 case IMGFMT_YV12:
938d37ad4f85 preliminary version
nick
parents:
diff changeset
293 case IMGFMT_IYUV:
938d37ad4f85 preliminary version
nick
parents:
diff changeset
294 case IMGFMT_I420:
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
295 case IMGFMT_YVU9:
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
296 case IMGFMT_IF09:
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
297 case IMGFMT_Y8:
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
298 case IMGFMT_Y800:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
299 bespitch = (vidix_play.src.w + apitch) & (~apitch);
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
300 vo_draw_alpha_yv12(w,h,src,srca,stride,lvo_mem+bespitch*y0+x0,bespitch);
938d37ad4f85 preliminary version
nick
parents:
diff changeset
301 break;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
302 case IMGFMT_YUY2:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
303 bespitch = (vidix_play.src.w*2 + apitch) & (~apitch);
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
304 vo_draw_alpha_yuy2(w,h,src,srca,stride,lvo_mem+bespitch*y0+2*x0,bespitch);
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
305 break;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
306 case IMGFMT_UYVY:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
307 bespitch = (vidix_play.src.w*2 + apitch) & (~apitch);
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
308 vo_draw_alpha_yuy2(w,h,src,srca,stride,lvo_mem+bespitch*y0+2*x0+1,bespitch);
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
309 break;
4430
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
310 case IMGFMT_RGB32:
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
311 case IMGFMT_BGR32:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
312 bespitch = (vidix_play.src.w*4 + apitch) & (~apitch);
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
313 vo_draw_alpha_rgb32(w,h,src,srca,stride,lvo_mem+y0*bespitch+4*x0,bespitch);
4430
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
314 break;
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
315 case IMGFMT_RGB24:
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
316 case IMGFMT_BGR24:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
317 bespitch = (vidix_play.src.w*3 + apitch) & (~apitch);
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
318 vo_draw_alpha_rgb24(w,h,src,srca,stride,lvo_mem+y0*bespitch+3*x0,bespitch);
4430
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
319 break;
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
320 case IMGFMT_RGB16:
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
321 case IMGFMT_BGR16:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
322 bespitch = (vidix_play.src.w*2 + apitch) & (~apitch);
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
323 vo_draw_alpha_rgb16(w,h,src,srca,stride,lvo_mem+y0*bespitch+2*x0,bespitch);
4430
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
324 break;
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
325 case IMGFMT_RGB15:
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
326 case IMGFMT_BGR15:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
327 bespitch = (vidix_play.src.w*2 + apitch) & (~apitch);
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
328 vo_draw_alpha_rgb15(w,h,src,srca,stride,lvo_mem+y0*bespitch+2*x0,bespitch);
4430
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
329 break;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
330 default:
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
331 return;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
332 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
333 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
334
26982
853faa7a9bdd declare some functions as static
ben
parents: 26977
diff changeset
335 static void vidix_draw_osd(void)
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
336 {
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
337 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
338 mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_draw_osd() was called\n"); }
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
339 /* TODO: hw support */
938d37ad4f85 preliminary version
nick
parents:
diff changeset
340 vo_draw_text(vidix_play.src.w,vidix_play.src.h,draw_alpha);
938d37ad4f85 preliminary version
nick
parents:
diff changeset
341 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
342
938d37ad4f85 preliminary version
nick
parents:
diff changeset
343 uint32_t vidix_query_fourcc(uint32_t format)
938d37ad4f85 preliminary version
nick
parents:
diff changeset
344 {
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
345 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
346 mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: query_format was called: %x (%s)\n",format,vo_format_name(format)); }
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
347 vidix_fourcc.fourcc = format;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
348 vdlQueryFourcc(vidix_handler,&vidix_fourcc);
5052
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
349 if (vidix_fourcc.depth == VID_DEPTH_NONE)
5566
e01c664def74 VFCAP added
arpi
parents: 5373
diff changeset
350 return 0;
7694
b64f14fdadfb also set VFCAP_ACCEPT_STRIDE when draw_image() is implemented
arpi
parents: 7685
diff changeset
351 return VFCAP_CSP_SUPPORTED|VFCAP_CSP_SUPPORTED_BY_HW|VFCAP_HWSCALE_UP|VFCAP_HWSCALE_DOWN|VFCAP_OSD|VFCAP_ACCEPT_STRIDE;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
352 }
4240
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
353
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4240
diff changeset
354 int vidix_grkey_support(void)
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4240
diff changeset
355 {
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25531
diff changeset
356 return vidix_fourcc.flags & VID_CAP_COLORKEY;
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4240
diff changeset
357 }
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4240
diff changeset
358
4240
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
359 int vidix_grkey_get(vidix_grkey_t *gr_key)
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
360 {
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25531
diff changeset
361 return vdlGetGrKeys(vidix_handler, gr_key);
4240
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
362 }
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
363
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
364 int vidix_grkey_set(const vidix_grkey_t *gr_key)
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
365 {
26755
46f0b4d34fa1 cosmetics: Remove useless parentheses from from return statements.
diego
parents: 25531
diff changeset
366 return vdlSetGrKeys(vidix_handler, gr_key);
4240
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
367 }
4372
9b6430df4de5 improvements
nick
parents: 4362
diff changeset
368
4379
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
369
5028
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
370 static int is_422_planes_eq=0;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
371 int vidix_init(unsigned src_width,unsigned src_height,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
372 unsigned x_org,unsigned y_org,unsigned dst_width,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
373 unsigned dst_height,unsigned format,unsigned dest_bpp,
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 7026
diff changeset
374 unsigned vid_w,unsigned vid_h)
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
375 {
17128
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
376 void *tmp, *tmpa;
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
377 size_t i;
5028
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
378 int err;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
379 uint32_t sstride,apitch;
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
380 if( mp_msg_test(MSGT_VO,MSGL_DBG2) )
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
381 mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_init() was called\n"
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
382 "src_w=%u src_h=%u dest_x_y_w_h = %u %u %u %u\n"
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
383 "format=%s dest_bpp=%u vid_w=%u vid_h=%u\n"
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
384 ,src_width,src_height,x_org,y_org,dst_width,dst_height
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
385 ,vo_format_name(format),dest_bpp,vid_w,vid_h);
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
386
7026
a3126e9099b4 should solve -vo vesa:vidix problem 'vosub_vidix: video server has
arpi
parents: 6806
diff changeset
387 if(vidix_query_fourcc(format) == 0)
a3126e9099b4 should solve -vo vesa:vidix problem 'vosub_vidix: video server has
arpi
parents: 6806
diff changeset
388 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
389 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_UnsupportedFourccForThisVidixDriver,
7026
a3126e9099b4 should solve -vo vesa:vidix problem 'vosub_vidix: video server has
arpi
parents: 6806
diff changeset
390 format,vo_format_name(format));
a3126e9099b4 should solve -vo vesa:vidix problem 'vosub_vidix: video server has
arpi
parents: 6806
diff changeset
391 return -1;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27509
diff changeset
392 }
7026
a3126e9099b4 should solve -vo vesa:vidix problem 'vosub_vidix: video server has
arpi
parents: 6806
diff changeset
393
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
394 if(((vidix_cap.maxwidth != -1) && (vid_w > vidix_cap.maxwidth)) ||
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
395 ((vidix_cap.minwidth != -1) && (vid_w < vidix_cap.minwidth)) ||
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
396 ((vidix_cap.maxheight != -1) && (vid_h > vidix_cap.maxheight)) ||
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
397 ((vidix_cap.minwidth != -1 ) && (vid_h < vidix_cap.minheight)))
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
398 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
399 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_VideoServerHasUnsupportedResolution,
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
400 vid_w, vid_h, vidix_cap.minwidth, vidix_cap.minheight,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
401 vidix_cap.maxwidth, vidix_cap.maxheight);
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
402 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
403 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
404
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
405 err = 0;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
406 switch(dest_bpp)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
407 {
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
408 case 1: err = ((vidix_fourcc.depth & VID_DEPTH_1BPP) != VID_DEPTH_1BPP); break;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
409 case 2: err = ((vidix_fourcc.depth & VID_DEPTH_2BPP) != VID_DEPTH_2BPP); break;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
410 case 4: err = ((vidix_fourcc.depth & VID_DEPTH_4BPP) != VID_DEPTH_4BPP); break;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
411 case 8: err = ((vidix_fourcc.depth & VID_DEPTH_8BPP) != VID_DEPTH_8BPP); break;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
412 case 12:err = ((vidix_fourcc.depth & VID_DEPTH_12BPP) != VID_DEPTH_12BPP); break;
4540
cb255a42aa5e Enable 15bpp on server
nick
parents: 4454
diff changeset
413 case 15:err = ((vidix_fourcc.depth & VID_DEPTH_15BPP) != VID_DEPTH_15BPP); break;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
414 case 16:err = ((vidix_fourcc.depth & VID_DEPTH_16BPP) != VID_DEPTH_16BPP); break;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
415 case 24:err = ((vidix_fourcc.depth & VID_DEPTH_24BPP) != VID_DEPTH_24BPP); break;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
416 case 32:err = ((vidix_fourcc.depth & VID_DEPTH_32BPP) != VID_DEPTH_32BPP); break;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
417 default: err=1; break;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
418 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
419 if(err)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
420 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
421 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_VideoServerHasUnsupportedColorDepth
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
422 ,vidix_fourcc.depth);
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
423 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
424 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
425 if((dst_width > src_width || dst_height > src_height) && (vidix_cap.flags & FLAG_UPSCALER) != FLAG_UPSCALER)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
426 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
427 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_DriverCantUpscaleImage,
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
428 src_width, src_height, dst_width, dst_height);
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
429 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
430 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
431 if((dst_width > src_width || dst_height > src_height) && (vidix_cap.flags & FLAG_DOWNSCALER) != FLAG_DOWNSCALER)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
432 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
433 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_DriverCantDownscaleImage,
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
434 src_width, src_height, dst_width, dst_height);
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
435 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
436 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
437 image_width = src_width;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
438 image_height = src_height;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
439 src_format = format;
5052
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
440 if(forced_fourcc) format = forced_fourcc;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
441 memset(&vidix_play,0,sizeof(vidix_playback_t));
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
442 vidix_play.fourcc = format;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
443 vidix_play.capability = vidix_cap.flags; /* every ;) */
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
444 vidix_play.blend_factor = 0; /* for now */
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
445 /* display the full picture.
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
446 Nick: we could implement here zooming to a specified area -- alex */
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
447 vidix_play.src.x = vidix_play.src.y = 0;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
448 vidix_play.src.w = src_width;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
449 vidix_play.src.h = src_height;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
450 vidix_play.dest.x = x_org;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
451 vidix_play.dest.y = y_org;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
452 vidix_play.dest.w = dst_width;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
453 vidix_play.dest.h = dst_height;
8459
2ce7bbdcee15 this isn't mplayerxp...3 buffers are enough for double(triple)buffering (instead of 28 buffers ;)
alex
parents: 8254
diff changeset
454 // vidix_play.num_frames=vo_doublebuffering?NUM_FRAMES-1:1;
2ce7bbdcee15 this isn't mplayerxp...3 buffers are enough for double(triple)buffering (instead of 28 buffers ;)
alex
parents: 8254
diff changeset
455 /* we aren't mad...3 buffers are more than enough */
2ce7bbdcee15 this isn't mplayerxp...3 buffers are enough for double(triple)buffering (instead of 28 buffers ;)
alex
parents: 8254
diff changeset
456 vidix_play.num_frames=vo_doublebuffering?3:1;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
457 vidix_play.src.pitch.y = vidix_play.src.pitch.u = vidix_play.src.pitch.v = 0;
7124
eca7dbad0166 finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo api
alex
parents: 7026
diff changeset
458
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
459 if((err=vdlConfigPlayback(vidix_handler,&vidix_play))!=0)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
460 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
461 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_CantConfigurePlayback,strerror(err));
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
462 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
463 }
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
464 if ( mp_msg_test(MSGT_VO,MSGL_V) ) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
465 mp_msg(MSGT_VO,MSGL_V, "vosub_vidix: using %d buffer(s)\n", vidix_play.num_frames); }
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
466
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
467 vidix_mem = vidix_play.dga_addr;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
468
17128
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
469 tmp = calloc(image_width, image_height);
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
470 tmpa = malloc(image_width * image_height);
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
471 memset(tmpa, 1, image_width * image_height);
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
472 /* clear every frame with correct address and frame_size */
17128
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
473 /* HACK: use draw_alpha to clear Y component */
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
474 for (i = 0; i < vidix_play.num_frames; i++) {
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
475 next_frame = i;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
476 memset(vidix_mem + vidix_play.offsets[i], 0x80,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
477 vidix_play.frame_size);
17128
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
478 draw_alpha(0, 0, image_width, image_height, tmp, tmpa, image_width);
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
479 }
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
480 free(tmp);
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
481 free(tmpa);
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
482 /* show one of the "clear" frames */
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
483 vidix_flip_page();
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
484
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
485 switch(format)
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
486 {
27398
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
487 case IMGFMT_NV12:
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
488 case IMGFMT_YV12:
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
489 case IMGFMT_I420:
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
490 case IMGFMT_IYUV:
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
491 case IMGFMT_YVU9:
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
492 case IMGFMT_IF09:
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
493 case IMGFMT_Y800:
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
494 case IMGFMT_Y8:
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
495 apitch = vidix_play.dest.pitch.y-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
496 dstrides.y = (image_width + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
497 apitch = vidix_play.dest.pitch.v-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
498 dstrides.v = (image_width + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
499 apitch = vidix_play.dest.pitch.u-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
500 dstrides.u = (image_width + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
501 image_Bpp=1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
502 break;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
503 case IMGFMT_RGB32:
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
504 case IMGFMT_BGR32:
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
505 apitch = vidix_play.dest.pitch.y-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
506 dstrides.y = (image_width*4 + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
507 dstrides.u = dstrides.v = 0;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
508 image_Bpp=4;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
509 break;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
510 case IMGFMT_RGB24:
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
511 case IMGFMT_BGR24:
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
512 apitch = vidix_play.dest.pitch.y-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
513 dstrides.y = (image_width*3 + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
514 dstrides.u = dstrides.v = 0;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
515 image_Bpp=3;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
516 break;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
517 default:
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
518 apitch = vidix_play.dest.pitch.y-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
519 dstrides.y = (image_width*2 + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
520 dstrides.u = dstrides.v = 0;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
521 image_Bpp=2;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
522 break;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
523 }
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
524 /* tune some info here */
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
525 sstride = src_width*image_Bpp;
5052
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
526 if(!forced_fourcc)
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
527 {
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
528 is_422_planes_eq = sstride == dstrides.y;
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
529
5052
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
530 if(src_format == IMGFMT_YV12 || src_format == IMGFMT_I420 || src_format == IMGFMT_IYUV)
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
531 vo_server->draw_slice = vidix_draw_slice_420;
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
532 else if (src_format == IMGFMT_YVU9 || src_format == IMGFMT_IF09)
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
533 vo_server->draw_slice = vidix_draw_slice_410;
27398
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
534 else if (src_format == IMGFMT_NV12)
1861074aef60 Add NV12 colorspace support to VIDIX driver.
ben
parents: 27084
diff changeset
535 vo_server->draw_slice = vidix_draw_slice_nv12;
7685
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
536 else vo_server->draw_slice = vidix_draw_slice_packed;
5052
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
537 }
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
538 return 0;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
539 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
540
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
541 static uint32_t vidix_get_image(mp_image_t *mpi)
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
542 {
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
543 if(mpi->type==MP_IMGTYPE_STATIC && vidix_play.num_frames>1) return VO_FALSE;
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
544 if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; /* slow video ram */
7685
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
545 if(( (mpi->stride[0]==dstrides.y && (!(mpi->flags&MP_IMGFLAG_PLANAR) ||
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
546 (mpi->stride[1]==dstrides.u && mpi->stride[2]==dstrides.v)) )
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27509
diff changeset
547 || (mpi->flags&(MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_ACCEPT_WIDTH))) &&
6550
991e03ca5ceb added OSD support for yvu9/y800, corrected query_format \(added flag VFCAP_OSD\), fixed multifile support \(no more control infinite loop and destroying old window\) and some cosmetics
alex
parents: 6531
diff changeset
548 (!forced_fourcc && !(vidix_play.flags & VID_PLAY_INTERLEAVED_UV)))
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
549 {
5373
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
550 if(mpi->flags&MP_IMGFLAG_ACCEPT_WIDTH){
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
551 // check if only width is enough to represent strides:
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
552 if(mpi->flags&MP_IMGFLAG_PLANAR){
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
553 if((dstrides.y>>1)!=dstrides.v || dstrides.v!=dstrides.u) return VO_FALSE;
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
554 } else {
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
555 if(dstrides.y % (mpi->bpp/8)) return VO_FALSE;
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
556 }
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
557 }
5028
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
558 mpi->planes[0]=vidix_mem+vidix_play.offsets[next_frame]+vidix_play.offset.y;
5373
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
559 mpi->width=mpi->stride[0]=dstrides.y;
5028
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
560 if(mpi->flags&MP_IMGFLAG_PLANAR)
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
561 {
11553
656932ca58ab vidix_get_image() fix
michael
parents: 11239
diff changeset
562 mpi->planes[1]=vidix_mem+vidix_play.offsets[next_frame]+vidix_play.offset.v;
656932ca58ab vidix_get_image() fix
michael
parents: 11239
diff changeset
563 mpi->stride[1]=dstrides.v >> mpi->chroma_x_shift;
656932ca58ab vidix_get_image() fix
michael
parents: 11239
diff changeset
564 mpi->planes[2]=vidix_mem+vidix_play.offsets[next_frame]+vidix_play.offset.u;
656932ca58ab vidix_get_image() fix
michael
parents: 11239
diff changeset
565 mpi->stride[2]=dstrides.u >> mpi->chroma_x_shift;
5373
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
566 } else
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
567 mpi->width/=mpi->bpp/8;
5028
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
568 mpi->flags|=MP_IMGFLAG_DIRECT;
5373
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
569 return VO_TRUE;
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
570 }
5373
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
571 return VO_FALSE;
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
572 }
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
573
33305
ddb45e9443ec Remove the variable arguments from the libvo control() functions.
iive
parents: 33301
diff changeset
574 uint32_t vidix_control(uint32_t request, void *data)
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
575 {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
576 switch (request) {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
577 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
578 return vidix_query_fourcc(*((uint32_t*)data));
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
579 case VOCTRL_GET_IMAGE:
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
580 return vidix_get_image(data);
7685
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
581 case VOCTRL_DRAW_IMAGE:
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
582 return vidix_draw_image(data);
5002
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
583 case VOCTRL_GET_FRAME_NUM:
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
584 *(uint32_t *)data = next_frame;
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
585 return VO_TRUE;
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
586 case VOCTRL_SET_FRAME_NUM:
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
587 next_frame = *(uint32_t *)data;
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
588 return VO_TRUE;
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
589 case VOCTRL_GET_NUM_FRAMES:
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
590 *(uint32_t *)data = vidix_play.num_frames;
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
591 return VO_TRUE;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
592 case VOCTRL_SET_EQUALIZER:
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
593 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
594 vf_equalizer_t *eq=data;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
595 vidix_video_eq_t info;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
596
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
597 if(!video_on) return VO_FALSE;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27509
diff changeset
598
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
599 // printf("vidix seteq %s -> %d \n",eq->item,eq->value);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27509
diff changeset
600
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
601 /* vidix eq ranges are -1000..1000 */
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
602 if (!strcasecmp(eq->item, "brightness"))
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
603 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
604 info.brightness = eq->value*10;
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
605 info.cap = VEQ_CAP_BRIGHTNESS;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
606 }
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
607 else if (!strcasecmp(eq->item, "contrast"))
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
608 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
609 info.contrast = eq->value*10;
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
610 info.cap = VEQ_CAP_CONTRAST;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
611 }
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
612 else if (!strcasecmp(eq->item, "saturation"))
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
613 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
614 info.saturation = eq->value*10;
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
615 info.cap = VEQ_CAP_SATURATION;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
616 }
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
617 else if (!strcasecmp(eq->item, "hue"))
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
618 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
619 info.hue = eq->value*10;
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
620 info.cap = VEQ_CAP_HUE;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
621 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
622
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
623 if (vdlPlaybackSetEq(vidix_handler, &info) == 0)
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
624 return VO_TRUE;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
625 return VO_FALSE;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
626 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
627 case VOCTRL_GET_EQUALIZER:
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
628 {
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
629 vf_equalizer_t *eq=data;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
630 vidix_video_eq_t info;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
631
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
632 if(!video_on) return VO_FALSE;
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
633 if (vdlPlaybackGetEq(vidix_handler, &info) != 0)
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
634 return VO_FALSE;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
635
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
636 /* vidix eq ranges are -1000..1000 */
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
637 if (!strcasecmp(eq->item, "brightness"))
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
638 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
639 if (info.cap & VEQ_CAP_BRIGHTNESS)
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
640 eq->value = info.brightness/10;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
641 }
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
642 else if (!strcasecmp(eq->item, "contrast"))
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
643 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
644 if (info.cap & VEQ_CAP_CONTRAST)
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
645 eq->value = info.contrast/10;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
646 }
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
647 else if (!strcasecmp(eq->item, "saturation"))
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
648 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
649 if (info.cap & VEQ_CAP_SATURATION)
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
650 eq->value = info.saturation/10;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
651 }
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
652 else if (!strcasecmp(eq->item, "hue"))
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
653 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
654 if (info.cap & VEQ_CAP_HUE)
33301
899d817e56fc Implement control() VOCTRL_SET/GET_EQUALIZER using a vf_equalize struct,
iive
parents: 32469
diff changeset
655 eq->value = info.hue/10;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
656 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
657
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
658 return VO_TRUE;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
659 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
660 }
6531
7bd342baa785 yvu9,if09,y8,y800 support and multifile fix
alex
parents: 6482
diff changeset
661 return VO_NOTIMPL;
7bd342baa785 yvu9,if09,y8,y800 support and multifile fix
alex
parents: 6482
diff changeset
662 // return server_control(request,data); //VO_NOTIMPL;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
663 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
664
25212
ca7a751f5481 Use proper type for vidix_preinit parameter instead of void *
reimar
parents: 24817
diff changeset
665 int vidix_preinit(const char *drvname,vo_functions_t *server)
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
666 {
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
667 int err;
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
668 if( mp_msg_test(MSGT_VO,MSGL_DBG2) ) {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
669 mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_preinit(%s) was called\n",drvname); }
26976
48d377ee42ac remove duplicated code
ben
parents: 26975
diff changeset
670
26975
553265fda2a6 Drop some useless parameter from vidix init routine
ben
parents: 26974
diff changeset
671 vidix_handler = vdlOpen(drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
672 TYPE_OUTPUT,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
673 verbose);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 27509
diff changeset
674
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
675 if(vidix_handler == NULL)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
676 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
677 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_CouldntFindWorkingVidixDriver);
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
678 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
679 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
680 if((err=vdlGetCapability(vidix_handler,&vidix_cap)) != 0)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
681 {
18234
a107276371a8 Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents: 17988
diff changeset
682 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_CouldntGetCapability,strerror(err));
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
683 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
684 }
27008
0cc374df25e6 Slightly reduce VIDIX video output verbosity.
diego
parents: 26982
diff changeset
685 mp_msg(MSGT_VO,MSGL_V, "[VO_SUB_VIDIX] Description: %s.\n", vidix_cap.name);
0cc374df25e6 Slightly reduce VIDIX video output verbosity.
diego
parents: 26982
diff changeset
686 mp_msg(MSGT_VO,MSGL_V, "[VO_SUB_VIDIX] Author: %s.\n", vidix_cap.author);
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
687 /* we are able to tune up this stuff depend on fourcc format */
25213
4a2b738ec787 Remove casts that are (no longer) necessary
reimar
parents: 25212
diff changeset
688 server->draw_slice=vidix_draw_slice;
36517
5d3f93051de9 Remove empty draw_slice and draw_frame stubs.
reimar
parents: 35903
diff changeset
689 server->draw_frame=NULL;
25213
4a2b738ec787 Remove casts that are (no longer) necessary
reimar
parents: 25212
diff changeset
690 server->flip_page=vidix_flip_page;
4a2b738ec787 Remove casts that are (no longer) necessary
reimar
parents: 25212
diff changeset
691 server->draw_osd=vidix_draw_osd;
4a2b738ec787 Remove casts that are (no longer) necessary
reimar
parents: 25212
diff changeset
692 // server_control = server->control;
4a2b738ec787 Remove casts that are (no longer) necessary
reimar
parents: 25212
diff changeset
693 // server->control=vidix_control;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
694 vo_server = server;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
695 return 0;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
696 }