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