annotate dec_video.c @ 2580:b95069f5ed07

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