Mercurial > mplayer.hg
annotate dec_video.c @ 2779:0ecadf56dc05
Eugene's fixes to work with QuickTime.qts
author | arpi |
---|---|
date | Fri, 09 Nov 2001 03:27:29 +0000 |
parents | 8e3875816f6d |
children | 411be2ac50ae |
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 | |
1294 | 51 extern picture_t *picture; // exported from libmpeg2/decode.c |
52 | |
2563 | 53 int divx_quality=0; |
1294 | 54 |
55 #ifdef USE_DIRECTSHOW | |
56 #include "loader/DirectShow/DS_VideoDec.h" | |
57 #endif | |
58 | |
59 #ifdef USE_LIBAVCODEC | |
2496 | 60 #ifdef USE_LIBAVCODEC_SO |
61 #include <libffmpeg/avcodec.h> | |
62 #else | |
1294 | 63 #include "libavcodec/avcodec.h" |
2496 | 64 #endif |
1927 | 65 static AVCodec *lavc_codec=NULL; |
66 static AVCodecContext lavc_context; | |
67 static AVPicture lavc_picture; | |
68 int avcodec_inited=0; | |
1294 | 69 #endif |
2228 | 70 #ifdef FF_POSTPROCESS |
71 unsigned int lavc_pp=0; | |
72 #endif | |
1294 | 73 |
1349 | 74 #ifndef NEW_DECORE |
1294 | 75 #include "opendivx/decore.h" |
1349 | 76 #else |
77 #include <decore.h> | |
78 #endif | |
1294 | 79 |
2378 | 80 #ifdef USE_XANIM |
81 #include "xacodec.h" | |
82 #endif | |
83 | |
2541
88195a28576a
changed hardcoded 'emms' to EMMS according to pp/swscale.c
alex
parents:
2496
diff
changeset
|
84 #include "mmx_defs.h" |
88195a28576a
changed hardcoded 'emms' to EMMS according to pp/swscale.c
alex
parents:
2496
diff
changeset
|
85 |
1948 | 86 void AVI_Decode_RLE8(char *image,char *delta,int tdsize, |
87 unsigned int *map,int imagex,int imagey,unsigned char x11_bytes_pixel); | |
88 | |
1294 | 89 //**************************************************************************// |
90 // The OpenDivX stuff: | |
91 //**************************************************************************// | |
92 | |
93 #ifndef NEW_DECORE | |
94 | |
95 static unsigned char *opendivx_src[3]; | |
96 static int opendivx_stride[3]; | |
97 | |
98 // callback, the opendivx decoder calls this for each frame: | |
99 void convert_linux(unsigned char *puc_y, int stride_y, | |
100 unsigned char *puc_u, unsigned char *puc_v, int stride_uv, | |
101 unsigned char *bmp, int width_y, int height_y){ | |
102 | |
103 // printf("convert_yuv called %dx%d stride: %d,%d\n",width_y,height_y,stride_y,stride_uv); | |
104 | |
105 opendivx_src[0]=puc_y; | |
106 opendivx_src[1]=puc_u; | |
107 opendivx_src[2]=puc_v; | |
108 | |
109 opendivx_stride[0]=stride_y; | |
110 opendivx_stride[1]=stride_uv; | |
111 opendivx_stride[2]=stride_uv; | |
112 } | |
113 #endif | |
114 | |
1429 | 115 int get_video_quality_max(sh_video_t *sh_video){ |
116 switch(sh_video->codec->driver){ | |
2087 | 117 #ifdef USE_WIN32DLL |
118 case VFM_VFW: | |
119 case VFM_VFWEX: | |
2184 | 120 return 9; // for Divx.dll (divx4) |
2087 | 121 #endif |
1429 | 122 #ifdef USE_DIRECTSHOW |
123 case VFM_DSHOW: | |
124 return 4; | |
125 #endif | |
126 #ifdef MPEG12_POSTPROC | |
127 case VFM_MPEG: | |
2184 | 128 return GET_PP_QUALITY_MAX; |
1429 | 129 #endif |
2228 | 130 #ifdef FF_POSTPROCESS |
131 case VFM_FFMPEG: | |
132 return GET_PP_QUALITY_MAX; | |
133 #endif | |
1429 | 134 case VFM_DIVX4: |
135 case VFM_ODIVX: | |
2184 | 136 #ifdef NEW_DECORE |
137 return 9; // for divx4linux | |
138 #else | |
139 return GET_PP_QUALITY_MAX; // for opendivx | |
140 #endif | |
1429 | 141 } |
142 return 0; | |
143 } | |
144 | |
145 void set_video_quality(sh_video_t *sh_video,int quality){ | |
146 switch(sh_video->codec->driver){ | |
2087 | 147 #ifdef USE_WIN32DLL |
148 case VFM_VFW: | |
149 case VFM_VFWEX: | |
150 vfw_set_postproc(sh_video,10*quality); | |
151 break; | |
152 #endif | |
1429 | 153 #ifdef USE_DIRECTSHOW |
154 case VFM_DSHOW: { | |
155 if(quality<0 || quality>4) quality=4; | |
156 DS_SetValue_DivX("Quality",quality); | |
157 } | |
158 break; | |
159 #endif | |
160 #ifdef MPEG12_POSTPROC | |
161 case VFM_MPEG: { | |
2184 | 162 if(quality<0 || quality>GET_PP_QUALITY_MAX) quality=GET_PP_QUALITY_MAX; |
163 picture->pp_options=getPpModeForQuality(quality); | |
1429 | 164 } |
165 break; | |
166 #endif | |
2228 | 167 #ifdef FF_POSTPROCESS |
168 case VFM_FFMPEG: | |
169 if(quality<0 || quality>GET_PP_QUALITY_MAX) quality=GET_PP_QUALITY_MAX; | |
170 lavc_pp=getPpModeForQuality(quality); | |
171 break; | |
172 #endif | |
1429 | 173 case VFM_DIVX4: |
174 case VFM_ODIVX: { | |
175 DEC_SET dec_set; | |
2184 | 176 #ifdef NEW_DECORE |
177 if(quality<0 || quality>9) quality=9; | |
178 dec_set.postproc_level=quality*10; | |
179 #else | |
180 if(quality<0 || quality>GET_PP_QUALITY_MAX) quality=GET_PP_QUALITY_MAX; | |
181 dec_set.postproc_level=getPpModeForQuality(quality); | |
182 #endif | |
1429 | 183 decore(0x123,DEC_OPT_SETPP,&dec_set,NULL); |
184 } | |
185 break; | |
186 } | |
187 } | |
188 | |
189 int set_video_colors(sh_video_t *sh_video,char *item,int value){ | |
1431 | 190 #ifdef USE_DIRECTSHOW |
2295 | 191 if(sh_video->codec->driver==VFM_DSHOW){ |
1429 | 192 DS_SetValue_DivX(item,value); |
193 return 1; | |
194 } | |
1431 | 195 #endif |
2295 | 196 #ifdef NEW_DECORE |
197 #ifdef DECORE_VERSION | |
198 #if DECORE_VERSION >= 20011010 | |
199 if(sh_video->codec->driver==VFM_DIVX4){ | |
200 int option; | |
201 if(!strcmp(item,"Brightness")) option=DEC_GAMMA_BRIGHTNESS; | |
202 else if(!strcmp(item, "Contrast")) option=DEC_GAMMA_CONTRAST; | |
203 else if(!strcmp(item,"Saturation")) option=DEC_GAMMA_SATURATION; | |
204 else return 0; | |
205 value = (value * 256) / 100 - 128; | |
206 decore(0x123, DEC_OPT_GAMMA, (void *)option, (void *) value); | |
207 return 1; | |
208 } | |
209 #endif | |
210 #endif | |
211 #endif | |
1429 | 212 return 0; |
213 } | |
1294 | 214 |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
215 void uninit_video(sh_video_t *sh_video){ |
1654 | 216 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
|
217 mp_msg(MSGT_DECVIDEO,MSGL_V,"uninit video: %d \n",sh_video->codec->driver); |
1654 | 218 switch(sh_video->codec->driver){ |
1666 | 219 #ifdef USE_LIBAVCODEC |
1654 | 220 case VFM_FFMPEG: |
221 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
|
222 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantCloseCodec); |
1654 | 223 break; |
1666 | 224 #endif |
1669 | 225 #ifdef USE_DIRECTSHOW |
1664 | 226 case VFM_DSHOW: // Win32/DirectShow |
227 DS_VideoDecoder_Close(); | |
228 break; | |
1666 | 229 #endif |
1654 | 230 case VFM_MPEG: |
231 mpeg2_free_image_buffers (picture); | |
232 break; | |
2563 | 233 #ifdef USE_XANIM |
234 case VFM_XANIM: | |
235 xacodec_exit(); | |
236 break; | |
237 #endif | |
1654 | 238 } |
239 if(sh_video->our_out_buffer){ | |
240 free(sh_video->our_out_buffer); | |
241 sh_video->our_out_buffer=NULL; | |
242 } | |
243 sh_video->inited=0; | |
244 } | |
245 | |
1294 | 246 int init_video(sh_video_t *sh_video){ |
247 unsigned int out_fmt=sh_video->codec->outfmt[sh_video->outfmtidx]; | |
248 | |
1454
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
249 sh_video->our_out_buffer=NULL; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
250 |
1294 | 251 switch(sh_video->codec->driver){ |
2659 | 252 case VFM_XANIM: { |
2378 | 253 #ifdef USE_XANIM |
254 int ret=xacodec_init_video(sh_video,out_fmt); | |
255 if(!ret) return 0; | |
2659 | 256 #else |
2660 | 257 // mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_NoXAnimSupport); |
258 mp_msg(MSGT_DECVIDEO, MSGL_ERR, "MPlayer was compiled WIHTOUT XAnim support!\n"); | |
2659 | 259 return 0; |
260 #endif | |
2378 | 261 break; |
262 } | |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1496
diff
changeset
|
263 #ifdef USE_WIN32DLL |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
264 case VFM_VFW: { |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
265 if(!init_vfw_video_codec(sh_video,0)) { |
1294 | 266 return 0; |
267 } | |
1567 | 268 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32 video codec init OK!\n"); |
1294 | 269 break; |
270 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
271 case VFM_VFWEX: { |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
272 if(!init_vfw_video_codec(sh_video,1)) { |
1297 | 273 return 0; |
274 } | |
1567 | 275 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32Ex video codec init OK!\n"); |
1297 | 276 break; |
277 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
278 case VFM_DSHOW: { // Win32/DirectShow |
1294 | 279 #ifndef USE_DIRECTSHOW |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
280 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_NoDShowSupport); |
1294 | 281 return 0; |
282 #else | |
1547
4b0046db8e64
alloc frame buffer for directshow codec - requires for avifile sync
arpi
parents:
1517
diff
changeset
|
283 int bpp; |
1294 | 284 if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, &sh_video->our_out_buffer)){ |
285 // 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
|
286 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh_video->codec->dll); |
1567 | 287 mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n"); |
288 mp_msg(MSGT_DECVIDEO,MSGL_HINT,"package from: ftp://mplayerhq.hu/MPlayer/releases/w32codec.zip !\n"); | |
289 // mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Or you should disable DShow support: make distclean;make -f Makefile.No-DS\n"); | |
1294 | 290 return 0; |
291 } | |
292 | |
293 switch(out_fmt){ | |
294 case IMGFMT_YUY2: | |
295 case IMGFMT_UYVY: | |
1547
4b0046db8e64
alloc frame buffer for directshow codec - requires for avifile sync
arpi
parents:
1517
diff
changeset
|
296 bpp=16; |
1294 | 297 DS_VideoDecoder_SetDestFmt(16,out_fmt);break; // packed YUV |
298 case IMGFMT_YV12: | |
299 case IMGFMT_I420: | |
300 case IMGFMT_IYUV: | |
1547
4b0046db8e64
alloc frame buffer for directshow codec - requires for avifile sync
arpi
parents:
1517
diff
changeset
|
301 bpp=12; |
1294 | 302 DS_VideoDecoder_SetDestFmt(12,out_fmt);break; // planar YUV |
303 default: | |
1547
4b0046db8e64
alloc frame buffer for directshow codec - requires for avifile sync
arpi
parents:
1517
diff
changeset
|
304 bpp=((out_fmt&255)+7)&(~7); |
1294 | 305 DS_VideoDecoder_SetDestFmt(out_fmt&255,0); // RGB/BGR |
306 } | |
307 | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
308 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
|
309 |
1294 | 310 DS_VideoDecoder_Start(); |
311 | |
312 DS_SetAttr_DivX("Quality",divx_quality); | |
313 // printf("DivX setting result = %d\n", DS_SetAttr_DivX("Quality",divx_quality) ); | |
314 // printf("DivX setting result = %d\n", DS_SetValue_DivX("Brightness",60) ); | |
315 | |
1567 | 316 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DShow video codec init OK!\n"); |
1294 | 317 break; |
318 #endif | |
319 } | |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1496
diff
changeset
|
320 #else /* !USE_WIN32DLL */ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
321 case VFM_VFW: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
322 case VFM_DSHOW: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
323 case VFM_VFWEX: |
2006 | 324 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
|
325 return 0; |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1496
diff
changeset
|
326 #endif /* !USE_WIN32DLL */ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
327 case VFM_ODIVX: { // OpenDivX |
1567 | 328 mp_msg(MSGT_DECVIDEO,MSGL_V,"OpenDivX video codec\n"); |
1294 | 329 { DEC_PARAM dec_param; |
330 DEC_SET dec_set; | |
1349 | 331 memset(&dec_param,0,sizeof(dec_param)); |
1294 | 332 #ifdef NEW_DECORE |
333 dec_param.output_format=DEC_USER; | |
334 #else | |
335 dec_param.color_depth = 32; | |
336 #endif | |
337 dec_param.x_dim = sh_video->bih->biWidth; | |
338 dec_param.y_dim = sh_video->bih->biHeight; | |
339 decore(0x123, DEC_OPT_INIT, &dec_param, NULL); | |
340 dec_set.postproc_level = divx_quality; | |
341 decore(0x123, DEC_OPT_SETPP, &dec_set, NULL); | |
1349 | 342 } |
1567 | 343 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: OpenDivX video codec init OK!\n"); |
1349 | 344 break; |
345 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
346 case VFM_DIVX4: { // DivX4Linux |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
347 #ifndef NEW_DECORE |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
348 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_NoDivx4Support); |
1631 | 349 return 0; |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
350 #else |
1567 | 351 mp_msg(MSGT_DECVIDEO,MSGL_V,"DivX4Linux video codec\n"); |
1349 | 352 { DEC_PARAM dec_param; |
353 DEC_SET dec_set; | |
354 int bits=16; | |
355 memset(&dec_param,0,sizeof(dec_param)); | |
356 switch(out_fmt){ | |
357 case IMGFMT_YV12: dec_param.output_format=DEC_YV12;bits=12;break; | |
358 case IMGFMT_YUY2: dec_param.output_format=DEC_YUY2;break; | |
359 case IMGFMT_UYVY: dec_param.output_format=DEC_UYVY;break; | |
360 case IMGFMT_I420: dec_param.output_format=DEC_420;bits=12;break; | |
361 case IMGFMT_BGR15: dec_param.output_format=DEC_RGB555_INV;break; | |
362 case IMGFMT_BGR16: dec_param.output_format=DEC_RGB565_INV;break; | |
363 case IMGFMT_BGR24: dec_param.output_format=DEC_RGB24_INV;bits=24;break; | |
364 case IMGFMT_BGR32: dec_param.output_format=DEC_RGB32_INV;bits=32;break; | |
365 default: | |
1567 | 366 mp_msg(MSGT_DECVIDEO,MSGL_ERR,"Unsupported out_fmt: 0x%X\n",out_fmt); |
1349 | 367 return 0; |
368 } | |
369 dec_param.x_dim = sh_video->bih->biWidth; | |
370 dec_param.y_dim = sh_video->bih->biHeight; | |
371 decore(0x123, DEC_OPT_INIT, &dec_param, NULL); | |
372 dec_set.postproc_level = divx_quality; | |
373 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
|
374 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
|
375 // sh_video->our_out_buffer = shmem_alloc(dec_param.x_dim*dec_param.y_dim*5); |
1294 | 376 } |
1567 | 377 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: OpenDivX video codec init OK!\n"); |
1294 | 378 break; |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
379 #endif |
1294 | 380 } |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
381 case VFM_FFMPEG: { // FFmpeg's libavcodec |
1294 | 382 #ifndef USE_LIBAVCODEC |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
383 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_NoLAVCsupport); |
1631 | 384 return 0; |
1294 | 385 #else |
1567 | 386 mp_msg(MSGT_DECVIDEO,MSGL_V,"FFmpeg's libavcodec video codec\n"); |
1654 | 387 if(!avcodec_inited){ |
388 avcodec_init(); | |
389 avcodec_register_all(); | |
390 avcodec_inited=1; | |
391 } | |
1294 | 392 lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_video->codec->dll); |
393 if(!lavc_codec){ | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
394 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh_video->codec->dll); |
1631 | 395 return 0; |
1294 | 396 } |
397 memset(&lavc_context, 0, sizeof(lavc_context)); | |
1462 | 398 // sh_video->disp_h/=2; // !! |
1294 | 399 lavc_context.width=sh_video->disp_w; |
400 lavc_context.height=sh_video->disp_h; | |
1567 | 401 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",lavc_context.width,lavc_context.height); |
1294 | 402 /* open it */ |
403 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
|
404 mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec); |
1631 | 405 return 0; |
1294 | 406 } |
2228 | 407 #ifdef FF_POSTPROCESS |
408 lavc_pp=divx_quality; | |
409 #endif | |
1567 | 410 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: libavcodec init OK!\n"); |
1294 | 411 break; |
412 #endif | |
413 } | |
414 | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
415 case VFM_MPEG: { |
1294 | 416 // init libmpeg2: |
2567 | 417 mpeg2_init(); |
1294 | 418 #ifdef MPEG12_POSTPROC |
419 picture->pp_options=divx_quality; | |
420 #else | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1949
diff
changeset
|
421 if(divx_quality) mp_msg(MSGT_DECVIDEO,MSGL_HINT,MSGTR_MpegPPhint); |
1294 | 422 #endif |
2567 | 423 // send seq header to the decoder: |
424 mpeg2_decode_data(NULL,videobuffer,videobuffer+videobuf_len,0); | |
1294 | 425 mpeg2_allocate_image_buffers (picture); |
426 break; | |
427 } | |
1488 | 428 case VFM_RAW: { |
429 break; | |
430 } | |
1948 | 431 case VFM_RLE: { |
432 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
|
433 sh_video->our_out_buffer = (char*)memalign(64,sh_video->disp_w*sh_video->disp_h*bpp); // FIXME!!! |
1949 | 434 if(bpp==2){ // 15 or 16 bpp ==> palette conversion! |
435 unsigned int* pal=(unsigned int*)(((char*)sh_video->bih)+40); | |
436 //int cols=(sh_video->bih->biSize-40)/4; | |
437 int cols=1<<(sh_video->bih->biBitCount); | |
438 int i; | |
439 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
|
440 mp_msg(MSGT_DECVIDEO,MSGL_V,"RLE: converting palette for %d colors.\n",cols); |
1949 | 441 for(i=0;i<cols;i++){ |
442 unsigned int c=pal[i]; | |
443 unsigned int b=c&255; | |
444 unsigned int g=(c>>8)&255; | |
445 unsigned int r=(c>>16)&255; | |
446 if((out_fmt&255)==15) | |
447 pal[i]=((r>>3)<<10)|((g>>3)<<5)|((b>>3)); | |
448 else | |
449 pal[i]=((r>>3)<<11)|((g>>2)<<5)|((b>>3)); | |
450 } | |
451 } | |
1948 | 452 break; |
453 } | |
1294 | 454 } |
1654 | 455 sh_video->inited=1; |
1294 | 456 return 1; |
457 } | |
458 | |
1422 | 459 #ifdef USE_LIBVO2 |
460 int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){ | |
461 #else | |
1294 | 462 int decode_video(vo_functions_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){ |
1422 | 463 #endif |
1294 | 464 unsigned int out_fmt=sh_video->codec->outfmt[sh_video->outfmtidx]; |
1360 | 465 int planar=(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420); |
1294 | 466 int blit_frame=0; |
467 | |
1360 | 468 uint8_t* planes_[3]; |
469 uint8_t** planes=planes_; | |
470 int stride_[3]; | |
471 int* stride=stride_; | |
472 | |
473 unsigned int t=GetTimer(); | |
474 unsigned int t2; | |
475 | |
1294 | 476 //-------------------- Decode a frame: ----------------------- |
477 switch(sh_video->codec->driver){ | |
2378 | 478 #ifdef USE_XANIM |
479 case VFM_XANIM: { | |
2384 | 480 xacodec_image_t* image=xacodec_decode_frame(start,in_size,drop_frame?1:0); |
481 if(image){ | |
482 blit_frame=2; | |
483 planes=image->planes; | |
484 stride=image->stride; | |
485 } | |
2378 | 486 break; |
487 } | |
488 #endif | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
489 case VFM_ODIVX: { |
1294 | 490 // OpenDivX |
491 DEC_FRAME dec_frame; | |
492 #ifdef NEW_DECORE | |
493 DEC_PICTURE dec_pic; | |
494 #endif | |
495 // let's decode | |
496 dec_frame.length = in_size; | |
497 dec_frame.bitstream = start; | |
1349 | 498 dec_frame.render_flag = drop_frame?0:1; |
499 | |
1294 | 500 #ifdef NEW_DECORE |
501 dec_frame.bmp=&dec_pic; | |
502 dec_pic.y=dec_pic.u=dec_pic.v=NULL; | |
1349 | 503 decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL); |
504 #else | |
1360 | 505 opendivx_src[0]=NULL; |
1349 | 506 decore(0x123, 0, &dec_frame, NULL); |
1294 | 507 #endif |
1360 | 508 |
509 if(!drop_frame) | |
1294 | 510 |
1349 | 511 // let's display |
1294 | 512 #ifdef NEW_DECORE |
513 if(dec_pic.y){ | |
1360 | 514 planes[0]=dec_pic.y; |
515 planes[1]=dec_pic.u; | |
516 planes[2]=dec_pic.v; | |
1294 | 517 stride[0]=dec_pic.stride_y; |
518 stride[1]=stride[2]=dec_pic.stride_uv; | |
1360 | 519 blit_frame=2; |
1294 | 520 } |
521 #else | |
522 if(opendivx_src[0]){ | |
1360 | 523 planes=opendivx_src; stride=opendivx_stride; |
524 blit_frame=2; | |
1294 | 525 } |
526 #endif | |
527 | |
528 break; | |
529 } | |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
530 #ifdef NEW_DECORE |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
531 case VFM_DIVX4: { |
1349 | 532 // DivX4Linux |
533 DEC_FRAME dec_frame; | |
534 // let's decode | |
535 dec_frame.length = in_size; | |
536 dec_frame.bitstream = start; | |
537 dec_frame.render_flag = drop_frame?0:1; | |
538 dec_frame.bmp=sh_video->our_out_buffer; | |
539 dec_frame.stride=sh_video->disp_w; | |
540 // printf("Decoding DivX4 frame\n"); | |
541 decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL); | |
1360 | 542 if(!drop_frame) blit_frame=3; |
1349 | 543 break; |
544 } | |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
545 #endif |
1294 | 546 #ifdef USE_DIRECTSHOW |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
547 case VFM_DSHOW: { // W32/DirectShow |
1294 | 548 if(drop_frame<2) DS_VideoDecoder_DecodeFrame(start, in_size, 0, !drop_frame); |
1362
11673118f37f
Fix segfault in DShow video decoder. Using directshow, the
jkeil
parents:
1360
diff
changeset
|
549 if(!drop_frame && sh_video->our_out_buffer) blit_frame=3; |
1294 | 550 break; |
551 } | |
552 #endif | |
553 #ifdef USE_LIBAVCODEC | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
554 case VFM_FFMPEG: { // libavcodec |
1294 | 555 int got_picture=0; |
1567 | 556 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"Calling ffmpeg...\n"); |
1294 | 557 if(drop_frame<2 && in_size>0){ |
558 int ret = avcodec_decode_video(&lavc_context, &lavc_picture, | |
559 &got_picture, start, in_size); | |
1489 | 560 if(verbose>1){ |
1462 | 561 unsigned char *x="???"; |
562 switch(lavc_context.pix_fmt){ | |
563 case PIX_FMT_YUV420P: x="YUV420P";break; | |
564 case PIX_FMT_YUV422: x="YUV422";break; | |
565 case PIX_FMT_RGB24: x="RGB24";break; | |
566 case PIX_FMT_BGR24: x="BGR24";break; | |
1465 | 567 #ifdef PIX_FMT_YUV422P |
1462 | 568 case PIX_FMT_YUV422P: x="YUV422P";break; |
569 case PIX_FMT_YUV444P: x="YUV444P";break; | |
1465 | 570 #endif |
1462 | 571 } |
1567 | 572 mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"DONE -> got_picture=%d format=0x%X (%s) \n",got_picture, |
1462 | 573 lavc_context.pix_fmt,x); |
574 } | |
1567 | 575 if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n"); |
1360 | 576 if(!drop_frame && got_picture){ |
1454
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
577 // if(!drop_frame){ |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
578 if(planar){ |
2228 | 579 #ifdef FF_POSTPROCESS |
580 if(lavc_pp){ | |
581 // postprocess | |
2291 | 582 int w=(sh_video->disp_w+15)&(~15); |
583 int h=(sh_video->disp_h+15)&(~15); | |
584 int xoff=0; //(w-sh_video->disp_w)/2; | |
585 int yoff=0; //(h-sh_video->disp_h)/2; | |
586 if(!sh_video->our_out_buffer){ | |
587 sh_video->our_out_buffer = (char*)memalign(64,w*h*3/2); | |
588 memset(sh_video->our_out_buffer,0,w*h*3/2); | |
589 } | |
590 stride[0]=w; | |
591 stride[1]=stride[2]=w/2; | |
592 planes[0]=sh_video->our_out_buffer+stride[0]*yoff+xoff; | |
593 planes[2]=sh_video->our_out_buffer+w*h+stride[2]*(yoff>>1)+(xoff>>1); | |
594 planes[1]=planes[2]+w*h/4; | |
2228 | 595 postprocess(lavc_picture.data,lavc_picture.linesize[0], |
2291 | 596 planes,stride[0], |
2228 | 597 sh_video->disp_w,sh_video->disp_h, |
598 &quant_store[0][0],MBC+1,lavc_pp); | |
599 } else | |
600 #endif | |
601 { | |
602 planes=lavc_picture.data; | |
603 stride=lavc_picture.linesize; | |
604 //stride[1]=stride[2]=0; | |
605 //stride[0]/=2; | |
606 } | |
607 blit_frame=2; | |
1454
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
608 } else { |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
609 int y; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
610 // temporary hack - FIXME |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
611 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
|
612 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
|
613 for(y=0;y<sh_video->disp_h;y++){ |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
614 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
|
615 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
|
616 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
|
617 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
|
618 int x; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
619 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
|
620 d[4*x+0]=s0[2*x+0]; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
621 d[4*x+1]=s1[x]; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
622 d[4*x+2]=s0[2*x+1]; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
623 d[4*x+3]=s2[x]; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
624 } |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
625 } |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
626 blit_frame=3; |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
627 } |
3e5b5be0b61d
temporary hack: YUV422P -> YUY2 converter (for ffmpeg MJPEG testing)
arpi
parents:
1431
diff
changeset
|
628 |
1360 | 629 } |
1294 | 630 } |
631 break; | |
632 } | |
633 #endif | |
1517
0e9c29538a86
Use USE_WIN32DLL define instead of ARCH_X86 to decide whether or not to compile
jkeil
parents:
1496
diff
changeset
|
634 #ifdef USE_WIN32DLL |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
635 case VFM_VFWEX: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
636 case VFM_VFW: |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
637 { |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
638 int ret; |
1360 | 639 if(!in_size) break; |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
640 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
|
641 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
|
642 break; |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
2044
diff
changeset
|
643 } |
1360 | 644 if(!drop_frame) blit_frame=3; |
1294 | 645 break; |
646 } | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
647 #endif |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
648 case VFM_MPEG: |
1873 | 649 if(out_fmt==IMGFMT_MPEGPES){ |
650 // hardware decoding: | |
651 static vo_mpegpes_t packet; | |
652 mpeg2_decode_data(video_out, start, start+in_size,3); // parse headers | |
653 packet.data=start; | |
654 packet.size=in_size-4; | |
655 packet.timestamp=sh_video->timer*90000.0; | |
656 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
|
657 planes[0]=(uint8_t*)(&packet); |
1873 | 658 blit_frame=2; |
659 } else { | |
660 // software decoding: | |
2019
7de4eceac32f
mpeg2-interlaced patch by Ivan Kalvatchev <iive@yahoo.com>
arpi
parents:
2006
diff
changeset
|
661 if( |
7de4eceac32f
mpeg2-interlaced patch by Ivan Kalvatchev <iive@yahoo.com>
arpi
parents:
2006
diff
changeset
|
662 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
|
663 && (!drop_frame) |
7de4eceac32f
mpeg2-interlaced patch by Ivan Kalvatchev <iive@yahoo.com>
arpi
parents:
2006
diff
changeset
|
664 ) blit_frame=1; |
1873 | 665 } |
1294 | 666 break; |
1488 | 667 case VFM_RAW: |
668 planes[0]=start; | |
669 blit_frame=2; | |
670 break; | |
1948 | 671 case VFM_RLE: |
672 //void AVI_Decode_RLE8(char *image,char *delta,int tdsize, | |
673 // unsigned int *map,int imagex,int imagey,unsigned char x11_bytes_pixel); | |
674 AVI_Decode_RLE8(sh_video->our_out_buffer,start,in_size, | |
675 (int*)(((char*)sh_video->bih)+40), | |
676 sh_video->disp_w,sh_video->disp_h,((out_fmt&255)+7)/8); | |
677 blit_frame=3; | |
678 break; | |
1294 | 679 } // switch |
680 //------------------------ frame decoded. -------------------- | |
681 | |
1367 | 682 #ifdef HAVE_MMX |
683 // some codecs is broken, and doesn't restore MMX state :( | |
684 // it happens usually with broken/damaged files. | |
2541
88195a28576a
changed hardcoded 'emms' to EMMS according to pp/swscale.c
alex
parents:
2496
diff
changeset
|
685 __asm __volatile (EMMS:::"memory"); |
1367 | 686 #endif |
687 | |
1360 | 688 t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f; |
689 | |
690 switch(blit_frame){ | |
691 case 3: | |
692 if(planar){ | |
693 stride[0]=sh_video->disp_w; | |
694 stride[1]=stride[2]=sh_video->disp_w/2; | |
695 planes[0]=sh_video->our_out_buffer; | |
696 planes[2]=planes[0]+sh_video->disp_w*sh_video->disp_h; | |
697 planes[1]=planes[2]+sh_video->disp_w*sh_video->disp_h/4; | |
2716 | 698 } else { |
1360 | 699 planes[0]=sh_video->our_out_buffer; |
2716 | 700 if(sh_video->bih && sh_video->bih->biSize==1064) |
701 planes[1]=&sh_video->bih[1]; // pointer to palette | |
702 else | |
703 planes[1]=NULL; | |
704 } | |
1360 | 705 case 2: |
1422 | 706 #ifdef USE_LIBVO2 |
707 if(planar) | |
708 vo2_draw_slice(video_out,planes,stride,sh_video->disp_w,sh_video->disp_h,0,0); | |
709 else | |
710 vo2_draw_frame(video_out,planes[0],sh_video->disp_w,sh_video->disp_w,sh_video->disp_h); | |
711 #else | |
1360 | 712 if(planar) |
713 video_out->draw_slice(planes,stride,sh_video->disp_w,sh_video->disp_h,0,0); | |
714 else | |
715 video_out->draw_frame(planes); | |
1422 | 716 #endif |
1360 | 717 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f; |
718 blit_frame=1; | |
719 break; | |
720 } | |
721 | |
1294 | 722 return blit_frame; |
723 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
724 |