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