annotate libvo/vosub_vidix.c @ 24455:3ae0e3067f99

Move boundary check before use!
author reimar
date Fri, 14 Sep 2007 16:58:31 +0000
parents 3c6a0cdfdd5b
children 1076f50ba2d2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
1 /*
938d37ad4f85 preliminary version
nick
parents:
diff changeset
2 * vosub_vidix.c
938d37ad4f85 preliminary version
nick
parents:
diff changeset
3 *
938d37ad4f85 preliminary version
nick
parents:
diff changeset
4 * Copyright (C) Nick Kurshev <nickols_k@mail.ru> - 2002
4280
a5f11106ef5e added support for unlimited video resolution (-1)
alex
parents: 4270
diff changeset
5 * Copyright (C) Alex Beregszaszi
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
6 *
938d37ad4f85 preliminary version
nick
parents:
diff changeset
7 * You can redistribute this file under terms and conditions
938d37ad4f85 preliminary version
nick
parents:
diff changeset
8 * of GNU General Public licence v2.
938d37ad4f85 preliminary version
nick
parents:
diff changeset
9 *
938d37ad4f85 preliminary version
nick
parents:
diff changeset
10 * This file contains vidix interface to any mplayer's VO plugin.
938d37ad4f85 preliminary version
nick
parents:
diff changeset
11 * (Partly based on vesa_lvo.c from mplayer's package)
938d37ad4f85 preliminary version
nick
parents:
diff changeset
12 */
938d37ad4f85 preliminary version
nick
parents:
diff changeset
13
938d37ad4f85 preliminary version
nick
parents:
diff changeset
14 #include <inttypes.h>
938d37ad4f85 preliminary version
nick
parents:
diff changeset
15 #include <unistd.h>
938d37ad4f85 preliminary version
nick
parents:
diff changeset
16 #include <fcntl.h>
10981
c312dafb528f mingw port
faust3
parents: 10605
diff changeset
17 #ifndef __MINGW32__
c312dafb528f mingw port
faust3
parents: 10605
diff changeset
18 #include <sys/ioctl.h>
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
19 #include <sys/mman.h>
10981
c312dafb528f mingw port
faust3
parents: 10605
diff changeset
20 #endif
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
21 #include <stdio.h>
938d37ad4f85 preliminary version
nick
parents:
diff changeset
22 #include <stdlib.h>
938d37ad4f85 preliminary version
nick
parents:
diff changeset
23 #include <string.h>
4372
9b6430df4de5 improvements
nick
parents: 4362
diff changeset
24 #include <errno.h>
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
25
938d37ad4f85 preliminary version
nick
parents:
diff changeset
26 #include "config.h"
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
27 #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
28 #include "help_mp.h"
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
29
938d37ad4f85 preliminary version
nick
parents:
diff changeset
30 #include "vosub_vidix.h"
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 11865
diff changeset
31 #include "vidix/vidixlib.h"
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
32 #include "fastmemcpy.h"
938d37ad4f85 preliminary version
nick
parents:
diff changeset
33 #include "osd.h"
938d37ad4f85 preliminary version
nick
parents:
diff changeset
34 #include "video_out.h"
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
35 #include "sub.h"
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
36
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 11865
diff changeset
37 #include "libmpcodecs/vfcap.h"
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 11865
diff changeset
38 #include "libmpcodecs/mp_image.h"
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
39
4929
939eacee89ab Use as much buffers as possible
nick
parents: 4895
diff changeset
40 #define NUM_FRAMES VID_PLAY_MAXFRAMES /* Temporary: driver will overwrite it */
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
41
938d37ad4f85 preliminary version
nick
parents:
diff changeset
42 static VDL_HANDLE vidix_handler = NULL;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
43 static uint8_t *vidix_mem = NULL;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
44 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
45 static unsigned image_Bpp,image_height,image_width,src_format,forced_fourcc=0;
4372
9b6430df4de5 improvements
nick
parents: 4362
diff changeset
46 static int video_on=0;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
47
938d37ad4f85 preliminary version
nick
parents:
diff changeset
48 static vidix_capability_t vidix_cap;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
49 static vidix_playback_t vidix_play;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
50 static vidix_fourcc_t vidix_fourcc;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
51 static vo_functions_t * vo_server;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
52 static vidix_yuv_t dstrides;
8254
772d6d27fd66 warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents: 7694
diff changeset
53 /*static uint32_t (*server_control)(uint32_t request, void *data, ...);*/
4739
a2df307ed979 Screenshot on the fly
nick
parents: 4654
diff changeset
54
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
55 int vidix_start(void)
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
56 {
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
57 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
58 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
59 {
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
60 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
61 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
62 }
4379
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
63 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
64 return 0;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
65 }
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
66
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
67 int vidix_stop(void)
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
68 {
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
69 int err;
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
70 if((err=vdlPlaybackOff(vidix_handler))!=0)
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
71 {
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
72 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
73 return -1;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
74 }
4372
9b6430df4de5 improvements
nick
parents: 4362
diff changeset
75 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
76 return 0;
4198
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
77 }
7e2bf04c9a7c added vidix_start() and vidix_stop() for better runtime-resize support ;)
alex
parents: 4138
diff changeset
78
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
79 void vidix_term( void )
938d37ad4f85 preliminary version
nick
parents:
diff changeset
80 {
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
81 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
82 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
83 vidix_stop();
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
84 vdlClose(vidix_handler);
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
85 // ((vo_functions_t *)vo_server)->control=server_control;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
86 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
87
4430
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
88 static uint32_t 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
89 {
938d37ad4f85 preliminary version
nick
parents:
diff changeset
90 uint8_t *src;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
91 uint8_t *dest;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
92 int i;
4324
09f15844c960 don't render UV planes if interleaved (also add support later)
alex
parents: 4317
diff changeset
93
09f15844c960 don't render UV planes if interleaved (also add support later)
alex
parents: 4317
diff changeset
94 /* Plane Y */
4032
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
95 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
96 dest += dstrides.y*y + x;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
97 src = image[0];
938d37ad4f85 preliminary version
nick
parents:
diff changeset
98 for(i=0;i<h;i++){
938d37ad4f85 preliminary version
nick
parents:
diff changeset
99 memcpy(dest,src,w);
938d37ad4f85 preliminary version
nick
parents:
diff changeset
100 src+=stride[0];
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
101 dest += dstrides.y;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
102 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
103
4324
09f15844c960 don't render UV planes if interleaved (also add support later)
alex
parents: 4317
diff changeset
104 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
105 {
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
106 int hi,wi;
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
107 uint8_t *src2;
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
108 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
109 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
110 h/=2;
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
111 w/=2;
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
112 src = image[1];
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
113 src2 = image[2];
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
114 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
115 {
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
116 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
117 {
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
118 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
119 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
120 }
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
121 dest += dstrides.y;
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
122 src += stride[1];
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
123 src2+= stride[2];
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
124 }
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
125 }
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
126 else
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
127 {
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
128 /* Plane V */
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
129 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
130 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
131 src = image[1];
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
132 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
133 memcpy(dest,src,w/2);
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
134 src+=stride[1];
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
135 dest+=dstrides.v/2;
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
136 }
4324
09f15844c960 don't render UV planes if interleaved (also add support later)
alex
parents: 4317
diff changeset
137
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
138 /* Plane U */
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
139 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
140 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
141 src = image[2];
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
142 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
143 memcpy(dest,src,w/2);
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
144 src+=stride[2];
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
145 dest += dstrides.u/2;
4744
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
146 }
da595f0e882e vidix interleaved U V planes (for g200) by Attila Kinali <kinali@gmx.net>
nick
parents: 4741
diff changeset
147 return 0;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
148 }
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
149 return -1;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
150 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
151
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
152 static uint32_t vidix_draw_slice_410(uint8_t *image[], int stride[], int w,int h,int x,int y)
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
153 {
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
154 uint8_t *src;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
155 uint8_t *dest;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
156 int i;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
157
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
158 /* Plane Y */
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
159 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
160 dest += dstrides.y*y + x;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
161 src = image[0];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
162 for(i=0;i<h;i++){
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
163 memcpy(dest,src,w);
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
164 src+=stride[0];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
165 dest += dstrides.y;
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
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
168 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
169 {
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
170 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
171 }
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
172 else
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
173 {
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
174 /* Plane V */
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
175 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
176 dest += dstrides.v*y/8 + x;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
177 src = image[1];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
178 for(i=0;i<h/4;i++){
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
179 memcpy(dest,src,w/4);
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
180 src+=stride[1];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
181 dest+=dstrides.v/4;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
182 }
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
183
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
184 /* Plane U */
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
185 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
186 dest += dstrides.u*y/8 + x;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
187 src = image[2];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
188 for(i=0;i<h/4;i++){
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
189 memcpy(dest,src,w/4);
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
190 src+=stride[2];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
191 dest += dstrides.u/4;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
192 }
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
193 return 0;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
194 }
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
195 return -1;
6482
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
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
198 static uint32_t vidix_draw_slice_410_fast(uint8_t *image[], int stride[], int w, int h, int x, int y)
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
199 {
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
200 uint8_t *src;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
201 uint8_t *dest;
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
202
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
203 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
204 dest += dstrides.y*y + x;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
205 src = image[0];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
206 memcpy(dest, src, dstrides.y*h*9/8);
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
207 return 0;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
208 }
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 static uint32_t vidix_draw_slice_400(uint8_t *image[], int stride[], int w,int h,int x,int y)
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
211 {
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
212 uint8_t *src;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
213 uint8_t *dest;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
214 int i;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
215
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
216 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
217 dest += dstrides.y*y + x;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
218 src = image[0];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
219 for(i=0;i<h;i++){
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
220 memcpy(dest,src,w);
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
221 src+=stride[0];
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
222 dest += dstrides.y;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
223 }
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
224 return 0;
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
225 }
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
226
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
227 static uint32_t 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
228 {
938d37ad4f85 preliminary version
nick
parents:
diff changeset
229 uint8_t *src;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
230 uint8_t *dest;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
231 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
232
4032
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
233 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
234 dest += dstrides.y*y + x;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
235 src = image[0];
938d37ad4f85 preliminary version
nick
parents:
diff changeset
236 for(i=0;i<h;i++){
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
237 memcpy(dest,src,w*image_Bpp);
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
238 src+=stride[0];
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
239 dest += dstrides.y;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
240 }
4240
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
241 return 0;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
242 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
243
938d37ad4f85 preliminary version
nick
parents:
diff changeset
244 uint32_t vidix_draw_slice(uint8_t *image[], int stride[], int w,int h,int x,int y)
938d37ad4f85 preliminary version
nick
parents:
diff changeset
245 {
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
246 mp_msg(MSGT_VO,MSGL_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawsliceWasCalled);
10605
alex
parents: 10272
diff changeset
247 return -1;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
248 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
249
7685
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
250 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
251 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
252 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
253
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
254 // if -dr or -slices then do nothing:
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
255 if(mpi->flags&(MP_IMGFLAG_DIRECT|MP_IMGFLAG_DRAW_CALLBACK)) return VO_TRUE;
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
256
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
257 vo_server->draw_slice(mpi->planes,mpi->stride,
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
258 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
259 return VO_TRUE;
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
260 }
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
261
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
262 uint32_t vidix_draw_frame(uint8_t *image[])
938d37ad4f85 preliminary version
nick
parents:
diff changeset
263 {
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_WARN, MSGTR_LIBVO_SUB_VIDIX_DummyVidixdrawframeWasCalled);
7685
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
265 return -1;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
266 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
267
938d37ad4f85 preliminary version
nick
parents:
diff changeset
268 void vidix_flip_page(void)
938d37ad4f85 preliminary version
nick
parents:
diff changeset
269 {
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
270 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
271 mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_flip_page() was called\n"); }
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
272 if(vo_doublebuffering)
938d37ad4f85 preliminary version
nick
parents:
diff changeset
273 {
4032
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
274 vdlPlaybackFrameSelect(vidix_handler,next_frame);
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
275 next_frame=(next_frame+1)%vidix_play.num_frames;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
276 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
277 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
278
938d37ad4f85 preliminary version
nick
parents:
diff changeset
279 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
280 {
4032
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
281 uint32_t apitch,bespitch;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
282 void *lvo_mem;
4032
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
283 lvo_mem = vidix_mem + vidix_play.offsets[next_frame] + vidix_play.offset.y;
076c6c29e693 OSD support
nick
parents: 4031
diff changeset
284 apitch = vidix_play.dest.pitch.y-1;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
285 switch(vidix_play.fourcc){
938d37ad4f85 preliminary version
nick
parents:
diff changeset
286 case IMGFMT_YV12:
938d37ad4f85 preliminary version
nick
parents:
diff changeset
287 case IMGFMT_IYUV:
938d37ad4f85 preliminary version
nick
parents:
diff changeset
288 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
289 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
290 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
291 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
292 case IMGFMT_Y800:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
293 bespitch = (vidix_play.src.w + apitch) & (~apitch);
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
294 vo_draw_alpha_yv12(w,h,src,srca,stride,lvo_mem+bespitch*y0+x0,bespitch);
938d37ad4f85 preliminary version
nick
parents:
diff changeset
295 break;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
296 case IMGFMT_YUY2:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
297 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
298 vo_draw_alpha_yuy2(w,h,src,srca,stride,lvo_mem+bespitch*y0+2*x0,bespitch);
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
299 break;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
300 case IMGFMT_UYVY:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
301 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
302 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
303 break;
4430
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
304 case IMGFMT_RGB32:
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
305 case IMGFMT_BGR32:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
306 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
307 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
308 break;
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
309 case IMGFMT_RGB24:
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
310 case IMGFMT_BGR24:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
311 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
312 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
313 break;
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
314 case IMGFMT_RGB16:
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
315 case IMGFMT_BGR16:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
316 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
317 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
318 break;
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
319 case IMGFMT_RGB15:
b4cc68c448db IMGFMT_RGBxx experimental support
nick
parents: 4379
diff changeset
320 case IMGFMT_BGR15:
4745
398e3663ed71 Allow using direct rendering with any HW pitches (even on matrox g400).
nick
parents: 4744
diff changeset
321 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
322 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
323 break;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
324 default:
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
325 return;
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
326 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
327 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
328
938d37ad4f85 preliminary version
nick
parents:
diff changeset
329 void vidix_draw_osd(void)
938d37ad4f85 preliminary version
nick
parents:
diff changeset
330 {
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
331 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
332 mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_draw_osd() was called\n"); }
4010
938d37ad4f85 preliminary version
nick
parents:
diff changeset
333 /* TODO: hw support */
938d37ad4f85 preliminary version
nick
parents:
diff changeset
334 vo_draw_text(vidix_play.src.w,vidix_play.src.h,draw_alpha);
938d37ad4f85 preliminary version
nick
parents:
diff changeset
335 }
938d37ad4f85 preliminary version
nick
parents:
diff changeset
336
938d37ad4f85 preliminary version
nick
parents:
diff changeset
337 uint32_t vidix_query_fourcc(uint32_t format)
938d37ad4f85 preliminary version
nick
parents:
diff changeset
338 {
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
339 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
340 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
341 vidix_fourcc.fourcc = format;
938d37ad4f85 preliminary version
nick
parents:
diff changeset
342 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
343 if (vidix_fourcc.depth == VID_DEPTH_NONE)
5566
e01c664def74 VFCAP added
arpi
parents: 5373
diff changeset
344 return 0;
7694
b64f14fdadfb also set VFCAP_ACCEPT_STRIDE when draw_image() is implemented
arpi
parents: 7685
diff changeset
345 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
346 }
4240
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
347
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4240
diff changeset
348 int vidix_grkey_support(void)
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4240
diff changeset
349 {
4270
178c84b1090e clearing safely the buffer, queryfourcc returns 0x2 (hw accel, noconv.), setting eq only if drivers i able
alex
parents: 4255
diff changeset
350 return(vidix_fourcc.flags & VID_CAP_COLORKEY);
4255
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4240
diff changeset
351 }
5a4a4b272d10 vidix_grkey_support checking for colorkeying
alex
parents: 4240
diff changeset
352
4240
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
353 int vidix_grkey_get(vidix_grkey_t *gr_key)
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
354 {
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
355 return(vdlGetGrKeys(vidix_handler, gr_key));
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
356 }
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
357
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
358 int vidix_grkey_set(const vidix_grkey_t *gr_key)
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
359 {
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
360 return(vdlSetGrKeys(vidix_handler, gr_key));
a7d6ea555c2e added colorkey handling
alex
parents: 4234
diff changeset
361 }
4372
9b6430df4de5 improvements
nick
parents: 4362
diff changeset
362
4379
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
363
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
364 static int vidix_get_video_eq(vidix_video_eq_t *info)
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
365 {
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
366 if(!video_on) return EPERM;
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
367 return vdlPlaybackGetEq(vidix_handler, info);
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
368 }
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
369
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
370 static int vidix_set_video_eq(const vidix_video_eq_t *info)
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
371 {
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
372 if(!video_on) return EPERM;
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
373 return vdlPlaybackSetEq(vidix_handler, info);
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
374 }
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
375
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
376 static int vidix_get_num_fx(unsigned *info)
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
377 {
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
378 if(!video_on) return EPERM;
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
379 return vdlQueryNumOemEffects(vidix_handler, info);
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
380 }
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
381
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
382 static int vidix_get_oem_fx(vidix_oem_fx_t *info)
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
383 {
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
384 if(!video_on) return EPERM;
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
385 return vdlGetOemEffect(vidix_handler, info);
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
386 }
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
387
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
388 static int vidix_set_oem_fx(const vidix_oem_fx_t *info)
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
389 {
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
390 if(!video_on) return EPERM;
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
391 return vdlSetOemEffect(vidix_handler, info);
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
392 }
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
393
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
394 static int vidix_set_deint(const vidix_deinterlace_t *info)
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
395 {
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
396 if(!video_on) return EPERM;
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
397 return vdlPlaybackSetDeint(vidix_handler, info);
7a4837091398 provide full vaa interface
nick
parents: 4372
diff changeset
398 }
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
399
5028
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
400 static int is_422_planes_eq=0;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
401 int vidix_init(unsigned src_width,unsigned src_height,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
402 unsigned x_org,unsigned y_org,unsigned dst_width,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
403 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
404 unsigned vid_w,unsigned vid_h)
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
405 {
17128
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
406 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
407 size_t i;
5028
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
408 int err;
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
409 uint32_t sstride,apitch;
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
410 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
411 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
412 "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
413 "format=%s dest_bpp=%u vid_w=%u vid_h=%u\n"
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
414 ,src_width,src_height,x_org,y_org,dst_width,dst_height
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
415 ,vo_format_name(format),dest_bpp,vid_w,vid_h);
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
416
7026
a3126e9099b4 should solve -vo vesa:vidix problem 'vosub_vidix: video server has
arpi
parents: 6806
diff changeset
417 if(vidix_query_fourcc(format) == 0)
a3126e9099b4 should solve -vo vesa:vidix problem 'vosub_vidix: video server has
arpi
parents: 6806
diff changeset
418 {
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
419 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
420 format,vo_format_name(format));
a3126e9099b4 should solve -vo vesa:vidix problem 'vosub_vidix: video server has
arpi
parents: 6806
diff changeset
421 return -1;
a3126e9099b4 should solve -vo vesa:vidix problem 'vosub_vidix: video server has
arpi
parents: 6806
diff changeset
422 }
a3126e9099b4 should solve -vo vesa:vidix problem 'vosub_vidix: video server has
arpi
parents: 6806
diff changeset
423
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
424 if(((vidix_cap.maxwidth != -1) && (vid_w > vidix_cap.maxwidth)) ||
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
425 ((vidix_cap.minwidth != -1) && (vid_w < vidix_cap.minwidth)) ||
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
426 ((vidix_cap.maxheight != -1) && (vid_h > vidix_cap.maxheight)) ||
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
427 ((vidix_cap.minwidth != -1 ) && (vid_h < vidix_cap.minheight)))
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
428 {
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
429 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_VideoServerHasUnsupportedResolution,
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
430 vid_w, vid_h, vidix_cap.minwidth, vidix_cap.minheight,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
431 vidix_cap.maxwidth, vidix_cap.maxheight);
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
432 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
433 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
434
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
435 err = 0;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
436 switch(dest_bpp)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
437 {
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
438 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
439 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
440 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
441 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
442 case 12:err = ((vidix_fourcc.depth & VID_DEPTH_12BPP) != VID_DEPTH_12BPP); break;
4540
cb255a42aa5e Enable 15bpp on server
nick
parents: 4454
diff changeset
443 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
444 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
445 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
446 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
447 default: err=1; break;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
448 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
449 if(err)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
450 {
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
451 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_VideoServerHasUnsupportedColorDepth
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
452 ,vidix_fourcc.depth);
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
453 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
454 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
455 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
456 {
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
457 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_DriverCantUpscaleImage,
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
458 src_width, src_height, dst_width, dst_height);
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
459 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
460 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
461 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
462 {
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
463 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_DriverCantDownscaleImage,
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
464 src_width, src_height, dst_width, dst_height);
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
465 return -1;
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 image_width = src_width;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
468 image_height = src_height;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
469 src_format = format;
5052
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
470 if(forced_fourcc) format = forced_fourcc;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
471 memset(&vidix_play,0,sizeof(vidix_playback_t));
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
472 vidix_play.fourcc = format;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
473 vidix_play.capability = vidix_cap.flags; /* every ;) */
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
474 vidix_play.blend_factor = 0; /* for now */
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
475 /* display the full picture.
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
476 Nick: we could implement here zooming to a specified area -- alex */
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
477 vidix_play.src.x = vidix_play.src.y = 0;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
478 vidix_play.src.w = src_width;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
479 vidix_play.src.h = src_height;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
480 vidix_play.dest.x = x_org;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
481 vidix_play.dest.y = y_org;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
482 vidix_play.dest.w = dst_width;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
483 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
484 // 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
485 /* 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
486 vidix_play.num_frames=vo_doublebuffering?3:1;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
487 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
488
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
489 if((err=vdlConfigPlayback(vidix_handler,&vidix_play))!=0)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
490 {
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
491 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
492 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
493 }
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
494 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
495 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
496
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
497 vidix_mem = vidix_play.dga_addr;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
498
17128
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
499 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
500 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
501 memset(tmpa, 1, image_width * image_height);
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
502 /* 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
503 /* 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
504 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
505 next_frame = i;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
506 memset(vidix_mem + vidix_play.offsets[i], 0x80,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
507 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
508 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
509 }
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
510 free(tmp);
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
511 free(tmpa);
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
512 /* 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
513 vidix_flip_page();
34f870d8e8a8 really clear frames to black instead of grey, and make sure one of those
reimar
parents: 13787
diff changeset
514
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
515 switch(format)
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
516 {
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
517 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
518 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
519 case IMGFMT_IYUV:
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
520 case IMGFMT_YVU9:
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
521 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
522 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
523 case IMGFMT_Y8:
4999
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
524 apitch = vidix_play.dest.pitch.y-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
525 dstrides.y = (image_width + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
526 apitch = vidix_play.dest.pitch.v-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
527 dstrides.v = (image_width + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
528 apitch = vidix_play.dest.pitch.u-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
529 dstrides.u = (image_width + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
530 image_Bpp=1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
531 break;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
532 case IMGFMT_RGB32:
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
533 case IMGFMT_BGR32:
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
534 apitch = vidix_play.dest.pitch.y-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
535 dstrides.y = (image_width*4 + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
536 dstrides.u = dstrides.v = 0;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
537 image_Bpp=4;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
538 break;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
539 case IMGFMT_RGB24:
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
540 case IMGFMT_BGR24:
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
541 apitch = vidix_play.dest.pitch.y-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
542 dstrides.y = (image_width*3 + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
543 dstrides.u = dstrides.v = 0;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
544 image_Bpp=3;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
545 break;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
546 default:
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
547 apitch = vidix_play.dest.pitch.y-1;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
548 dstrides.y = (image_width*2 + apitch) & ~apitch;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
549 dstrides.u = dstrides.v = 0;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
550 image_Bpp=2;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
551 break;
7f1fa1db24b4 Optimization and get_image fixes (still untested)
nick
parents: 4991
diff changeset
552 }
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
553 /* tune some info here */
6482
528216496060 YVU9,IF09,Y800 and Y8 support - and syªªnced with mpxp
alex
parents: 6018
diff changeset
554 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
555 if(!forced_fourcc)
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
556 {
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
557 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
558
5052
6f28d6ccbd91 Using yv12_to_yuy2 sw convertor for cards which have no native yv12 support
nick
parents: 5028
diff changeset
559 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
560 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
561 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
562 vo_server->draw_slice = vidix_draw_slice_410;
7685
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
563 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
564 }
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
565 return 0;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
566 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
567
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
568 static uint32_t vidix_get_image(mp_image_t *mpi)
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
569 {
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
570 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
571 if(mpi->flags&MP_IMGFLAG_READABLE) return VO_FALSE; /* slow video ram */
7685
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
572 if(( (mpi->stride[0]==dstrides.y && (!(mpi->flags&MP_IMGFLAG_PLANAR) ||
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
573 (mpi->stride[1]==dstrides.u && mpi->stride[2]==dstrides.v)) )
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
574 || (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
575 (!forced_fourcc && !(vidix_play.flags & VID_PLAY_INTERLEAVED_UV)))
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
576 {
5373
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
577 if(mpi->flags&MP_IMGFLAG_ACCEPT_WIDTH){
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
578 // check if only width is enough to represent strides:
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
579 if(mpi->flags&MP_IMGFLAG_PLANAR){
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
580 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
581 } else {
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
582 if(dstrides.y % (mpi->bpp/8)) return VO_FALSE;
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
583 }
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
584 }
5028
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
585 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
586 mpi->width=mpi->stride[0]=dstrides.y;
5028
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
587 if(mpi->flags&MP_IMGFLAG_PLANAR)
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
588 {
11553
656932ca58ab vidix_get_image() fix
michael
parents: 11239
diff changeset
589 mpi->planes[1]=vidix_mem+vidix_play.offsets[next_frame]+vidix_play.offset.v;
656932ca58ab vidix_get_image() fix
michael
parents: 11239
diff changeset
590 mpi->stride[1]=dstrides.v >> mpi->chroma_x_shift;
656932ca58ab vidix_get_image() fix
michael
parents: 11239
diff changeset
591 mpi->planes[2]=vidix_mem+vidix_play.offsets[next_frame]+vidix_play.offset.u;
656932ca58ab vidix_get_image() fix
michael
parents: 11239
diff changeset
592 mpi->stride[2]=dstrides.u >> mpi->chroma_x_shift;
5373
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
593 } else
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
594 mpi->width/=mpi->bpp/8;
5028
ddc28e9aa726 fixed strides for packed fourccs
nick
parents: 5002
diff changeset
595 mpi->flags|=MP_IMGFLAG_DIRECT;
5373
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
596 return VO_TRUE;
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
597 }
5373
b476f5d1c91e 10l to nick - ACCEPT_WIDTH fixed
arpi
parents: 5319
diff changeset
598 return VO_FALSE;
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
599 }
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
600
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
601 uint32_t vidix_control(uint32_t request, void *data, ...)
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
602 {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
603 switch (request) {
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
604 case VOCTRL_QUERY_FORMAT:
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
605 return vidix_query_fourcc(*((uint32_t*)data));
4991
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
606 case VOCTRL_GET_IMAGE:
ad943b99610a VOCTRL_GET_IMAGE (untested but should work)
nick
parents: 4929
diff changeset
607 return vidix_get_image(data);
7685
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
608 case VOCTRL_DRAW_IMAGE:
486b56f4b0f3 draw_image, get_image fix
arpi
parents: 7124
diff changeset
609 return vidix_draw_image(data);
5002
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
610 case VOCTRL_GET_FRAME_NUM:
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
611 *(uint32_t *)data = next_frame;
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
612 return VO_TRUE;
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
613 case VOCTRL_SET_FRAME_NUM:
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
614 next_frame = *(uint32_t *)data;
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
615 return VO_TRUE;
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
616 case VOCTRL_GET_NUM_FRAMES:
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
617 *(uint32_t *)data = vidix_play.num_frames;
70751bbd6404 voctls for decoding ahead
nick
parents: 4999
diff changeset
618 return VO_TRUE;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
619 case VOCTRL_SET_EQUALIZER:
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
620 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
621 va_list ap;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
622 int value;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
623 vidix_video_eq_t info;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
624
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
625 if(!video_on) return VO_FALSE;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
626 va_start(ap, data);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
627 value = va_arg(ap, int);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
628 va_end(ap);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
629
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
630 // printf("vidix seteq %s -> %d \n",data,value);
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
631
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
632 /* vidix eq ranges are -1000..1000 */
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
633 if (!strcasecmp(data, "brightness"))
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
634 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
635 info.brightness = value*10;
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
636 info.cap = VEQ_CAP_BRIGHTNESS;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
637 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
638 else if (!strcasecmp(data, "contrast"))
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
639 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
640 info.contrast = value*10;
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
641 info.cap = VEQ_CAP_CONTRAST;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
642 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
643 else if (!strcasecmp(data, "saturation"))
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
644 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
645 info.saturation = value*10;
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
646 info.cap = VEQ_CAP_SATURATION;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
647 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
648 else if (!strcasecmp(data, "hue"))
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
649 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
650 info.hue = value*10;
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
651 info.cap = VEQ_CAP_HUE;
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
652 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
653
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
654 if (vdlPlaybackSetEq(vidix_handler, &info) == 0)
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
655 return VO_TRUE;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
656 return VO_FALSE;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
657 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
658 case VOCTRL_GET_EQUALIZER:
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
659 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
660 va_list ap;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
661 int *value;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
662 vidix_video_eq_t info;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
663
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
664 if(!video_on) return VO_FALSE;
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
665 if (vdlPlaybackGetEq(vidix_handler, &info) != 0)
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
666 return VO_FALSE;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
667
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
668 va_start(ap, data);
6806
994d3729b0d1 10l bug fixed (info.cap |= -> = )
arpi
parents: 6786
diff changeset
669 value = va_arg(ap, int*);
6786
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
670 va_end(ap);
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
671
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
672 /* vidix eq ranges are -1000..1000 */
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
673 if (!strcasecmp(data, "brightness"))
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
674 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
675 if (info.cap & VEQ_CAP_BRIGHTNESS)
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
676 *value = info.brightness/10;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
677 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
678 else if (!strcasecmp(data, "contrast"))
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
679 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
680 if (info.cap & VEQ_CAP_CONTRAST)
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
681 *value = info.contrast/10;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
682 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
683 else if (!strcasecmp(data, "saturation"))
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
684 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
685 if (info.cap & VEQ_CAP_SATURATION)
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
686 *value = info.saturation/10;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
687 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
688 else if (!strcasecmp(data, "hue"))
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
689 {
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
690 if (info.cap & VEQ_CAP_HUE)
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
691 *value = info.hue/10;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
692 }
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
693
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
694 return VO_TRUE;
b16cb6cbff5a eq reworked
alex
parents: 6755
diff changeset
695 }
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
696 }
6531
7bd342baa785 yvu9,if09,y8,y800 support and multifile fix
alex
parents: 6482
diff changeset
697 return VO_NOTIMPL;
5319
83e6e16e9670 fallback to server's control() - patch by KotH
arpi
parents: 5052
diff changeset
698 // WARNING: we drop extra parameters (...) here!
6531
7bd342baa785 yvu9,if09,y8,y800 support and multifile fix
alex
parents: 6482
diff changeset
699 // return server_control(request,data); //VO_NOTIMPL;
4592
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
700 }
5fbfd8545c3b query_ stuff replaced by new control() - patch by David Holm
arpi
parents: 4540
diff changeset
701
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
702 int vidix_preinit(const char *drvname,void *server)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
703 {
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
704 int err;
17932
3fe3b2b3a6ce Convert all if(verbose>X) to mp_msg_test calls.
diego
parents: 17128
diff changeset
705 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
706 mp_msg(MSGT_VO,MSGL_DBG2, "vosub_vidix: vidix_preinit(%s) was called\n",drvname); }
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
707 if(vdlGetVersion() != VIDIX_VERSION)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
708 {
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
709 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_YouHaveWrongVersionOfVidixLibrary);
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
710 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
711 }
11239
a71000eeeb9c mingw port
faust3
parents: 10981
diff changeset
712 #ifndef __MINGW32__
17988
4f7892794a7f added support for external VIDIX
nicodvb
parents: 17932
diff changeset
713 vidix_handler = vdlOpen(MP_VIDIX_PFX,
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
714 drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
715 TYPE_OUTPUT,
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
716 verbose);
11239
a71000eeeb9c mingw port
faust3
parents: 10981
diff changeset
717 #else
a71000eeeb9c mingw port
faust3
parents: 10981
diff changeset
718 vidix_handler = vdlOpen(get_path("vidix/"),
a71000eeeb9c mingw port
faust3
parents: 10981
diff changeset
719 drvname ? drvname[0] == ':' ? &drvname[1] : drvname[0] ? drvname : NULL : NULL,
a71000eeeb9c mingw port
faust3
parents: 10981
diff changeset
720 TYPE_OUTPUT,
a71000eeeb9c mingw port
faust3
parents: 10981
diff changeset
721 verbose);
a71000eeeb9c mingw port
faust3
parents: 10981
diff changeset
722 #endif
a71000eeeb9c mingw port
faust3
parents: 10981
diff changeset
723
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
724 if(vidix_handler == NULL)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
725 {
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
726 mp_msg(MSGT_VO,MSGL_ERR, MSGTR_LIBVO_SUB_VIDIX_CouldntFindWorkingVidixDriver);
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
727 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
728 }
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
729 if((err=vdlGetCapability(vidix_handler,&vidix_cap)) != 0)
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
730 {
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
731 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
732 return -1;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
733 }
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
734 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SUB_VIDIX_Description, vidix_cap.name);
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
735 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_SUB_VIDIX_Author, vidix_cap.author);
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
736 /* we are able to tune up this stuff depend on fourcc format */
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
737 ((vo_functions_t *)server)->draw_slice=vidix_draw_slice;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
738 ((vo_functions_t *)server)->draw_frame=vidix_draw_frame;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
739 ((vo_functions_t *)server)->flip_page=vidix_flip_page;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
740 ((vo_functions_t *)server)->draw_osd=vidix_draw_osd;
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
741 // server_control = ((vo_functions_t *)server)->control;
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
742 // ((vo_functions_t *)server)->control=vidix_control;
4454
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
743 vo_server = server;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
744 return 0;
c58106c9e2af Optimizing with use new tune info
nick
parents: 4442
diff changeset
745 }