annotate libmpcodecs/vd_vfw.c @ 36295:0bd0297b073a

Handle special argument -1 to switch_ratio as intended. Reset to the original aspect ratio that would have been used for the very first rescaling rather than to the display size ratio. This will now handle anamorphic videos correctly as well.
author ib
date Thu, 01 Aug 2013 21:18:14 +0000
parents 33ff3fdad741
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
30421
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
1 /*
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
2 * This file is part of MPlayer.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
3 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
4 * MPlayer is free software; you can redistribute it and/or modify
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
5 * it under the terms of the GNU General Public License as published by
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
6 * the Free Software Foundation; either version 2 of the License, or
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
7 * (at your option) any later version.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
8 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
9 * MPlayer is distributed in the hope that it will be useful,
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
12 * GNU General Public License for more details.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
13 *
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
14 * You should have received a copy of the GNU General Public License along
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
15 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
16 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
17 */
bbb6ebec87a0 Add missing license headers to all files in the libmpcodecs directory.
diego
parents: 30073
diff changeset
18
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
19 #include <stdio.h>
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
20 #include <stdlib.h>
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
21
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
22 #include "config.h"
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
23 #include "mp_msg.h"
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
24 #include "help_mp.h"
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
25
7471
5e56ce70b551 wine headers cleanup
arpi
parents: 7390
diff changeset
26 #include "vd_internal.h"
31983
33ff3fdad741 Fix compilation on ia32 after r32064.
cehoyos
parents: 30589
diff changeset
27 #include "dec_video.h"
30589
df6c41f16b40 Add header for AVI print functions; avoids many forward declarations.
diego
parents: 30566
diff changeset
28 #include "libmpdemux/aviprint.h"
22577
a033e5519802 Include loader/ prefix in #include path everywhere.
diego
parents: 18771
diff changeset
29 #include "loader/wine/driver.h"
a033e5519802 Include loader/ prefix in #include path everywhere.
diego
parents: 18771
diff changeset
30 #include "loader/wine/vfw.h"
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
31
30504
cc27da5d7286 Mark all ad_info_t/vd_info_t structure declarations as const.
diego
parents: 30421
diff changeset
32 static const vd_info_t info = {
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
33 #ifdef BUILD_VFWEX
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
34 "Win32/VfWex video codecs",
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
35 "vfwex",
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
36 #else
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
37 "Win32/VfW video codecs",
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
38 "vfw",
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
39 #endif
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
40 "A'rpi & Alex",
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
41 "avifile.sf.net",
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
42 "win32 codecs"
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
43 };
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
44
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
45 #ifdef BUILD_VFWEX
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
46 LIBVD_EXTERN(vfwex)
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
47 #else
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
48 LIBVD_EXTERN(vfw)
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
49 #endif
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
50
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
51 typedef struct {
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
52 BITMAPINFOHEADER *o_bih;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
53 HIC handle;
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
54 unsigned char *palette;
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
55 } vd_vfw_ctx;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
56
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
57 static int vfw_set_postproc(sh_video_t* sh, int quality)
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
58 {
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
59 vd_vfw_ctx *priv = sh->context;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
60 // Works only with opendivx/divx4 based DLL
7273
6cca0ab10e19 NULL->0 (warning fix)
arpi
parents: 7262
diff changeset
61 return ICSendMessage(priv->handle, ICM_USER+80, (long)(&quality), 0);
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
62 }
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
63
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
64 static void set_csp(BITMAPINFOHEADER *o_bih,unsigned int outfmt){
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
65 int yuv = 0;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
66
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
67 switch (outfmt)
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
68 {
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
69 /* planar format */
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
70 case IMGFMT_YV12:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
71 case IMGFMT_I420:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
72 case IMGFMT_IYUV:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
73 o_bih->biBitCount=12;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
74 yuv=1;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
75 break;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
76 case IMGFMT_YVU9:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
77 case IMGFMT_IF09:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
78 o_bih->biBitCount=9;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
79 yuv=1;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
80 break;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
81 /* packed format */
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
82 case IMGFMT_YUY2:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
83 case IMGFMT_UYVY:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
84 case IMGFMT_YVYU:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
85 o_bih->biBitCount=16;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
86 yuv=1;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
87 break;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
88 /* rgb/bgr format */
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
89 case IMGFMT_RGB8:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
90 case IMGFMT_BGR8:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
91 o_bih->biBitCount=8;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
92 break;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
93 case IMGFMT_RGB15:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
94 case IMGFMT_RGB16:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
95 case IMGFMT_BGR15:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
96 case IMGFMT_BGR16:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
97 o_bih->biBitCount=16;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
98 break;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
99 case IMGFMT_RGB24:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
100 case IMGFMT_BGR24:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
101 o_bih->biBitCount=24;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
102 break;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
103 case IMGFMT_RGB32:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
104 case IMGFMT_BGR32:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
105 o_bih->biBitCount=32;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
106 break;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
107 default:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
108 mp_msg(MSGT_WIN32,MSGL_ERR,"Unsupported image format: %s\n", vo_format_name(outfmt));
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
109 return;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
110 }
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
111
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
112 o_bih->biSizeImage = abs(o_bih->biWidth * o_bih->biHeight * (o_bih->biBitCount/8));
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
113
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
114 // Note: we cannot rely on sh->outfmtidx here, it's undefined at this stage!!!
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
115 // if (yuv && !(sh->codec->outflags[sh->outfmtidx] & CODECS_FLAG_YUVHACK))
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
116 if (yuv)
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
117 o_bih->biCompression = outfmt;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
118 else
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
119 o_bih->biCompression = 0;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
120 }
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
121
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
122 // to set/get/query special features/parameters
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
123 static int control(sh_video_t *sh,int cmd,void* arg,...){
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
124 vd_vfw_ctx *priv = sh->context;
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
125 switch(cmd){
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
126 case VDCTRL_QUERY_MAX_PP_LEVEL:
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
127 return 9;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
128 case VDCTRL_SET_PP_LEVEL:
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
129 vfw_set_postproc(sh,10*(*((int*)arg)));
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
130 return CONTROL_OK;
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
131 // FIXME: make this optional...
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
132 case VDCTRL_QUERY_FORMAT:
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
133 {
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
134 HRESULT ret;
7262
5fc42290c305 enabled csp-query support, but only for formats with 'query' flag set
arpi
parents: 7260
diff changeset
135 if(!(sh->codec->outflags[sh->outfmtidx]&CODECS_FLAG_QUERY))
5fc42290c305 enabled csp-query support, but only for formats with 'query' flag set
arpi
parents: 7260
diff changeset
136 return CONTROL_UNKNOWN; // do not query!
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
137 set_csp(priv->o_bih,*((int*)arg));
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
138 #ifdef BUILD_VFWEX
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
139 ret = ICDecompressQueryEx(priv->handle, sh->bih, priv->o_bih);
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
140 #else
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
141 ret = ICDecompressQuery(priv->handle, sh->bih, priv->o_bih);
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
142 #endif
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
143 if (ret)
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
144 {
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
145 mp_msg(MSGT_WIN32, MSGL_DBG2, "ICDecompressQuery failed:: Error %d\n", (int)ret);
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
146 return CONTROL_FALSE;
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
147 }
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
148 return CONTROL_TRUE;
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
149 }
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
150 }
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
151 return CONTROL_UNKNOWN;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
152 }
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
153
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
154 // init driver
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
155 static int init(sh_video_t *sh){
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
156 HRESULT ret;
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
157 // unsigned int outfmt=sh->codec->outfmt[sh->outfmtidx];
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
158 int i, o_bih_len;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
159 vd_vfw_ctx *priv;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
160
15344
6a7adf41e4fe Support for new vssh dll, patch by adland
rtognimp
parents: 8123
diff changeset
161 /* Hack for VSSH codec: new dll can't decode old files
6a7adf41e4fe Support for new vssh dll, patch by adland
rtognimp
parents: 8123
diff changeset
162 * In my samples old files have no extradata, so use that info
6a7adf41e4fe Support for new vssh dll, patch by adland
rtognimp
parents: 8123
diff changeset
163 * to decide what dll should be used (here and in vd_dshow).
6a7adf41e4fe Support for new vssh dll, patch by adland
rtognimp
parents: 8123
diff changeset
164 */
6a7adf41e4fe Support for new vssh dll, patch by adland
rtognimp
parents: 8123
diff changeset
165 if (!strcmp(sh->codec->dll, "vssh264.dll") && (sh->bih->biSize > 40))
6a7adf41e4fe Support for new vssh dll, patch by adland
rtognimp
parents: 8123
diff changeset
166 return 0;
6a7adf41e4fe Support for new vssh dll, patch by adland
rtognimp
parents: 8123
diff changeset
167
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
168 priv = malloc(sizeof(vd_vfw_ctx));
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
169 if (!priv)
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
170 return 0;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
171 memset(priv, 0, sizeof(vd_vfw_ctx));
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
172 sh->context = priv;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
173
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
174 mp_msg(MSGT_WIN32,MSGL_V,"======= Win32 (VFW) VIDEO Codec init =======\n");
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
175
7390
2357ee501582 fixed to comply with new loader
alex
parents: 7275
diff changeset
176
2357ee501582 fixed to comply with new loader
alex
parents: 7275
diff changeset
177 // win32_codec_name = sh->codec->dll;
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
178 // sh->hic = ICOpen( 0x63646976, sh->bih->biCompression, ICMODE_FASTDECOMPRESS);
7390
2357ee501582 fixed to comply with new loader
alex
parents: 7275
diff changeset
179 // priv->handle = ICOpen( 0x63646976, sh->bih->biCompression, ICMODE_DECOMPRESS);
7471
5e56ce70b551 wine headers cleanup
arpi
parents: 7390
diff changeset
180 priv->handle = ICOpen( (long)(sh->codec->dll), sh->bih->biCompression, ICMODE_DECOMPRESS);
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
181 if(!priv->handle){
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
182 mp_msg(MSGT_WIN32,MSGL_ERR,"ICOpen failed! unknown codec / wrong parameters?\n");
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
183 return 0;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
184 }
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
185
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
186 // sh->bih->biBitCount=32;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
187
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
188 o_bih_len = ICDecompressGetFormatSize(priv->handle, sh->bih);
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
189
24801
d555579c8c98 Check ICDecompressGetFormatSize to avoid crashes.
reimar
parents: 24146
diff changeset
190 if(o_bih_len < sizeof(BITMAPINFOHEADER)){
d555579c8c98 Check ICDecompressGetFormatSize to avoid crashes.
reimar
parents: 24146
diff changeset
191 mp_msg(MSGT_WIN32,MSGL_ERR,"ICDecompressGetFormatSize returned a bogus value: %d\n", o_bih_len);
d555579c8c98 Check ICDecompressGetFormatSize to avoid crashes.
reimar
parents: 24146
diff changeset
192 return 0;
d555579c8c98 Check ICDecompressGetFormatSize to avoid crashes.
reimar
parents: 24146
diff changeset
193 }
d555579c8c98 Check ICDecompressGetFormatSize to avoid crashes.
reimar
parents: 24146
diff changeset
194
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
195 priv->o_bih = malloc(o_bih_len);
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
196 memset(priv->o_bih, 0, o_bih_len);
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
197
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
198 mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressGetFormatSize ret: %d\n", o_bih_len);
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
199
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
200 ret = ICDecompressGetFormat(priv->handle, sh->bih, priv->o_bih);
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
201 if(ret < 0){
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
202 mp_msg(MSGT_WIN32,MSGL_ERR,"ICDecompressGetFormat failed: Error %d\n", (int)ret);
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
203 for (i=0; i < o_bih_len; i++) mp_msg(MSGT_WIN32, MSGL_DBG2, "%02x ", priv->o_bih[i]);
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
204 return 0;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
205 }
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
206 mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressGetFormat OK\n");
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
207
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
208 #if 0
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
209 // workaround for pegasus MJPEG:
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
210 if(!sh_video->o_bih.biWidth) sh_video->o_bih.biWidth=sh_video->bih->biWidth;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
211 if(!sh_video->o_bih.biHeight) sh_video->o_bih.biHeight=sh_video->bih->biHeight;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
212 if(!sh_video->o_bih.biPlanes) sh_video->o_bih.biPlanes=sh_video->bih->biPlanes;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
213 #endif
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
214
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
215 // ok let libvo and vd core to handshake and decide the optimal csp:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
216 if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2)) return 0;
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
217
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
218 if (!(sh->codec->outflags[sh->outfmtidx]&CODECS_FLAG_FLIP)) {
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
219 priv->o_bih->biHeight=-sh->bih->biHeight; // flip image!
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
220 }
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
221
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
222 // ok, let's set the choosen colorspace:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
223 set_csp(priv->o_bih,sh->codec->outfmt[sh->outfmtidx]);
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
224
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
225 // fake it to RGB for broken DLLs (divx3)
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
226 if(sh->codec->outflags[sh->outfmtidx] & CODECS_FLAG_YUVHACK)
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
227 priv->o_bih->biCompression = 0;
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
228
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
229 // sanity check:
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
230 #ifdef BUILD_VFWEX
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
231 ret = ICDecompressQueryEx(priv->handle, sh->bih, priv->o_bih);
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
232 #else
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
233 ret = ICDecompressQuery(priv->handle, sh->bih, priv->o_bih);
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
234 #endif
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
235 if (ret)
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
236 {
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
237 mp_msg(MSGT_WIN32,MSGL_WARN,"ICDecompressQuery failed: Error %d\n", (int)ret);
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
238 // return 0;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
239 } else
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
240 mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressQuery OK\n");
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
241
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
242 #ifdef BUILD_VFWEX
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
243 ret = ICDecompressBeginEx(priv->handle, sh->bih, priv->o_bih);
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
244 #else
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
245 ret = ICDecompressBegin(priv->handle, sh->bih, priv->o_bih);
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
246 #endif
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
247 if (ret)
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
248 {
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
249 mp_msg(MSGT_WIN32,MSGL_WARN,"ICDecompressBegin failed: Error %d\n", (int)ret);
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
250 // return 0;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
251 }
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
252
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
253 // for broken codecs set it again:
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
254 if(sh->codec->outflags[sh->outfmtidx] & CODECS_FLAG_YUVHACK)
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
255 set_csp(priv->o_bih,sh->codec->outfmt[sh->outfmtidx]);
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
256
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
257 mp_msg(MSGT_WIN32, MSGL_V, "Input format:\n");
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
258 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(sh->bih,MSGL_V);
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
259 mp_msg(MSGT_WIN32, MSGL_V, "Output format:\n");
17977
f70772d02eaa Convert printfs in aviprint.c to mp_msg and give the information printing
diego
parents: 17932
diff changeset
260 if( mp_msg_test(MSGT_HEADER,MSGL_V) ) print_video_header(priv->o_bih,MSGL_V);
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
261
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
262 // set postprocessing level in xvid/divx4 .dll
7273
6cca0ab10e19 NULL->0 (warning fix)
arpi
parents: 7262
diff changeset
263 ICSendMessage(priv->handle, ICM_USER+80, (long)(&divx_quality), 0);
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
264
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
265 // don't do this palette mess always, it makes div3 dll crashing...
7789
17956aff04e1 bypass palette from bih, when codec cannot give it in o_bih
arpi
parents: 7471
diff changeset
266 if(sh->codec->outfmt[sh->outfmtidx]==IMGFMT_BGR8){
17956aff04e1 bypass palette from bih, when codec cannot give it in o_bih
arpi
parents: 7471
diff changeset
267 if(ICDecompressGetPalette(priv->handle, sh->bih, priv->o_bih)){
17956aff04e1 bypass palette from bih, when codec cannot give it in o_bih
arpi
parents: 7471
diff changeset
268 priv->palette = (unsigned char*)(priv->o_bih+1);
17956aff04e1 bypass palette from bih, when codec cannot give it in o_bih
arpi
parents: 7471
diff changeset
269 mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressGetPalette OK\n");
17956aff04e1 bypass palette from bih, when codec cannot give it in o_bih
arpi
parents: 7471
diff changeset
270 } else {
17956aff04e1 bypass palette from bih, when codec cannot give it in o_bih
arpi
parents: 7471
diff changeset
271 if(sh->bih->biSize>=40+4*4)
17956aff04e1 bypass palette from bih, when codec cannot give it in o_bih
arpi
parents: 7471
diff changeset
272 priv->palette = (unsigned char*)(sh->bih+1);
17956aff04e1 bypass palette from bih, when codec cannot give it in o_bih
arpi
parents: 7471
diff changeset
273 }
7249
06a8e6a01180 fixed some problems with colorspace/init order, some cleanup
arpi
parents: 7243
diff changeset
274 }
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
275
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
276 mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32 video codec init OK!\n");
5153
7091d4c46685 fixed colorspace detection
arpi
parents: 5124
diff changeset
277 return 1;
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
278 }
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
279
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
280 // uninit driver
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
281 static void uninit(sh_video_t *sh){
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
282 HRESULT ret;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
283 vd_vfw_ctx *priv = sh->context;
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
284
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
285 #ifdef BUILD_VFWEX
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
286 ret = ICDecompressEndEx(priv->handle);
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
287 #else
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
288 ret = ICDecompressEnd(priv->handle);
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
289 #endif
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
290 if (ret)
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
291 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 15344
diff changeset
292 mp_msg(MSGT_WIN32, MSGL_WARN, "ICDecompressEnd failed: %ld\n", ret);
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
293 return;
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
294 }
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
295
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
296 ret = ICClose(priv->handle);
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
297 if (ret)
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
298 {
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 15344
diff changeset
299 mp_msg(MSGT_WIN32, MSGL_WARN, "ICClose failed: %ld\n", ret);
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
300 return;
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
301 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
302
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
303 free(priv->o_bih);
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
304 free(priv);
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
305 }
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
306
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
307 // decode a frame
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
308 static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
309 vd_vfw_ctx *priv = sh->context;
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
310 mp_image_t* mpi;
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
311 HRESULT ret;
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
312
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
313 if(len<=0) return NULL; // skipped frame
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
314
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
315 mpi=mpcodecs_get_image(sh,
6105
b77b984120f9 iive is right - we shouldn't use IP buffering for vfw. it was changed
arpi
parents: 5769
diff changeset
316 (sh->codec->outflags[sh->outfmtidx] & CODECS_FLAG_STATIC) ?
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
317 MP_IMGTYPE_STATIC : MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_WIDTH,
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
318 sh->disp_w, sh->disp_h);
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
319 if(!mpi){ // temporary!
18004
bcd805923554 Part2 of several printf2mp_msg changes in patch from Otvos Attila oattila AT chello DOT hu with LOTS of modifications by me
reynaldo
parents: 17977
diff changeset
320 mp_msg(MSGT_DECVIDEO,MSGL_WARN,MSGTR_MPCODECS_CouldntAllocateImageForCinepakCodec);
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
321 return NULL;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
322 }
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
323
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
324 // set stride: (trick discovered by Andreas Ackermann - thanx!)
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
325 sh->bih->biWidth=mpi->width; //mpi->stride[0]/(mpi->bpp/8);
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
326 priv->o_bih->biWidth=mpi->width; //mpi->stride[0]/(mpi->bpp/8);
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
327
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
328 sh->bih->biSizeImage = len;
7390
2357ee501582 fixed to comply with new loader
alex
parents: 7275
diff changeset
329
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
330 #ifdef BUILD_VFWEX
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
331 ret = ICDecompressEx(priv->handle,
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
332 #else
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
333 ret = ICDecompress(priv->handle,
7260
3e7a601c5874 - vfwex redundancy removed
arpi
parents: 7249
diff changeset
334 #endif
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
335 ( (sh->ds->flags&1) ? 0 : ICDECOMPRESS_NOTKEYFRAME ) |
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
336 ( ((flags&3)==2 && !(sh->ds->flags&1))?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ),
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
337 sh->bih, data, priv->o_bih, (flags&3) ? 0 : mpi->planes[0]);
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
338
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
339 if ((int)ret){
17366
934380353fd6 massive attack: mp_msg printf format fixes
rathann
parents: 15344
diff changeset
340 mp_msg(MSGT_DECVIDEO,MSGL_WARN,"Error decompressing frame, err=%ld\n",ret);
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
341 return NULL;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
342 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
343
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
344 // export palette:
7275
fb25090e525d 1000l - planar YUV support fixed (indeo 3,4,5, i263 etc)
arpi
parents: 7273
diff changeset
345 if(mpi->imgfmt==IMGFMT_RGB8 || mpi->imgfmt==IMGFMT_BGR8){
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
346 if (priv->palette)
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
347 {
7243
5f1f724f7046 correct palette handling and query_format support (now huffyuv, cram and mwv1 is working nice)
alex
parents: 7230
diff changeset
348 mpi->planes[1] = priv->palette;
7229
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
349 mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "Found and copied palette\n");
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
350 }
b4d025d64eb3 merged with dll_init
alex
parents: 7180
diff changeset
351 else
6232
f8e0eac1256c grayscaled palette support
arpi
parents: 6105
diff changeset
352 mpi->planes[1]=NULL;
7275
fb25090e525d 1000l - planar YUV support fixed (indeo 3,4,5, i263 etc)
arpi
parents: 7273
diff changeset
353 }
29263
0f1b5b68af32 whitespace cosmetics: Remove all trailing whitespace.
diego
parents: 28051
diff changeset
354
4968
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
355 return mpi;
236b06410b03 vfw, vfwex, odivx, divx4 added
arpi
parents:
diff changeset
356 }