Mercurial > mplayer.hg
annotate dec_video.c @ 1431:d1f9cc72a87f
missing #ifdef DIRECTSHOW... thanx gruel
author | arpi |
---|---|
date | Wed, 01 Aug 2001 10:07:49 +0000 |
parents | 1728d249c783 |
children | 3e5b5be0b61d |
rev | line source |
---|---|
1294 | 1 |
2 #include <stdio.h> | |
3 #include <stdlib.h> | |
1430 | 4 #include <unistd.h> |
1294 | 5 |
6 #include "config.h" | |
7 | |
8 extern int verbose; // defined in mplayer.c | |
9 extern int divx_quality; | |
10 | |
11 extern double video_time_usage; | |
12 extern double vout_time_usage; | |
13 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
14 extern int frameratecode2framerate[16]; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
15 |
1327
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1309
diff
changeset
|
16 #include "linux/timer.h" |
b12e1817bcc2
some cleanup - fixed warnings, removed old stuff, moved audio resync to dec_audio
arpi
parents:
1309
diff
changeset
|
17 |
1294 | 18 #include "stream.h" |
19 #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
|
20 #include "parse_es.h" |
1294 | 21 |
22 #include "wine/mmreg.h" | |
23 #include "wine/avifmt.h" | |
24 #include "wine/vfw.h" | |
25 | |
26 #include "codec-cfg.h" | |
27 #include "stheader.h" | |
28 | |
29 //#include <inttypes.h> | |
30 //#include "libvo/img_format.h" | |
31 | |
1422 | 32 #ifdef USE_LIBVO2 |
33 #include "libvo2/libvo2.h" | |
34 #else | |
1294 | 35 #include "libvo/video_out.h" |
1422 | 36 #endif |
1294 | 37 |
38 #include "libmpeg2/mpeg2.h" | |
39 #include "libmpeg2/mpeg2_internal.h" | |
40 | |
41 extern picture_t *picture; // exported from libmpeg2/decode.c | |
42 | |
1297 | 43 extern int init_video_codec(sh_video_t *sh_video,int ex); |
1294 | 44 |
45 #ifdef USE_DIRECTSHOW | |
46 #include "loader/DirectShow/DS_VideoDec.h" | |
47 #endif | |
48 | |
49 #ifdef USE_LIBAVCODEC | |
50 #include "libavcodec/avcodec.h" | |
51 AVCodec *lavc_codec=NULL; | |
52 AVCodecContext lavc_context; | |
53 AVPicture lavc_picture; | |
54 #endif | |
55 | |
1349 | 56 #ifndef NEW_DECORE |
1294 | 57 #include "opendivx/decore.h" |
1349 | 58 #else |
59 #include <decore.h> | |
60 #endif | |
1294 | 61 |
62 //**************************************************************************// | |
63 // The OpenDivX stuff: | |
64 //**************************************************************************// | |
65 | |
66 #ifndef NEW_DECORE | |
67 | |
68 static unsigned char *opendivx_src[3]; | |
69 static int opendivx_stride[3]; | |
70 | |
71 // callback, the opendivx decoder calls this for each frame: | |
72 void convert_linux(unsigned char *puc_y, int stride_y, | |
73 unsigned char *puc_u, unsigned char *puc_v, int stride_uv, | |
74 unsigned char *bmp, int width_y, int height_y){ | |
75 | |
76 // printf("convert_yuv called %dx%d stride: %d,%d\n",width_y,height_y,stride_y,stride_uv); | |
77 | |
78 opendivx_src[0]=puc_y; | |
79 opendivx_src[1]=puc_u; | |
80 opendivx_src[2]=puc_v; | |
81 | |
82 opendivx_stride[0]=stride_y; | |
83 opendivx_stride[1]=stride_uv; | |
84 opendivx_stride[2]=stride_uv; | |
85 } | |
86 #endif | |
87 | |
1429 | 88 int get_video_quality_max(sh_video_t *sh_video){ |
89 switch(sh_video->codec->driver){ | |
90 #ifdef USE_DIRECTSHOW | |
91 case VFM_DSHOW: | |
92 return 4; | |
93 #endif | |
94 #ifdef MPEG12_POSTPROC | |
95 case VFM_MPEG: | |
96 #endif | |
97 case VFM_DIVX4: | |
98 case VFM_ODIVX: | |
99 return 6; | |
100 } | |
101 return 0; | |
102 } | |
103 | |
104 void set_video_quality(sh_video_t *sh_video,int quality){ | |
105 switch(sh_video->codec->driver){ | |
106 #ifdef ARCH_X86 | |
107 #ifdef USE_DIRECTSHOW | |
108 case VFM_DSHOW: { | |
109 if(quality<0 || quality>4) quality=4; | |
110 DS_SetValue_DivX("Quality",quality); | |
111 } | |
112 break; | |
113 #endif | |
114 #endif | |
115 #ifdef MPEG12_POSTPROC | |
116 case VFM_MPEG: { | |
117 if(quality<0 || quality>6) quality=6; | |
118 picture->pp_options=(1<<quality)-1; | |
119 } | |
120 break; | |
121 #endif | |
122 case VFM_DIVX4: | |
123 case VFM_ODIVX: { | |
124 DEC_SET dec_set; | |
125 if(quality<0 || quality>6) quality=6; | |
126 dec_set.postproc_level=(1<<quality)-1; | |
127 decore(0x123,DEC_OPT_SETPP,&dec_set,NULL); | |
128 } | |
129 break; | |
130 } | |
131 } | |
132 | |
133 int set_video_colors(sh_video_t *sh_video,char *item,int value){ | |
1431 | 134 #ifdef USE_DIRECTSHOW |
1429 | 135 if(!strcmp(sh_video->codec->name,"divxds")){ |
136 DS_SetValue_DivX(item,value); | |
137 return 1; | |
138 } | |
1431 | 139 #endif |
1429 | 140 return 0; |
141 } | |
1294 | 142 |
143 int init_video(sh_video_t *sh_video){ | |
144 unsigned int out_fmt=sh_video->codec->outfmt[sh_video->outfmtidx]; | |
145 | |
146 switch(sh_video->codec->driver){ | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
147 #ifdef ARCH_X86 |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
148 case VFM_VFW: { |
1297 | 149 if(!init_video_codec(sh_video,0)) { |
1294 | 150 // GUI_MSG( mplUnknowError ) |
151 // exit(1); | |
152 return 0; | |
153 } | |
154 if(verbose) printf("INFO: Win32 video codec init OK!\n"); | |
155 break; | |
156 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
157 case VFM_VFWEX: { |
1297 | 158 if(!init_video_codec(sh_video,1)) { |
159 // GUI_MSG( mplUnknowError ) | |
160 // exit(1); | |
161 return 0; | |
162 } | |
163 if(verbose) printf("INFO: Win32Ex video codec init OK!\n"); | |
164 break; | |
165 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
166 case VFM_DSHOW: { // Win32/DirectShow |
1294 | 167 #ifndef USE_DIRECTSHOW |
168 fprintf(stderr,"MPlayer was compiled WITHOUT directshow support!\n"); | |
169 return 0; | |
170 // GUI_MSG( mplCompileWithoutDSSupport ) | |
171 // exit(1); | |
172 #else | |
173 sh_video->our_out_buffer=NULL; | |
174 if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, &sh_video->our_out_buffer)){ | |
175 // if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, NULL)){ | |
176 printf("ERROR: Couldn't open required DirectShow codec: %s\n",sh_video->codec->dll); | |
177 printf("Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n"); | |
178 printf("package from: ftp://thot.banki.hu/esp-team/linux/MPlayer/w32codec.zip !\n"); | |
179 printf("Or you should disable DShow support: make distclean;make -f Makefile.No-DS\n"); | |
180 return 0; | |
181 // #ifdef HAVE_GUI | |
182 // if ( !nogui ) | |
183 // { | |
184 // strcpy( mplShMem->items.videodata.codecdll,sh_video->codec->dll ); | |
185 // mplSendMessage( mplDSCodecNotFound ); | |
186 // usec_sleep( 10000 ); | |
187 // } | |
188 // #endif | |
189 // exit(1); | |
190 } | |
191 | |
192 switch(out_fmt){ | |
193 case IMGFMT_YUY2: | |
194 case IMGFMT_UYVY: | |
195 DS_VideoDecoder_SetDestFmt(16,out_fmt);break; // packed YUV | |
196 case IMGFMT_YV12: | |
197 case IMGFMT_I420: | |
198 case IMGFMT_IYUV: | |
199 DS_VideoDecoder_SetDestFmt(12,out_fmt);break; // planar YUV | |
200 default: | |
201 DS_VideoDecoder_SetDestFmt(out_fmt&255,0); // RGB/BGR | |
202 } | |
203 | |
204 DS_VideoDecoder_Start(); | |
205 | |
206 DS_SetAttr_DivX("Quality",divx_quality); | |
207 // printf("DivX setting result = %d\n", DS_SetAttr_DivX("Quality",divx_quality) ); | |
208 // printf("DivX setting result = %d\n", DS_SetValue_DivX("Brightness",60) ); | |
209 | |
210 if(verbose) printf("INFO: Win32/DShow video codec init OK!\n"); | |
211 break; | |
212 #endif | |
213 } | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
214 #else /* !ARCH_X86 */ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
215 case VFM_VFW: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
216 case VFM_DSHOW: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
217 case VFM_VFWEX: |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
218 fprintf(stderr,"MPlayer does not support win32 codecs on non-x86 platforms!\n"); |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
219 return 0; |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
220 #endif /* !ARCH_X86 */ |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
221 case VFM_ODIVX: { // OpenDivX |
1294 | 222 if(verbose) printf("OpenDivX video codec\n"); |
223 { DEC_PARAM dec_param; | |
224 DEC_SET dec_set; | |
1349 | 225 memset(&dec_param,0,sizeof(dec_param)); |
1294 | 226 #ifdef NEW_DECORE |
227 dec_param.output_format=DEC_USER; | |
228 #else | |
229 dec_param.color_depth = 32; | |
230 #endif | |
231 dec_param.x_dim = sh_video->bih->biWidth; | |
232 dec_param.y_dim = sh_video->bih->biHeight; | |
233 decore(0x123, DEC_OPT_INIT, &dec_param, NULL); | |
234 dec_set.postproc_level = divx_quality; | |
235 decore(0x123, DEC_OPT_SETPP, &dec_set, NULL); | |
1349 | 236 } |
237 if(verbose) printf("INFO: OpenDivX video codec init OK!\n"); | |
238 break; | |
239 } | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
240 case VFM_DIVX4: { // DivX4Linux |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
241 #ifndef NEW_DECORE |
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
242 fprintf(stderr,"MPlayer was compiled WITHOUT DivX4Linux (libdivxdecore.so) support!\n"); |
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
243 return 0; //exit(1); |
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
244 #else |
1349 | 245 if(verbose) printf("DivX4Linux video codec\n"); |
246 { DEC_PARAM dec_param; | |
247 DEC_SET dec_set; | |
248 int bits=16; | |
249 memset(&dec_param,0,sizeof(dec_param)); | |
250 switch(out_fmt){ | |
251 case IMGFMT_YV12: dec_param.output_format=DEC_YV12;bits=12;break; | |
252 case IMGFMT_YUY2: dec_param.output_format=DEC_YUY2;break; | |
253 case IMGFMT_UYVY: dec_param.output_format=DEC_UYVY;break; | |
254 case IMGFMT_I420: dec_param.output_format=DEC_420;bits=12;break; | |
255 case IMGFMT_BGR15: dec_param.output_format=DEC_RGB555_INV;break; | |
256 case IMGFMT_BGR16: dec_param.output_format=DEC_RGB565_INV;break; | |
257 case IMGFMT_BGR24: dec_param.output_format=DEC_RGB24_INV;bits=24;break; | |
258 case IMGFMT_BGR32: dec_param.output_format=DEC_RGB32_INV;bits=32;break; | |
259 default: | |
260 fprintf(stderr,"Unsupported out_fmt: 0x%X\n",out_fmt); | |
261 return 0; | |
262 } | |
263 dec_param.x_dim = sh_video->bih->biWidth; | |
264 dec_param.y_dim = sh_video->bih->biHeight; | |
265 decore(0x123, DEC_OPT_INIT, &dec_param, NULL); | |
266 dec_set.postproc_level = divx_quality; | |
267 decore(0x123, DEC_OPT_SETPP, &dec_set, NULL); | |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
268 sh_video->our_out_buffer = shmem_alloc(((bits*dec_param.x_dim+7)/8)*dec_param.y_dim); |
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
269 // sh_video->our_out_buffer = shmem_alloc(dec_param.x_dim*dec_param.y_dim*5); |
1294 | 270 } |
271 if(verbose) printf("INFO: OpenDivX video codec init OK!\n"); | |
272 break; | |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
273 #endif |
1294 | 274 } |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
275 case VFM_FFMPEG: { // FFmpeg's libavcodec |
1294 | 276 #ifndef USE_LIBAVCODEC |
277 fprintf(stderr,"MPlayer was compiled WITHOUT libavcodec support!\n"); | |
278 return 0; //exit(1); | |
279 #else | |
280 if(verbose) printf("FFmpeg's libavcodec video codec\n"); | |
281 avcodec_init(); | |
282 avcodec_register_all(); | |
283 lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh_video->codec->dll); | |
284 if(!lavc_codec){ | |
285 fprintf(stderr,"Can't find codec '%s' in libavcodec...\n",sh_video->codec->dll); | |
286 return 0; //exit(1); | |
287 } | |
288 memset(&lavc_context, 0, sizeof(lavc_context)); | |
289 lavc_context.width=sh_video->disp_w; | |
290 lavc_context.height=sh_video->disp_h; | |
291 printf("libavcodec.size: %d x %d\n",lavc_context.width,lavc_context.height); | |
292 /* open it */ | |
293 if (avcodec_open(&lavc_context, lavc_codec) < 0) { | |
294 fprintf(stderr, "could not open codec\n"); | |
295 return 0; //exit(1); | |
296 } | |
297 | |
298 if(verbose) printf("INFO: libavcodec init OK!\n"); | |
299 break; | |
300 #endif | |
301 } | |
302 | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
303 case VFM_MPEG: { |
1294 | 304 // init libmpeg2: |
305 #ifdef MPEG12_POSTPROC | |
306 picture->pp_options=divx_quality; | |
307 #else | |
308 if(divx_quality){ | |
309 printf("WARNING! You requested image postprocessing for an MPEG 1/2 video,\n"); | |
310 printf(" but compiled MPlayer without MPEG 1/2 postprocessing support!\n"); | |
311 printf(" #define MPEG12_POSTPROC in config.h, and recompile libmpeg2!\n"); | |
312 } | |
313 #endif | |
314 mpeg2_allocate_image_buffers (picture); | |
315 break; | |
316 } | |
317 } | |
318 | |
319 return 1; | |
320 } | |
321 | |
1422 | 322 #ifdef USE_LIBVO2 |
323 int decode_video(vo2_handle_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){ | |
324 #else | |
1294 | 325 int decode_video(vo_functions_t *video_out,sh_video_t *sh_video,unsigned char *start,int in_size,int drop_frame){ |
1422 | 326 #endif |
1294 | 327 unsigned int out_fmt=sh_video->codec->outfmt[sh_video->outfmtidx]; |
1360 | 328 int planar=(out_fmt==IMGFMT_YV12||out_fmt==IMGFMT_IYUV||out_fmt==IMGFMT_I420); |
1294 | 329 int blit_frame=0; |
330 | |
1360 | 331 uint8_t* planes_[3]; |
332 uint8_t** planes=planes_; | |
333 int stride_[3]; | |
334 int* stride=stride_; | |
335 | |
336 unsigned int t=GetTimer(); | |
337 unsigned int t2; | |
338 | |
1294 | 339 //-------------------- Decode a frame: ----------------------- |
340 switch(sh_video->codec->driver){ | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
341 case VFM_ODIVX: { |
1294 | 342 // OpenDivX |
343 DEC_FRAME dec_frame; | |
344 #ifdef NEW_DECORE | |
345 DEC_PICTURE dec_pic; | |
346 #endif | |
347 // let's decode | |
348 dec_frame.length = in_size; | |
349 dec_frame.bitstream = start; | |
1349 | 350 dec_frame.render_flag = drop_frame?0:1; |
351 | |
1294 | 352 #ifdef NEW_DECORE |
353 dec_frame.bmp=&dec_pic; | |
354 dec_pic.y=dec_pic.u=dec_pic.v=NULL; | |
1349 | 355 decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL); |
356 #else | |
1360 | 357 opendivx_src[0]=NULL; |
1349 | 358 decore(0x123, 0, &dec_frame, NULL); |
1294 | 359 #endif |
1360 | 360 |
361 if(!drop_frame) | |
1294 | 362 |
1349 | 363 // let's display |
1294 | 364 #ifdef NEW_DECORE |
365 if(dec_pic.y){ | |
1360 | 366 planes[0]=dec_pic.y; |
367 planes[1]=dec_pic.u; | |
368 planes[2]=dec_pic.v; | |
1294 | 369 stride[0]=dec_pic.stride_y; |
370 stride[1]=stride[2]=dec_pic.stride_uv; | |
1360 | 371 blit_frame=2; |
1294 | 372 } |
373 #else | |
374 if(opendivx_src[0]){ | |
1360 | 375 planes=opendivx_src; stride=opendivx_stride; |
376 blit_frame=2; | |
1294 | 377 } |
378 #endif | |
379 | |
380 break; | |
381 } | |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
382 #ifdef NEW_DECORE |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
383 case VFM_DIVX4: { |
1349 | 384 // DivX4Linux |
385 DEC_FRAME dec_frame; | |
386 // let's decode | |
387 dec_frame.length = in_size; | |
388 dec_frame.bitstream = start; | |
389 dec_frame.render_flag = drop_frame?0:1; | |
390 dec_frame.bmp=sh_video->our_out_buffer; | |
391 dec_frame.stride=sh_video->disp_w; | |
392 // printf("Decoding DivX4 frame\n"); | |
393 decore(0x123, (sh_video->format==mmioFOURCC('D','I','V','3'))?DEC_OPT_FRAME_311:DEC_OPT_FRAME, &dec_frame, NULL); | |
1360 | 394 if(!drop_frame) blit_frame=3; |
1349 | 395 break; |
396 } | |
1352
5ac130627602
fixed shmem size, and now compiles without divx4linux too :)
arpi
parents:
1349
diff
changeset
|
397 #endif |
1294 | 398 #ifdef USE_DIRECTSHOW |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
399 case VFM_DSHOW: { // W32/DirectShow |
1294 | 400 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
|
401 if(!drop_frame && sh_video->our_out_buffer) blit_frame=3; |
1294 | 402 break; |
403 } | |
404 #endif | |
405 #ifdef USE_LIBAVCODEC | |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
406 case VFM_FFMPEG: { // libavcodec |
1294 | 407 int got_picture=0; |
408 if(drop_frame<2 && in_size>0){ | |
409 int ret = avcodec_decode_video(&lavc_context, &lavc_picture, | |
410 &got_picture, start, in_size); | |
411 if(ret<0) fprintf(stderr, "Error while decoding frame!\n"); | |
1360 | 412 if(!drop_frame && got_picture){ |
413 planes=lavc_picture.data; | |
414 stride=lavc_picture.linesize; | |
415 blit_frame=2; | |
416 } | |
1294 | 417 } |
418 break; | |
419 } | |
420 #endif | |
1360 | 421 #ifdef ARCH_X86 |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
422 case VFM_VFWEX: |
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
423 case VFM_VFW: |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
424 { |
1294 | 425 HRESULT ret; |
426 | |
1360 | 427 if(!in_size) break; |
428 | |
1294 | 429 sh_video->bih->biSizeImage = in_size; |
430 | |
431 // sh_video->bih->biWidth = 1280; | |
432 // sh_video->o_bih.biWidth = 1280; | |
433 // ret = ICDecompress(avi_header.hic, ICDECOMPRESS_NOTKEYFRAME|(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL), | |
1297 | 434 |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
435 if(sh_video->codec->driver==VFM_VFWEX) |
1297 | 436 ret = ICDecompressEx(sh_video->hic, |
437 ( (sh_video->ds->flags&1) ? 0 : ICDECOMPRESS_NOTKEYFRAME ) | | |
438 ( (drop_frame==2 && !(sh_video->ds->flags&1))?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ) , | |
439 sh_video->bih, start, | |
440 &sh_video->o_bih, | |
441 drop_frame ? 0 : sh_video->our_out_buffer); | |
442 else | |
1294 | 443 ret = ICDecompress(sh_video->hic, |
444 ( (sh_video->ds->flags&1) ? 0 : ICDECOMPRESS_NOTKEYFRAME ) | | |
445 ( (drop_frame==2 && !(sh_video->ds->flags&1))?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ) , | |
446 sh_video->bih, start, | |
447 &sh_video->o_bih, | |
448 drop_frame ? 0 : sh_video->our_out_buffer); | |
449 | |
450 if(ret){ printf("Error decompressing frame, err=%d\n",(int)ret);break; } | |
1360 | 451 |
452 if(!drop_frame) blit_frame=3; | |
1294 | 453 break; |
454 } | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
455 #endif |
1410
eda16e490ae7
using AFM_/VFM_ macros instead of hardcoded constants (idea by al3x)
arpi
parents:
1401
diff
changeset
|
456 case VFM_MPEG: |
1365 | 457 mpeg2_decode_data(video_out, start, start+in_size,drop_frame); |
458 if(!drop_frame) blit_frame=1; | |
1294 | 459 break; |
460 } // switch | |
461 //------------------------ frame decoded. -------------------- | |
462 | |
1367 | 463 #ifdef HAVE_MMX |
464 // some codecs is broken, and doesn't restore MMX state :( | |
465 // it happens usually with broken/damaged files. | |
466 __asm __volatile ("emms;":::"memory"); | |
467 #endif | |
468 | |
1360 | 469 t2=GetTimer();t=t2-t;video_time_usage+=t*0.000001f; |
470 | |
471 switch(blit_frame){ | |
472 case 3: | |
473 if(planar){ | |
474 stride[0]=sh_video->disp_w; | |
475 stride[1]=stride[2]=sh_video->disp_w/2; | |
476 planes[0]=sh_video->our_out_buffer; | |
477 planes[2]=planes[0]+sh_video->disp_w*sh_video->disp_h; | |
478 planes[1]=planes[2]+sh_video->disp_w*sh_video->disp_h/4; | |
479 } else | |
480 planes[0]=sh_video->our_out_buffer; | |
481 case 2: | |
1422 | 482 #ifdef USE_LIBVO2 |
483 if(planar) | |
484 vo2_draw_slice(video_out,planes,stride,sh_video->disp_w,sh_video->disp_h,0,0); | |
485 else | |
486 vo2_draw_frame(video_out,planes[0],sh_video->disp_w,sh_video->disp_w,sh_video->disp_h); | |
487 #else | |
1360 | 488 if(planar) |
489 video_out->draw_slice(planes,stride,sh_video->disp_w,sh_video->disp_h,0,0); | |
490 else | |
491 video_out->draw_frame(planes); | |
1422 | 492 #endif |
1360 | 493 t2=GetTimer()-t2;vout_time_usage+=t2*0.000001f; |
494 blit_frame=1; | |
495 break; | |
496 } | |
497 | |
1294 | 498 return blit_frame; |
499 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
500 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
501 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
502 int video_read_properties(sh_video_t *sh_video){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
503 demux_stream_t *d_video=sh_video->ds; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
504 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
505 // Determine image properties: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
506 switch(d_video->demuxer->file_format){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
507 case DEMUXER_TYPE_AVI: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
508 case DEMUXER_TYPE_ASF: { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
509 // display info: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
510 sh_video->format=sh_video->bih->biCompression; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
511 sh_video->disp_w=sh_video->bih->biWidth; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
512 sh_video->disp_h=abs(sh_video->bih->biHeight); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
513 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
514 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
515 case DEMUXER_TYPE_MPEG_ES: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
516 case DEMUXER_TYPE_MPEG_PS: { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
517 // Find sequence_header first: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
518 if(verbose) printf("Searching for sequence header... ");fflush(stdout); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
519 while(1){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
520 int i=sync_video_packet(d_video); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
521 if(i==0x1B3) break; // found it! |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
522 if(!i || !skip_video_packet(d_video)){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
523 if(verbose) printf("NONE :(\n"); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
524 fprintf(stderr,"MPEG: FATAL: EOF while searching for sequence header\n"); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
525 return 0; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
526 // GUI_MSG( mplMPEGErrorSeqHeaderSearch ) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
527 // exit(1); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
528 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
529 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
530 if(verbose) printf("OK!\n"); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
531 // sh_video=d_video->sh;sh_video->ds=d_video; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
532 sh_video->format=0x10000001; // mpeg video |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
533 mpeg2_init(); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
534 // ========= Read & process sequence header & extension ============ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
535 videobuffer=shmem_alloc(VIDEOBUFFER_SIZE); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
536 if(!videobuffer){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
537 fprintf(stderr,"Cannot allocate shared memory\n"); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
538 return 0; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
539 // GUI_MSG( mplErrorShMemAlloc ) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
540 // exit(0); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
541 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
542 videobuf_len=0; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
543 if(!read_video_packet(d_video)){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
544 fprintf(stderr,"FATAL: Cannot read sequence header!\n"); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
545 return 0; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
546 // GUI_MSG( mplMPEGErrorCannotReadSeqHeader ) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
547 // exit(1); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
548 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
549 if(header_process_sequence_header (picture, &videobuffer[4])) { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
550 printf ("bad sequence header!\n"); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
551 return 0; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
552 // GUI_MSG( mplMPEGErrorBadSeqHeader ) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
553 // exit(1); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
554 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
555 if(sync_video_packet(d_video)==0x1B5){ // next packet is seq. ext. |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
556 videobuf_len=0; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
557 if(!read_video_packet(d_video)){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
558 fprintf(stderr,"FATAL: Cannot read sequence header extension!\n"); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
559 return 0; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
560 // GUI_MSG( mplMPEGErrorCannotReadSeqHeaderExt ) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
561 // exit(1); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
562 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
563 if(header_process_extension (picture, &videobuffer[4])) { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
564 printf ("bad sequence header extension!\n"); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
565 return 0; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
566 // GUI_MSG( mplMPEGErrorBadSeqHeaderExt ) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
567 // exit(1); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
568 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
569 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
570 // display info: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
571 sh_video->fps=frameratecode2framerate[picture->frame_rate_code]*0.0001f; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
572 if(!sh_video->fps){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
573 // if(!force_fps){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
574 // fprintf(stderr,"FPS not specified (or invalid) in the header! Use the -fps option!\n"); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
575 // return 0; //exit(1); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
576 // } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
577 sh_video->frametime=0; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
578 } else { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
579 sh_video->frametime=10000.0f/(float)frameratecode2framerate[picture->frame_rate_code]; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
580 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
581 sh_video->disp_w=picture->display_picture_width; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
582 sh_video->disp_h=picture->display_picture_height; |
1401 | 583 // bitrate: |
584 if(picture->bitrate!=0x3FFFF) // unspecified/VBR ? | |
585 sh_video->i_bps=1000*picture->bitrate/16; | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
586 // info: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
587 if(verbose) printf("mpeg bitrate: %d (%X)\n",picture->bitrate,picture->bitrate); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
588 printf("VIDEO: %s %dx%d (aspect %d) %4.2f fps %5.1f kbps (%4.1f kbyte/s)\n", |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
589 picture->mpeg1?"MPEG1":"MPEG2", |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
590 sh_video->disp_w,sh_video->disp_h, |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
591 picture->aspect_ratio_information, |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
592 sh_video->fps, |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
593 picture->bitrate*0.5f, |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
594 picture->bitrate/16.0f ); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
595 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
596 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
597 } // switch(file_format) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
598 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
599 return 1; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
600 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
601 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
602 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
603 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
604 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1367
diff
changeset
|
605 |