Mercurial > mplayer.hg
annotate dec_video.c @ 3852:cd642e995366
use XF86VidMode later in init (at line 1031) only if we've got support (if have_vm==1)
author | alex |
---|---|
date | Fri, 28 Dec 2001 20:52:54 +0000 |
parents | 53ed66a4f0bf |
children | a3c73266f81f |
rev | line source |
---|---|
2775 | 1 |
2 #include "config.h" | |
1294 | 3 |
4 #include <stdio.h> | |
2775 | 5 #ifdef HAVE_MALLOC_H |
6 #include <malloc.h> | |
7 #endif | |
1294 | 8 #include <stdlib.h> |
1430 | 9 #include <unistd.h> |
1294 | 10 |
1567 | 11 #include "mp_msg.h" |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
12 #include "help_mp.h" |
1294 | 13 |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1309
diff
changeset
|
14 #include "linux/timer.h" |
1496 | 15 #include "linux/shmem.h" |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1309
diff
changeset
|
16 |
2563 | 17 extern int verbose; // defined in mplayer.c |
18 | |
1294 | 19 #include "stream.h" |
20 #include "demuxer.h" | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
21 #include "parse_es.h" |
1294 | 22 |
23 #include "codec-cfg.h" | |
24 #include "stheader.h" | |
25 | |
1422 | 26 #ifdef USE_LIBVO2 |
27 #include "libvo2/libvo2.h" | |
28 #else | |
1294 | 29 #include "libvo/video_out.h" |
1422 | 30 #endif |
1294 | 31 |
2563 | 32 #include "dec_video.h" |
33 | |
34 // =================================================================== | |
35 | |
36 extern double video_time_usage; | |
37 extern double vout_time_usage; | |
38 | |
39 extern int frameratecode2framerate[16]; | |
40 | |
41 #include "dll_init.h" | |
42 | |
43 //#include <inttypes.h> | |
44 //#include "libvo/img_format.h" | |
45 | |
1294 | 46 #include "libmpeg2/mpeg2.h" |
47 #include "libmpeg2/mpeg2_internal.h" | |
48 | |
2184 | 49 #include "postproc/postprocess.h" |
50 | |
3144 | 51 #include "cpudetect.h" |
52 | |
1294 | 53 extern picture_t *picture; // exported from libmpeg2/decode.c |
54 | |
2563 | 55 int divx_quality=0; |
1294 | 56 |
57 #ifdef USE_DIRECTSHOW | |
3449 | 58 #include "loader/DirectShow/DS_VideoDec.h" |
3442 | 59 static void* ds_vdec=NULL; |
3062 | 60 #endif |
1294 | 61 |
62 #ifdef USE_LIBAVCODEC | |
2496 | 63 #ifdef USE_LIBAVCODEC_SO |
64 #include <libffmpeg/avcodec.h> | |
65 #else | |
1294 | 66 #include "libavcodec/avcodec.h" |
2496 | 67 #endif |
1927 | 68 static AVCodec *lavc_codec=NULL; |
69 static AVCodecContext lavc_context; | |
70 static AVPicture lavc_picture; | |
71 int avcodec_inited=0; | |
1294 | 72 #endif |
2228 | 73 #ifdef FF_POSTPROCESS |
74 unsigned int lavc_pp=0; | |
75 #endif | |
1294 | 76 |
1349 | 77 #ifndef NEW_DECORE |
1294 | 78 #include "opendivx/decore.h" |
1349 | 79 #else |
80 #include <decore.h> | |
81 #endif | |
1294 | 82 |
2378 | 83 #ifdef USE_XANIM |
84 #include "xacodec.h" | |
85 #endif | |
86 | |
2938
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
87 #ifdef USE_TV |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
88 #include "libmpdemux/tv.h" |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
89 |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
90 extern int tv_param_on; |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
91 extern tvi_handle_t *tv_handler; |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
92 #endif |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
93 |
1948 | 94 void AVI_Decode_RLE8(char *image,char *delta,int tdsize, |
95 unsigned int *map,int imagex,int imagey,unsigned char x11_bytes_pixel); | |
96 | |
2827
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
97 void AVI_Decode_Video1_16( |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
98 char *encoded, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
99 int encoded_size, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
100 char *decoded, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
101 int width, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
102 int height, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
103 int bytes_per_pixel); |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
104 |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
105 void AVI_Decode_Video1_8( |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
106 char *encoded, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
107 int encoded_size, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
108 char *decoded, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
109 int width, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
110 int height, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
111 unsigned char *palette_map, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
112 int bytes_per_pixel); |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
113 |
3687
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
114 void Decode_Fli( |
3172 | 115 unsigned char *encoded, |
116 int encoded_size, | |
117 unsigned char *decoded, | |
118 int width, | |
119 int height, | |
120 int bytes_per_pixel); | |
121 | |
3687
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
122 void qt_decode_rle( |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
123 unsigned char *encoded, |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
124 int encoded_size, |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
125 unsigned char *decoded, |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
126 int width, |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
127 int height, |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
128 int encoded_bpp, |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
129 int bytes_per_pixel); |
3172 | 130 |
3804
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
131 void decode_nuv( |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
132 unsigned char *encoded, |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
133 int encoded_size, |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
134 unsigned char *decoded, |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
135 int width, |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
136 int height); |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
137 |
1294 | 138 //**************************************************************************// |
139 // The OpenDivX stuff: | |
140 //**************************************************************************// | |
141 | |
142 #ifndef NEW_DECORE | |
143 | |
144 static unsigned char *opendivx_src[3]; | |
145 static int opendivx_stride[3]; | |
146 | |
147 // callback, the opendivx decoder calls this for each frame: | |
148 void convert_linux(unsigned char *puc_y, int stride_y, | |
149 unsigned char *puc_u, unsigned char *puc_v, int stride_uv, | |
150 unsigned char *bmp, int width_y, int height_y){ | |
151 | |
152 // printf("convert_yuv called %dx%d stride: %d,%d\n",width_y,height_y,stride_y,stride_uv); | |
153 | |
154 opendivx_src[0]=puc_y; | |
155 opendivx_src[1]=puc_u; | |
156 opendivx_src[2]=puc_v; | |
157 | |
158 opendivx_stride[0]=stride_y; | |
159 opendivx_stride[1]=stride_uv; | |
160 opendivx_stride[2]=stride_uv; | |
161 } | |
162 #endif | |
163 | |
1429 | 164 int get_video_quality_max(sh_video_t *sh_video){ |
165 switch(sh_video->codec->driver){ | |
2087 | 166 #ifdef USE_WIN32DLL |
167 case VFM_VFW: | |
168 case VFM_VFWEX: | |
2184 | 169 return 9; // for Divx.dll (divx4) |
2087 | 170 #endif |
1429 | 171 #ifdef USE_DIRECTSHOW |
172 case VFM_DSHOW: | |
173 return 4; | |
174 #endif | |
175 #ifdef MPEG12_POSTPROC | |
176 case VFM_MPEG: | |
2184 | 177 return GET_PP_QUALITY_MAX; |
1429 | 178 #endif |
2228 | 179 #ifdef FF_POSTPROCESS |
180 case VFM_FFMPEG: | |
181 return GET_PP_QUALITY_MAX; | |
182 #endif | |
1429 | 183 case VFM_DIVX4: |
184 case VFM_ODIVX: | |
2184 | 185 #ifdef NEW_DECORE |
186 return 9; // for divx4linux | |
187 #else | |
188 return GET_PP_QUALITY_MAX; // for opendivx | |
189 #endif | |
1429 | 190 } |
191 return 0; | |
192 } | |
193 | |
194 void set_video_quality(sh_video_t *sh_video,int quality){ | |
195 switch(sh_video->codec->driver){ | |
2087 | 196 #ifdef USE_WIN32DLL |
197 case VFM_VFW: | |
198 case VFM_VFWEX: | |
199 vfw_set_postproc(sh_video,10*quality); | |
200 break; | |
201 #endif | |
1429 | 202 #ifdef USE_DIRECTSHOW |
203 case VFM_DSHOW: { | |
204 if(quality<0 || quality>4) quality=4; | |
3062 | 205 DS_VideoDecoder_SetValue(ds_vdec,"Quality",quality); |
1429 | 206 } |
207 break; | |
208 #endif | |
209 #ifdef MPEG12_POSTPROC | |
210 case VFM_MPEG: { | |
2184 | 211 if(quality<0 || quality>GET_PP_QUALITY_MAX) quality=GET_PP_QUALITY_MAX; |
212 picture->pp_options=getPpModeForQuality(quality); | |
1429 | 213 } |
214 break; | |
215 #endif | |
2228 | 216 #ifdef FF_POSTPROCESS |
217 case VFM_FFMPEG: | |
218 if(quality<0 || quality>GET_PP_QUALITY_MAX) quality=GET_PP_QUALITY_MAX; | |
219 lavc_pp=getPpModeForQuality(quality); | |
220 break; | |
221 #endif | |
1429 | 222 case VFM_DIVX4: |
223 case VFM_ODIVX: { | |
224 DEC_SET dec_set; | |
2184 | 225 #ifdef NEW_DECORE |
226 if(quality<0 || quality>9) quality=9; | |
227 dec_set.postproc_level=quality*10; | |
228 #else | |
229 if(quality<0 || quality>GET_PP_QUALITY_MAX) quality=GET_PP_QUALITY_MAX; | |
230 dec_set.postproc_level=getPpModeForQuality(quality); | |
231 #endif | |
1429 | 232 decore(0x123,DEC_OPT_SETPP,&dec_set,NULL); |
233 } | |
234 break; | |
235 } | |
236 } | |
237 | |
238 int set_video_colors(sh_video_t *sh_video,char *item,int value){ | |
1431 | 239 #ifdef USE_DIRECTSHOW |
2295 | 240 if(sh_video->codec->driver==VFM_DSHOW){ |
3062 | 241 DS_VideoDecoder_SetValue(ds_vdec,item,value); |
1429 | 242 return 1; |
243 } | |
1431 | 244 #endif |
2938
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
245 |
2295 | 246 #ifdef NEW_DECORE |
247 #ifdef DECORE_VERSION | |
248 #if DECORE_VERSION >= 20011010 | |
249 if(sh_video->codec->driver==VFM_DIVX4){ | |
250 int option; | |
251 if(!strcmp(item,"Brightness")) option=DEC_GAMMA_BRIGHTNESS; | |
252 else if(!strcmp(item, "Contrast")) option=DEC_GAMMA_CONTRAST; | |
253 else if(!strcmp(item,"Saturation")) option=DEC_GAMMA_SATURATION; | |
254 else return 0; | |
255 value = (value * 256) / 100 - 128; | |
256 decore(0x123, DEC_OPT_GAMMA, (void *)option, (void *) value); | |
257 return 1; | |
258 } | |
259 #endif | |
260 #endif | |
261 #endif | |
2938
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
262 |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
263 #ifdef USE_TV |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
264 |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
265 if (tv_param_on == 1) |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
266 { |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
267 if (!strcmp(item, "Brightness")) |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
268 { |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
269 tv_set_color_options(tv_handler, TV_COLOR_BRIGHTNESS, value); |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
270 return(1); |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
271 } |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
272 if (!strcmp(item, "Hue")) |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
273 { |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
274 tv_set_color_options(tv_handler, TV_COLOR_HUE, value); |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
275 return(1); |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
276 } |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
277 if (!strcmp(item, "Saturation")) |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
278 { |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
279 tv_set_color_options(tv_handler, TV_COLOR_SATURATION, value); |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
280 return(1); |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
281 } |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
282 if (!strcmp(item, "Contrast")) |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
283 { |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
284 tv_set_color_options(tv_handler, TV_COLOR_CONTRAST, value); |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
285 return(1); |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
286 } |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
287 } |
757c3ab1a45a
added support for setting color values on tv interface
alex
parents:
2827
diff
changeset
|
288 #endif |
1429 | 289 return 0; |
290 } | |
1294 | 291 |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
292 void uninit_video(sh_video_t *sh_video){ |
1654 | 293 if(!sh_video->inited) return; |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
294 mp_msg(MSGT_DECVIDEO,MSGL_V,"uninit video: %d \n",sh_video->codec->driver); |
1654 | 295 switch(sh_video->codec->driver){ |
1666 | 296 #ifdef USE_LIBAVCODEC |
1654 | 297 case VFM_FFMPEG: |
298 if (avcodec_close(&lavc_context) < 0) | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
299 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantCloseCodec); |
1654 | 300 break; |
1666 | 301 #endif |
1669 | 302 #ifdef USE_DIRECTSHOW |
1664 | 303 case VFM_DSHOW: // Win32/DirectShow |
3062 | 304 if(ds_vdec){ DS_VideoDecoder_Destroy(ds_vdec); ds_vdec=NULL; } |
1664 | 305 break; |
1666 | 306 #endif |
1654 | 307 case VFM_MPEG: |
308 mpeg2_free_image_buffers (picture); | |
309 break; | |
2563 | 310 #ifdef USE_XANIM |
311 case VFM_XANIM: | |
312 xacodec_exit(); | |
313 break; | |
314 #endif | |
1654 | 315 } |
316 if(sh_video->our_out_buffer){ | |
317 free(sh_video->our_out_buffer); | |
318 sh_video->our_out_buffer=NULL; | |
319 } | |
320 sh_video->inited=0; | |
321 } | |
322 | |
1294 | 323 int init_video(sh_video_t *sh_video){ |
324 unsigned int out_fmt=sh_video->codec->outfmt[sh_video->outfmtidx]; | |
325 | |
1454
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
326 sh_video->our_out_buffer=NULL; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
327 |
1294 | 328 switch(sh_video->codec->driver){ |
3643
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
329 case VFM_CINEPAK: { |
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
330 int bpp=((out_fmt&255)+7)/8; |
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
331 sh_video->our_out_buffer = |
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
332 (char*)memalign(64, sh_video->disp_w*sh_video->disp_h*bpp); |
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
333 sh_video->context = decode_cinepak_init(); |
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
334 break; |
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
335 } |
2659 | 336 case VFM_XANIM: { |
2378 | 337 #ifdef USE_XANIM |
2827
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
338 int ret=xacodec_init_video(sh_video,out_fmt); |
2378 | 339 if(!ret) return 0; |
2659 | 340 #else |
2660 | 341 // mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_NoXAnimSupport); |
342 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "MPlayer was compiled WIHTOUT XAnim support!\n"); | |
2659 | 343 return 0; |
344 #endif | |
2378 | 345 break; |
346 } | |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1496
diff
changeset
|
347 #ifdef USE_WIN32DLL |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
348 case VFM_VFW: { |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
349 if(!init_vfw_video_codec(sh_video,0)) { |
1294 | 350 return 0; |
351 } | |
1567 | 352 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32 video codec init OK!\n"); |
1294 | 353 break; |
354 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
355 case VFM_VFWEX: { |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
356 if(!init_vfw_video_codec(sh_video,1)) { |
1297 | 357 return 0; |
358 } | |
1567 | 359 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32Ex video codec init OK!\n"); |
1297 | 360 break; |
361 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
362 case VFM_DSHOW: { // Win32/DirectShow |
1294 | 363 #ifndef USE_DIRECTSHOW |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
364 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_NoDShowSupport); |
1294 | 365 return 0; |
366 #else | |
1547
4b0046db8e64
alloc frame buffer for directshow codec - requires for avifile sync
arpi
parents:
1517
diff
changeset
|
367 int bpp; |
3448 | 368 if(!(ds_vdec=DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, 0))){ |
1294 | 369 // if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, NULL)){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
370 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh_video->codec->dll); |
1567 | 371 mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n"); |
372 mp_msg(MSGT_DECVIDEO,MSGL_HINT,"package from: ftp://mplayerhq.hu/MPlayer/releases/w32codec.zip !\n"); | |
373 // mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Or you should disable DShow support: make distclean;make -f Makefile.No-DS\n"); | |
1294 | 374 return 0; |
375 } | |
376 | |
377 switch(out_fmt){ | |
378 case IMGFMT_YUY2: | |
379 case IMGFMT_UYVY: | |
1547
4b0046db8e64
alloc frame buffer for directshow codec - requires for avifile sync
arpi
parents:
1517
diff
changeset
|
380 bpp=16; |
3062 | 381 DS_VideoDecoder_SetDestFmt(ds_vdec,16,out_fmt);break; // packed YUV |
1294 | 382 case IMGFMT_YV12: |
383 case IMGFMT_I420: | |
384 case IMGFMT_IYUV: | |
1547
4b0046db8e64
alloc frame buffer for directshow codec - requires for avifile sync
arpi
parents:
1517
diff
changeset
|
385 bpp=12; |
3062 | 386 DS_VideoDecoder_SetDestFmt(ds_vdec,12,out_fmt);break; // planar YUV |
1294 | 387 default: |
1547
4b0046db8e64
alloc frame buffer for directshow codec - requires for avifile sync
arpi
parents:
1517
diff
changeset
|
388 bpp=((out_fmt&255)+7)&(~7); |
3062 | 389 DS_VideoDecoder_SetDestFmt(ds_vdec,out_fmt&255,0); // RGB/BGR |
1294 | 390 } |
391 | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
392 sh_video->our_out_buffer = (char*)memalign(64,sh_video->disp_w*sh_video->disp_h*bpp/8); // FIXME!!! |
1547
4b0046db8e64
alloc frame buffer for directshow codec - requires for avifile sync
arpi
parents:
1517
diff
changeset
|
393 |
3062 | 394 DS_SetAttr_DivX("Quality",divx_quality); |
1294 | 395 |
3062 | 396 DS_VideoDecoder_StartInternal(ds_vdec); |
1294 | 397 // printf("DivX setting result = %d\n", DS_SetAttr_DivX("Quality",divx_quality) ); |
398 // printf("DivX setting result = %d\n", DS_SetValue_DivX("Brightness",60) ); | |
399 | |
1567 | 400 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DShow video codec init OK!\n"); |
1294 | 401 break; |
402 #endif | |
403 } | |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1496
diff
changeset
|
404 #else /* !USE_WIN32DLL */ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
405 case VFM_VFW: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
406 case VFM_DSHOW: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
407 case VFM_VFWEX: |
2006 | 408 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_NoWfvSupport); |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
409 return 0; |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1496
diff
changeset
|
410 #endif /* !USE_WIN32DLL */ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
411 case VFM_ODIVX: { // OpenDivX |
1567 | 412 mp_msg(MSGT_DECVIDEO,MSGL_V,"OpenDivX video codec\n"); |
1294 | 413 { DEC_PARAM dec_param; |
414 DEC_SET dec_set; | |
1349 | 415 memset(&dec_param,0,sizeof(dec_param)); |
1294 | 416 #ifdef NEW_DECORE |
417 dec_param.output_format=DEC_USER; | |
418 #else | |
419 dec_param.color_depth = 32; | |
420 #endif | |
421 dec_param.x_dim = sh_video->bih->biWidth; | |
422 dec_param.y_dim = sh_video->bih->biHeight; | |
423 decore(0x123, DEC_OPT_INIT, &dec_param, NULL); | |
424 dec_set.postproc_level = divx_quality; | |
425 decore(0x123, DEC_OPT_SETPP, &dec_set, NULL); | |
1349 | 426 } |
1567 | 427 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: OpenDivX video codec init OK!\n"); |
1349 | 428 break; |
429 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
430 case VFM_DIVX4: { // DivX4Linux |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
431 #ifndef NEW_DECORE |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
432 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_NoDivx4Support); |
1631 | 433 return 0; |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
434 #else |
1567 | 435 mp_msg(MSGT_DECVIDEO,MSGL_V,"DivX4Linux video codec\n"); |
1349 | 436 { DEC_PARAM dec_param; |
437 DEC_SET dec_set; | |
438 int bits=16; | |
439 memset(&dec_param,0,sizeof(dec_param)); | |
440 switch(out_fmt){ | |
441 case IMGFMT_YV12: dec_param.output_format=DEC_YV12;bits=12;break; | |
442 case IMGFMT_YUY2: dec_param.output_format=DEC_YUY2;break; | |
443 case IMGFMT_UYVY: dec_param.output_format=DEC_UYVY;break; | |
444 case IMGFMT_I420: dec_param.output_format=DEC_420;bits=12;break; | |
445 case IMGFMT_BGR15: dec_param.output_format=DEC_RGB555_INV;break; | |
446 case IMGFMT_BGR16: dec_param.output_format=DEC_RGB565_INV;break; | |
447 case IMGFMT_BGR24: dec_param.output_format=DEC_RGB24_INV;bits=24;break; | |
448 case IMGFMT_BGR32: dec_param.output_format=DEC_RGB32_INV;bits=32;break; | |
449 default: | |
1567 | 450 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Unsupported out_fmt: 0x%X\n",out_fmt); |
1349 | 451 return 0; |
452 } | |
453 dec_param.x_dim = sh_video->bih->biWidth; | |
454 dec_param.y_dim = sh_video->bih->biHeight; | |
455 decore(0x123, DEC_OPT_INIT, &dec_param, NULL); | |
456 dec_set.postproc_level = divx_quality; | |
457 decore(0x123, DEC_OPT_SETPP, &dec_set, NULL); | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
458 sh_video->our_out_buffer = (char*)memalign(64,((bits*dec_param.x_dim+7)/8)*dec_param.y_dim); |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
459 // sh_video->our_out_buffer = shmem_alloc(dec_param.x_dim*dec_param.y_dim*5); |
1294 | 460 } |
1567 | 461 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: OpenDivX video codec init OK!\n"); |
1294 | 462 break; |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
463 #endif |
1294 | 464 } |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
465 case VFM_FFMPEG: { // FFmpeg's libavcodec |
1294 | 466 #ifndef USE_LIBAVCODEC |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
467 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_NoLAVCsupport); |
1631 | 468 return 0; |
1294 | 469 #else |
1567 | 470 mp_msg(MSGT_DECVIDEO,MSGL_V,"FFmpeg's libavcodec video codec\n"); |
1654 | 471 if(!avcodec_inited){ |
472 avcodec_init(); | |
473 avcodec_register_all(); | |
474 avcodec_inited=1; | |
475 } | |
1294 | 476 lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_video->codec->dll); |
477 if(!lavc_codec){ | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
478 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh_video->codec->dll); |
1631 | 479 return 0; |
1294 | 480 } |
481 memset(&lavc_context, 0, sizeof(lavc_context)); | |
1462 | 482 // sh_video->disp_h/=2; // !! |
1294 | 483 lavc_context.width=sh_video->disp_w; |
484 lavc_context.height=sh_video->disp_h; | |
1567 | 485 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",lavc_context.width,lavc_context.height); |
1294 | 486 /* open it */ |
487 if (avcodec_open(&lavc_context, lavc_codec) < 0) { | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
488 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec); |
1631 | 489 return 0; |
1294 | 490 } |
2228 | 491 #ifdef FF_POSTPROCESS |
492 lavc_pp=divx_quality; | |
493 #endif | |
1567 | 494 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: libavcodec init OK!\n"); |
1294 | 495 break; |
496 #endif | |
497 } | |
498 | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
499 case VFM_MPEG: { |
1294 | 500 // init libmpeg2: |
2567 | 501 mpeg2_init(); |
1294 | 502 #ifdef MPEG12_POSTPROC |
503 picture->pp_options=divx_quality; | |
504 #else | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
505 if(divx_quality) mp_msg(MSGT_DECVIDEO,MSGL_HINT,MSGTR_MpegPPhint); |
1294 | 506 #endif |
2567 | 507 // send seq header to the decoder: |
508 mpeg2_decode_data(NULL,videobuffer,videobuffer+videobuf_len,0); | |
1294 | 509 mpeg2_allocate_image_buffers (picture); |
510 break; | |
511 } | |
1488 | 512 case VFM_RAW: { |
3397
39abf443aac4
vfm_raw hack: set outfmt if format != 0x0 (for tv input)
alex
parents:
3303
diff
changeset
|
513 if (sh_video->format != 0x0) |
39abf443aac4
vfm_raw hack: set outfmt if format != 0x0 (for tv input)
alex
parents:
3303
diff
changeset
|
514 /* set out_fmt */ |
39abf443aac4
vfm_raw hack: set outfmt if format != 0x0 (for tv input)
alex
parents:
3303
diff
changeset
|
515 sh_video->codec->outfmt[sh_video->outfmtidx] = sh_video->format; |
1488 | 516 break; |
517 } | |
1948 | 518 case VFM_RLE: { |
519 int bpp=((out_fmt&255)+7)/8; // RGB only | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
520 sh_video->our_out_buffer = (char*)memalign(64,sh_video->disp_w*sh_video->disp_h*bpp); // FIXME!!! |
1949 | 521 if(bpp==2){ // 15 or 16 bpp ==> palette conversion! |
522 unsigned int* pal=(unsigned int*)(((char*)sh_video->bih)+40); | |
3303 | 523 int cols=(sh_video->bih->biSize-40)/4; |
524 //int cols=1<<(sh_video->bih->biBitCount); | |
1949 | 525 int i; |
526 if(cols>256) cols=256; | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
527 mp_msg(MSGT_DECVIDEO,MSGL_V,"RLE: converting palette for %d colors.\n",cols); |
1949 | 528 for(i=0;i<cols;i++){ |
529 unsigned int c=pal[i]; | |
530 unsigned int b=c&255; | |
531 unsigned int g=(c>>8)&255; | |
532 unsigned int r=(c>>16)&255; | |
533 if((out_fmt&255)==15) | |
534 pal[i]=((r>>3)<<10)|((g>>3)<<5)|((b>>3)); | |
535 else | |
536 pal[i]=((r>>3)<<11)|((g>>2)<<5)|((b>>3)); | |
537 } | |
538 } | |
1948 | 539 break; |
3687
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
540 case VFM_MSVIDC: |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
541 case VFM_FLI: |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
542 case VFM_QTRLE: |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
543 { |
2827
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
544 int bpp=((out_fmt&255)+7)/8; // RGB only |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
545 sh_video->our_out_buffer = |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
546 (char*)memalign(64, sh_video->disp_w*sh_video->disp_h*bpp); // FIXME!!! |
3687
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
547 if ((sh_video->codec->driver == VFM_QTRLE) && (sh_video->bih->biBitCount != 24)) |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
548 printf ( |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
549 " *** FYI: This Quicktime file is using %d-bit RLE Animation\n" \ |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
550 " encoding, which is not yet supported by MPlayer. But if you upload\n" \ |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
551 " this Quicktime file to the MPlayer FTP, the team could look at it.\n", |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
552 sh_video->bih->biBitCount); |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
553 |
3804
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
554 break; |
3172 | 555 } |
3804
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
556 case VFM_NUV: |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
557 sh_video->our_out_buffer = (char *)memalign(64, sh_video->disp_w*sh_video->disp_h*3/2); |
3172 | 558 break; |
1948 | 559 } |
1294 | 560 } |
1654 | 561 sh_video->inited=1; |
1294 | 562 return 1; |
563 } | |
564 | |
1422 | 565 #ifdef USE_LIBVO2 |
566 int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){ | |
567 #else | |
1294 | 568 int decode_video(vo_functions_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){ |
1422 | 569 #endif |
1294 | 570 unsigned int out_fmt=sh_video->codec->outfmt[sh_video->outfmtidx]; |
1360 | 571 int planar=(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420); |
1294 | 572 int blit_frame=0; |
573 | |
1360 | 574 uint8_t* planes_[3]; |
575 uint8_t** planes=planes_; | |
576 int stride_[3]; | |
577 int* stride=stride_; | |
578 | |
579 unsigned int t=GetTimer(); | |
580 unsigned int t2; | |
581 | |
2794 | 582 //printf("decode_frame(start: %p, size: %d, w: %d, h: %d)\n", |
583 // start, in_size, sh_video->disp_w, sh_video->disp_h); | |
584 | |
1294 | 585 //-------------------- Decode a frame: ----------------------- |
586 switch(sh_video->codec->driver){ | |
3643
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
587 case VFM_CINEPAK: |
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
588 decode_cinepak(sh_video->context, start, in_size, sh_video->our_out_buffer, |
3646 | 589 sh_video->disp_w, sh_video->disp_h, (out_fmt==IMGFMT_YUY2)?16:(out_fmt&255)); |
3643
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
590 blit_frame = 3; |
fb9fd7e2dd35
native opensourec Cinepak (CVID) codec by im Ferguson <timf@mail.csse.monash.edu.au>
arpi
parents:
3449
diff
changeset
|
591 break; |
2378 | 592 #ifdef USE_XANIM |
593 case VFM_XANIM: { | |
2384 | 594 xacodec_image_t* image=xacodec_decode_frame(start,in_size,drop_frame?1:0); |
595 if(image){ | |
596 blit_frame=2; | |
597 planes=image->planes; | |
598 stride=image->stride; | |
599 } | |
2378 | 600 break; |
601 } | |
602 #endif | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
603 case VFM_ODIVX: { |
1294 | 604 // OpenDivX |
605 DEC_FRAME dec_frame; | |
606 #ifdef NEW_DECORE | |
607 DEC_PICTURE dec_pic; | |
608 #endif | |
609 // let's decode | |
610 dec_frame.length = in_size; | |
611 dec_frame.bitstream = start; | |
1349 | 612 dec_frame.render_flag = drop_frame?0:1; |
613 | |
1294 | 614 #ifdef NEW_DECORE |
615 dec_frame.bmp=&dec_pic; | |
616 dec_pic.y=dec_pic.u=dec_pic.v=NULL; | |
1349 | 617 decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL); |
618 #else | |
1360 | 619 opendivx_src[0]=NULL; |
1349 | 620 decore(0x123, 0, &dec_frame, NULL); |
1294 | 621 #endif |
1360 | 622 |
623 if(!drop_frame) | |
1294 | 624 |
1349 | 625 // let's display |
1294 | 626 #ifdef NEW_DECORE |
627 if(dec_pic.y){ | |
1360 | 628 planes[0]=dec_pic.y; |
629 planes[1]=dec_pic.u; | |
630 planes[2]=dec_pic.v; | |
1294 | 631 stride[0]=dec_pic.stride_y; |
632 stride[1]=stride[2]=dec_pic.stride_uv; | |
1360 | 633 blit_frame=2; |
1294 | 634 } |
635 #else | |
636 if(opendivx_src[0]){ | |
1360 | 637 planes=opendivx_src; stride=opendivx_stride; |
638 blit_frame=2; | |
1294 | 639 } |
640 #endif | |
641 | |
642 break; | |
643 } | |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
644 #ifdef NEW_DECORE |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
645 case VFM_DIVX4: { |
1349 | 646 // DivX4Linux |
647 DEC_FRAME dec_frame; | |
648 // let's decode | |
649 dec_frame.length = in_size; | |
650 dec_frame.bitstream = start; | |
651 dec_frame.render_flag = drop_frame?0:1; | |
652 dec_frame.bmp=sh_video->our_out_buffer; | |
653 dec_frame.stride=sh_video->disp_w; | |
654 // printf("Decoding DivX4 frame\n"); | |
655 decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL); | |
1360 | 656 if(!drop_frame) blit_frame=3; |
1349 | 657 break; |
658 } | |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
659 #endif |
1294 | 660 #ifdef USE_DIRECTSHOW |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
661 case VFM_DSHOW: { // W32/DirectShow |
3062 | 662 if(drop_frame<2) |
663 DS_VideoDecoder_DecodeInternal(ds_vdec, start, in_size, 0, drop_frame ? 0 : sh_video->our_out_buffer); | |
1362
11673118f37f
Fix segfault in DShow video decoder. Using directshow, the
jkeil
parents:
1360
diff
changeset
|
664 if(!drop_frame && sh_video->our_out_buffer) blit_frame=3; |
1294 | 665 break; |
666 } | |
667 #endif | |
668 #ifdef USE_LIBAVCODEC | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
669 case VFM_FFMPEG: { // libavcodec |
1294 | 670 int got_picture=0; |
1567 | 671 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"Calling ffmpeg...\n"); |
1294 | 672 if(drop_frame<2 && in_size>0){ |
673 int ret = avcodec_decode_video(&lavc_context, &lavc_picture, | |
674 &got_picture, start, in_size); | |
1489 | 675 if(verbose>1){ |
1462 | 676 unsigned char *x="???"; |
677 switch(lavc_context.pix_fmt){ | |
678 case PIX_FMT_YUV420P: x="YUV420P";break; | |
679 case PIX_FMT_YUV422: x="YUV422";break; | |
680 case PIX_FMT_RGB24: x="RGB24";break; | |
681 case PIX_FMT_BGR24: x="BGR24";break; | |
1465 | 682 #ifdef PIX_FMT_YUV422P |
1462 | 683 case PIX_FMT_YUV422P: x="YUV422P";break; |
684 case PIX_FMT_YUV444P: x="YUV444P";break; | |
1465 | 685 #endif |
1462 | 686 } |
1567 | 687 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"DONE -> got_picture=%d format=0x%X (%s) \n",got_picture, |
1462 | 688 lavc_context.pix_fmt,x); |
689 } | |
1567 | 690 if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n"); |
1360 | 691 if(!drop_frame && got_picture){ |
1454
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
692 // if(!drop_frame){ |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
693 if(planar){ |
2228 | 694 #ifdef FF_POSTPROCESS |
3745 | 695 #ifdef MBC |
2228 | 696 if(lavc_pp){ |
697 // postprocess | |
2291 | 698 int w=(sh_video->disp_w+15)&(~15); |
699 int h=(sh_video->disp_h+15)&(~15); | |
700 int xoff=0; //(w-sh_video->disp_w)/2; | |
701 int yoff=0; //(h-sh_video->disp_h)/2; | |
702 if(!sh_video->our_out_buffer){ | |
703 sh_video->our_out_buffer = (char*)memalign(64,w*h*3/2); | |
704 memset(sh_video->our_out_buffer,0,w*h*3/2); | |
705 } | |
706 stride[0]=w; | |
707 stride[1]=stride[2]=w/2; | |
708 planes[0]=sh_video->our_out_buffer+stride[0]*yoff+xoff; | |
709 planes[2]=sh_video->our_out_buffer+w*h+stride[2]*(yoff>>1)+(xoff>>1); | |
710 planes[1]=planes[2]+w*h/4; | |
2228 | 711 postprocess(lavc_picture.data,lavc_picture.linesize[0], |
2291 | 712 planes,stride[0], |
2228 | 713 sh_video->disp_w,sh_video->disp_h, |
714 &quant_store[0][0],MBC+1,lavc_pp); | |
715 } else | |
716 #endif | |
3745 | 717 #endif |
2228 | 718 { |
719 planes=lavc_picture.data; | |
720 stride=lavc_picture.linesize; | |
721 //stride[1]=stride[2]=0; | |
722 //stride[0]/=2; | |
723 } | |
724 blit_frame=2; | |
1454
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
725 } else { |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
726 int y; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
727 // temporary hack - FIXME |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
728 if(!sh_video->our_out_buffer) |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
729 sh_video->our_out_buffer = (char*)memalign(64,sh_video->disp_w*sh_video->disp_h*2); |
1454
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
730 for(y=0;y<sh_video->disp_h;y++){ |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
731 unsigned char *s0=lavc_picture.data[0]+lavc_picture.linesize[0]*y; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
732 unsigned char *s1=lavc_picture.data[1]+lavc_picture.linesize[1]*y; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
733 unsigned char *s2=lavc_picture.data[2]+lavc_picture.linesize[2]*y; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
734 unsigned char *d=sh_video->our_out_buffer+y*2*sh_video->disp_w; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
735 int x; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
736 for(x=0;x<sh_video->disp_w/2;x++){ |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
737 d[4*x+0]=s0[2*x+0]; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
738 d[4*x+1]=s1[x]; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
739 d[4*x+2]=s0[2*x+1]; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
740 d[4*x+3]=s2[x]; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
741 } |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
742 } |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
743 blit_frame=3; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
744 } |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
745 |
1360 | 746 } |
1294 | 747 } |
748 break; | |
749 } | |
750 #endif | |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1496
diff
changeset
|
751 #ifdef USE_WIN32DLL |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
752 case VFM_VFWEX: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
753 case VFM_VFW: |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
754 { |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
755 int ret; |
1360 | 756 if(!in_size) break; |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
757 if((ret=vfw_decode_video(sh_video,start,in_size,drop_frame,(sh_video->codec->driver==VFM_VFWEX) ))){ |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
758 mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Error decompressing frame, err=%d\n",ret); |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
759 break; |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
760 } |
1360 | 761 if(!drop_frame) blit_frame=3; |
1294 | 762 break; |
763 } | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
764 #endif |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
765 case VFM_MPEG: |
1873 | 766 if(out_fmt==IMGFMT_MPEGPES){ |
767 // hardware decoding: | |
768 static vo_mpegpes_t packet; | |
769 mpeg2_decode_data(video_out, start, start+in_size,3); // parse headers | |
770 packet.data=start; | |
771 packet.size=in_size-4; | |
772 packet.timestamp=sh_video->timer*90000.0; | |
773 packet.id=0x1E0; //+sh_video->ds->id; | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
774 planes[0]=(uint8_t*)(&packet); |
1873 | 775 blit_frame=2; |
776 } else { | |
777 // software decoding: | |
2019
7de4eceac32f
mpeg2-interlaced patch by Ivan Kalvatchev <iive@yahoo.com>
arpi
parents:
2006
diff
changeset
|
778 if( |
7de4eceac32f
mpeg2-interlaced patch by Ivan Kalvatchev <iive@yahoo.com>
arpi
parents:
2006
diff
changeset
|
779 mpeg2_decode_data(video_out, start, start+in_size,drop_frame) > 0 // decode |
7de4eceac32f
mpeg2-interlaced patch by Ivan Kalvatchev <iive@yahoo.com>
arpi
parents:
2006
diff
changeset
|
780 && (!drop_frame) |
7de4eceac32f
mpeg2-interlaced patch by Ivan Kalvatchev <iive@yahoo.com>
arpi
parents:
2006
diff
changeset
|
781 ) blit_frame=1; |
1873 | 782 } |
1294 | 783 break; |
1488 | 784 case VFM_RAW: |
2794 | 785 // planes[0]=start; |
786 // blit_frame=2; | |
787 sh_video->our_out_buffer = start; | |
788 blit_frame=3; | |
1488 | 789 break; |
1948 | 790 case VFM_RLE: |
791 //void AVI_Decode_RLE8(char *image,char *delta,int tdsize, | |
792 // unsigned int *map,int imagex,int imagey,unsigned char x11_bytes_pixel); | |
793 AVI_Decode_RLE8(sh_video->our_out_buffer,start,in_size, | |
794 (int*)(((char*)sh_video->bih)+40), | |
795 sh_video->disp_w,sh_video->disp_h,((out_fmt&255)+7)/8); | |
796 blit_frame=3; | |
797 break; | |
2827
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
798 case VFM_MSVIDC: |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
799 if (sh_video->bih->biBitCount == 16) |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
800 AVI_Decode_Video1_16( |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
801 start, in_size, sh_video->our_out_buffer, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
802 sh_video->disp_w, sh_video->disp_h, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
803 ((out_fmt&255)+7)/8); |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
804 else |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
805 AVI_Decode_Video1_8( |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
806 start, in_size, sh_video->our_out_buffer, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
807 sh_video->disp_w, sh_video->disp_h, |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
808 (char *)sh_video->bih+40, ((out_fmt&255)+7)/8); |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
809 blit_frame = 3; |
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
810 break; |
3172 | 811 case VFM_FLI: |
3687
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
812 Decode_Fli( |
3172 | 813 start, in_size, sh_video->our_out_buffer, |
814 sh_video->disp_w, sh_video->disp_h, | |
815 ((out_fmt&255)+7)/8); | |
816 blit_frame = 3; | |
817 break; | |
3804
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
818 case VFM_NUV: |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
819 decode_nuv( |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
820 start, in_size, sh_video->our_out_buffer, |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
821 sh_video->disp_w, sh_video->disp_h); |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
822 blit_frame = 3; |
53ed66a4f0bf
NuppelVideo decoder added, based on Panagiotis Issaris' patch
alex
parents:
3745
diff
changeset
|
823 break; |
3687
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
824 case VFM_QTRLE: |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
825 qt_decode_rle( |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
826 start, in_size, sh_video->our_out_buffer, |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
827 sh_video->disp_w, sh_video->disp_h, |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
828 sh_video->bih->biBitCount, |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
829 ((out_fmt&255)+7)/8); |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
830 blit_frame = 3; |
7fb817c9060b
This commit adds initial support for Quicktime Animation (RLE) video. It
melanson
parents:
3646
diff
changeset
|
831 break; |
1294 | 832 } // switch |
833 //------------------------ frame decoded. -------------------- | |
834 | |
3160 | 835 #ifdef ARCH_X86 |
1367 | 836 // some codecs is broken, and doesn't restore MMX state :( |
837 // it happens usually with broken/damaged files. | |
3144 | 838 if(gCpuCaps.has3DNow){ |
839 __asm __volatile ("femms\n\t":::"memory"); | |
840 } | |
841 else if(gCpuCaps.hasMMX){ | |
842 __asm __volatile ("emms\n\t":::"memory"); | |
843 } | |
3160 | 844 #endif |
1367 | 845 |
1360 | 846 t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f; |
847 | |
848 switch(blit_frame){ | |
849 case 3: | |
850 if(planar){ | |
851 stride[0]=sh_video->disp_w; | |
852 stride[1]=stride[2]=sh_video->disp_w/2; | |
853 planes[0]=sh_video->our_out_buffer; | |
854 planes[2]=planes[0]+sh_video->disp_w*sh_video->disp_h; | |
855 planes[1]=planes[2]+sh_video->disp_w*sh_video->disp_h/4; | |
2716 | 856 } else { |
1360 | 857 planes[0]=sh_video->our_out_buffer; |
2716 | 858 if(sh_video->bih && sh_video->bih->biSize==1064) |
859 planes[1]=&sh_video->bih[1]; // pointer to palette | |
860 else | |
861 planes[1]=NULL; | |
862 } | |
3073 | 863 //#define VFM_RAW_POSTPROC |
864 #ifdef VFM_RAW_POSTPROC | |
865 if (sh_video->codec->driver == VFM_RAW) | |
866 { | |
867 mp_dbg(MSGT_DECVIDEO, MSGL_V, "Postprocessing raw %s!\n", | |
868 vo_format_name(out_fmt)); | |
869 switch(out_fmt) | |
870 { | |
871 case IMGFMT_YV12: | |
872 postprocess(planes, stride[0], planes, stride[0], | |
873 sh_video->disp_w, sh_video->disp_h, planes[0], | |
874 0, /*0x20000*/divx_quality); | |
875 break; | |
876 // case IMGFMT_UYVY: | |
877 // uyvytoyv12(start, planes[0], planes[1], planes[2], | |
878 // sh_video->disp_w, sh_video->disp_h, stride[0], stride[1], | |
879 // sh_video->disp_w*2); | |
880 // postprocess(planes, stride[0], planes, stride[0], | |
881 // sh_video->disp_w, sh_video->disp_h, planes[0], | |
882 // 0, /*0x20000*/divx_quality); | |
883 // break; | |
884 default: | |
885 mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "Unsuitable outformat (%s) for raw pp!\n", | |
886 vo_format_name(out_fmt)); | |
887 } | |
888 } | |
889 #endif | |
1360 | 890 case 2: |
1422 | 891 #ifdef USE_LIBVO2 |
892 if(planar) | |
893 vo2_draw_slice(video_out,planes,stride,sh_video->disp_w,sh_video->disp_h,0,0); | |
894 else | |
895 vo2_draw_frame(video_out,planes[0],sh_video->disp_w,sh_video->disp_w,sh_video->disp_h); | |
896 #else | |
1360 | 897 if(planar) |
898 video_out->draw_slice(planes,stride,sh_video->disp_w,sh_video->disp_h,0,0); | |
899 else | |
900 video_out->draw_frame(planes); | |
1422 | 901 #endif |
1360 | 902 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f; |
903 blit_frame=1; | |
904 break; | |
905 } | |
906 | |
1294 | 907 return blit_frame; |
908 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
909 |
2827
b4d46817f050
ms video1 (cram) codecs by Mike Melanson <melanson@pcisys.net>
arpi
parents:
2794
diff
changeset
|
910 |