annotate dec_video.c @ 4188:cfd1eed5961d

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