annotate dec_video.c @ 3073:c5cc7f11302a

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