Mercurial > mplayer.hg
annotate dll_init.c @ 2158:508468a75be0
new postprocess code by Michael Niedermayer (michaelni@gmx.at)
author | arpi |
---|---|
date | Wed, 10 Oct 2001 22:13:27 +0000 |
parents | fbf7ce9401ff |
children | ae59ad941b42 |
rev | line source |
---|---|
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
1 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
2 #include <stdio.h> |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
3 #include <stdlib.h> |
1430 | 4 #include <unistd.h> |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
5 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
6 #include "config.h" |
1567 | 7 #include "mp_msg.h" |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1653
diff
changeset
|
8 #include "help_mp.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
9 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
10 #include "stream.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
11 #include "demuxer.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
12 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
13 #include "loader.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
14 //#include "wine/mmreg.h" |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
1297
diff
changeset
|
15 #include "wine/vfw.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
16 #include "wine/avifmt.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
17 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
18 #include "codec-cfg.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
19 #include "stheader.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
20 |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
21 #include "dll_init.h" |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
22 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
23 #include "libvo/img_format.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
24 #include "linux/shmem.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
489
diff
changeset
|
25 |
2087 | 26 extern int divx_quality; |
27 | |
1 | 28 // ACM audio and VfW video codecs initialization |
29 // based on the avifile library [http://divx.euro.ru] | |
30 | |
296 | 31 int init_acm_audio_codec(sh_audio_t *sh_audio){ |
1 | 32 HRESULT ret; |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
414
diff
changeset
|
33 WAVEFORMATEX *in_fmt=sh_audio->wf; |
1 | 34 unsigned long srcsize=0; |
35 | |
1567 | 36 mp_msg(MSGT_WIN32,MSGL_V,"======= Win32 (ACM) AUDIO Codec init =======\n"); |
1 | 37 |
291 | 38 sh_audio->srcstream=NULL; |
1 | 39 |
291 | 40 sh_audio->o_wf.nChannels=in_fmt->nChannels; |
41 sh_audio->o_wf.nSamplesPerSec=in_fmt->nSamplesPerSec; | |
42 sh_audio->o_wf.nAvgBytesPerSec=2*sh_audio->o_wf.nSamplesPerSec*sh_audio->o_wf.nChannels; | |
43 sh_audio->o_wf.wFormatTag=WAVE_FORMAT_PCM; | |
44 sh_audio->o_wf.nBlockAlign=2*in_fmt->nChannels; | |
45 sh_audio->o_wf.wBitsPerSample=16; | |
46 sh_audio->o_wf.cbSize=0; | |
1 | 47 |
303 | 48 win32_codec_name = sh_audio->codec->dll; |
291 | 49 ret=acmStreamOpen(&sh_audio->srcstream,(HACMDRIVER)NULL, |
50 in_fmt,&sh_audio->o_wf, | |
1 | 51 NULL,0,0,0); |
52 if(ret){ | |
53 if(ret==ACMERR_NOTPOSSIBLE) | |
1567 | 54 mp_msg(MSGT_WIN32,MSGL_ERR,"ACM_Decoder: Unappropriate audio format\n"); |
1 | 55 else |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1653
diff
changeset
|
56 mp_msg(MSGT_WIN32,MSGL_ERR,"ACM_Decoder: acmStreamOpen error: %d", (int)ret); |
291 | 57 sh_audio->srcstream=NULL; |
1 | 58 return 0; |
59 } | |
1567 | 60 mp_msg(MSGT_WIN32,MSGL_V,"Audio codec opened OK! ;-)\n"); |
1 | 61 |
631 | 62 acmStreamSize(sh_audio->srcstream, in_fmt->nBlockAlign, &srcsize, ACM_STREAMSIZEF_SOURCE); |
758 | 63 //if(verbose) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n",srcsize); |
746 | 64 srcsize*=2; |
758 | 65 //if(srcsize<MAX_OUTBURST) srcsize=MAX_OUTBURST; |
66 if(!srcsize){ | |
1567 | 67 mp_msg(MSGT_WIN32,MSGL_WARN,"Warning! ACM codec reports srcsize=0\n"); |
758 | 68 srcsize=16384; |
69 } | |
70 // limit srcsize to 4-16kb | |
71 //while(srcsize && srcsize<4096) srcsize*=2; | |
72 //while(srcsize>16384) srcsize/=2; | |
291 | 73 sh_audio->audio_out_minsize=srcsize; // audio output min. size |
1567 | 74 mp_msg(MSGT_WIN32,MSGL_V,"Audio ACM output buffer min. size: %ld\n",srcsize); |
1 | 75 |
746 | 76 acmStreamSize(sh_audio->srcstream, srcsize, &srcsize, ACM_STREAMSIZEF_DESTINATION); |
291 | 77 sh_audio->audio_in_minsize=srcsize; // audio input min. size |
1567 | 78 mp_msg(MSGT_WIN32,MSGL_V,"Audio ACM input buffer min. size: %ld\n",srcsize); |
631 | 79 |
80 if(srcsize<in_fmt->nBlockAlign) srcsize=in_fmt->nBlockAlign; | |
1 | 81 |
631 | 82 sh_audio->a_in_buffer_size=2*sh_audio->audio_in_minsize; |
291 | 83 sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size); |
84 sh_audio->a_in_buffer_len=0; | |
92 | 85 |
1 | 86 return 1; |
87 } | |
88 | |
758 | 89 int acm_decode_audio(sh_audio_t *sh_audio, void* a_buffer,int minlen,int maxlen){ |
92 | 90 ACMSTREAMHEADER ash; |
91 HRESULT hr; | |
92 DWORD srcsize=0; | |
758 | 93 DWORD len=minlen; |
291 | 94 acmStreamSize(sh_audio->srcstream,len , &srcsize, ACM_STREAMSIZEF_DESTINATION); |
1567 | 95 mp_msg(MSGT_WIN32,MSGL_DBG3,"acm says: srcsize=%ld (buffsize=%d) out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,len); |
758 | 96 |
97 if(srcsize<sh_audio->wf->nBlockAlign){ | |
98 srcsize=sh_audio->wf->nBlockAlign; | |
99 acmStreamSize(sh_audio->srcstream, srcsize, &len, ACM_STREAMSIZEF_SOURCE); | |
100 if(len>maxlen) len=maxlen; | |
101 } | |
102 | |
291 | 103 // if(srcsize==0) srcsize=((WAVEFORMATEX *)&sh_audio->o_wf_ext)->nBlockAlign; |
104 if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!! | |
105 if(sh_audio->a_in_buffer_len<srcsize){ | |
106 sh_audio->a_in_buffer_len+= | |
107 demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], | |
108 srcsize-sh_audio->a_in_buffer_len); | |
92 | 109 } |
1567 | 110 mp_msg(MSGT_WIN32,MSGL_DBG3,"acm convert %d -> %d bytes\n",sh_audio->a_in_buffer_len,len); |
92 | 111 memset(&ash, 0, sizeof(ash)); |
112 ash.cbStruct=sizeof(ash); | |
113 ash.fdwStatus=0; | |
114 ash.dwUser=0; | |
291 | 115 ash.pbSrc=sh_audio->a_in_buffer; |
116 ash.cbSrcLength=sh_audio->a_in_buffer_len; | |
92 | 117 ash.pbDst=a_buffer; |
118 ash.cbDstLength=len; | |
291 | 119 hr=acmStreamPrepareHeader(sh_audio->srcstream,&ash,0); |
92 | 120 if(hr){ |
1567 | 121 mp_msg(MSGT_WIN32,MSGL_V,"ACM_Decoder: acmStreamPrepareHeader error %d\n",(int)hr); |
92 | 122 return -1; |
123 } | |
291 | 124 hr=acmStreamConvert(sh_audio->srcstream,&ash,0); |
92 | 125 if(hr){ |
1567 | 126 mp_msg(MSGT_WIN32,MSGL_DBG2,"ACM_Decoder: acmStreamConvert error %d\n",(int)hr); |
631 | 127 |
128 // return -1; | |
92 | 129 } |
1407 | 130 if(verbose>1) |
1567 | 131 mp_msg(MSGT_WIN32,MSGL_DBG2,"acm converted %d -> %d\n",ash.cbSrcLengthUsed,ash.cbDstLengthUsed); |
291 | 132 if(ash.cbSrcLengthUsed>=sh_audio->a_in_buffer_len){ |
133 sh_audio->a_in_buffer_len=0; | |
92 | 134 } else { |
291 | 135 sh_audio->a_in_buffer_len-=ash.cbSrcLengthUsed; |
136 memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[ash.cbSrcLengthUsed],sh_audio->a_in_buffer_len); | |
92 | 137 } |
138 len=ash.cbDstLengthUsed; | |
291 | 139 hr=acmStreamUnprepareHeader(sh_audio->srcstream,&ash,0); |
92 | 140 if(hr){ |
1567 | 141 mp_msg(MSGT_WIN32,MSGL_V,"ACM_Decoder: acmStreamUnprepareHeader error %d\n",(int)hr); |
92 | 142 } |
143 return len; | |
144 } | |
145 | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
146 int init_vfw_video_codec(sh_video_t *sh_video,int ex){ |
1 | 147 HRESULT ret; |
489
2bb59b7c748a
BGR modes with VfW codecs fixed - biCompression must be 0 for BGR...
arpi_esp
parents:
469
diff
changeset
|
148 int yuv=0; |
303 | 149 unsigned int outfmt=sh_video->codec->outfmt[sh_video->outfmtidx]; |
2087 | 150 unsigned char temp[1024]; |
151 int i; | |
1 | 152 |
1567 | 153 mp_msg(MSGT_WIN32,MSGL_V,"======= Win32 (VFW) VIDEO Codec init =======\n"); |
1 | 154 |
291 | 155 memset(&sh_video->o_bih, 0, sizeof(BITMAPINFOHEADER)); |
156 sh_video->o_bih.biSize = sizeof(BITMAPINFOHEADER); | |
1 | 157 |
303 | 158 win32_codec_name = sh_video->codec->dll; |
746 | 159 // sh_video->hic = ICOpen( 0x63646976, sh_video->bih->biCompression, ICMODE_FASTDECOMPRESS); |
160 sh_video->hic = ICOpen( 0x63646976, sh_video->bih->biCompression, ICMODE_DECOMPRESS); | |
291 | 161 if(!sh_video->hic){ |
1567 | 162 mp_msg(MSGT_WIN32,MSGL_ERR,"ICOpen failed! unknown codec / wrong parameters?\n"); |
1 | 163 return 0; |
164 } | |
165 | |
291 | 166 // sh_video->bih.biBitCount=32; |
1 | 167 |
2087 | 168 // Note: DivX.DLL overwrites 4 bytes _AFTER_ the o_bih header, so it corrupts |
169 // the sh_video struct content. We call it with an 1024-byte temp space and | |
170 // then copy out the data we need: | |
171 memset(temp,0x77,1024); | |
172 | |
173 ret = ICDecompressGetFormat(sh_video->hic, sh_video->bih, temp); | |
1 | 174 if(ret){ |
1567 | 175 mp_msg(MSGT_WIN32,MSGL_ERR,"ICDecompressGetFormat failed: Error %d\n", (int)ret); |
1 | 176 return 0; |
177 } | |
1567 | 178 mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressGetFormat OK\n"); |
1 | 179 |
2087 | 180 memcpy(&sh_video->o_bih,temp,sizeof(sh_video->o_bih)); |
181 // for(i=0;i<1024;i++) printf("%02X ",temp[i]); | |
182 | |
1 | 183 // printf("ICM_DECOMPRESS_QUERY=0x%X",ICM_DECOMPRESS_QUERY); |
184 | |
291 | 185 // sh_video->o_bih.biWidth=sh_video->bih.biWidth; |
186 // sh_video->o_bih.biCompression = 0x32315659; // mmioFOURCC('U','Y','V','Y'); | |
187 // ret=ICDecompressGetFormatSize(sh_video->hic,&sh_video->o_bih); | |
188 // sh_video->o_bih.biCompression = 3; //0x32315659; | |
189 // sh_video->o_bih.biCompression = mmioFOURCC('U','Y','V','Y'); | |
190 // sh_video->o_bih.biCompression = mmioFOURCC('U','Y','V','Y'); | |
191 // sh_video->o_bih.biCompression = mmioFOURCC('Y','U','Y','2'); | |
192 // sh_video->o_bih.biPlanes=3; | |
193 // sh_video->o_bih.biBitCount=16; | |
1 | 194 |
713 | 195 #if 0 |
196 // workaround for pegasus MJPEG: | |
197 if(!sh_video->o_bih.biWidth) sh_video->o_bih.biWidth=sh_video->bih->biWidth; | |
198 if(!sh_video->o_bih.biHeight) sh_video->o_bih.biHeight=sh_video->bih->biHeight; | |
199 if(!sh_video->o_bih.biPlanes) sh_video->o_bih.biPlanes=sh_video->bih->biPlanes; | |
200 #endif | |
408 | 201 |
202 switch (outfmt) { | |
203 | |
204 /* planar format */ | |
205 case IMGFMT_YV12: | |
206 case IMGFMT_I420: | |
207 case IMGFMT_IYUV: | |
208 sh_video->o_bih.biBitCount=12; | |
489
2bb59b7c748a
BGR modes with VfW codecs fixed - biCompression must be 0 for BGR...
arpi_esp
parents:
469
diff
changeset
|
209 yuv=1; |
467 | 210 break; |
1 | 211 |
408 | 212 /* packed format */ |
213 case IMGFMT_YUY2: | |
214 case IMGFMT_UYVY: | |
215 case IMGFMT_YVYU: | |
216 sh_video->o_bih.biBitCount=16; | |
489
2bb59b7c748a
BGR modes with VfW codecs fixed - biCompression must be 0 for BGR...
arpi_esp
parents:
469
diff
changeset
|
217 yuv=1; |
408 | 218 break; |
303 | 219 |
408 | 220 /* rgb/bgr format */ |
221 case IMGFMT_RGB8: | |
222 case IMGFMT_BGR8: | |
223 sh_video->o_bih.biBitCount=8; | |
224 break; | |
1 | 225 |
408 | 226 case IMGFMT_RGB15: |
227 case IMGFMT_RGB16: | |
228 case IMGFMT_BGR15: | |
229 case IMGFMT_BGR16: | |
230 sh_video->o_bih.biBitCount=16; | |
231 break; | |
232 | |
233 case IMGFMT_RGB24: | |
234 case IMGFMT_BGR24: | |
235 sh_video->o_bih.biBitCount=24; | |
236 break; | |
237 | |
238 case IMGFMT_RGB32: | |
239 case IMGFMT_BGR32: | |
240 sh_video->o_bih.biBitCount=32; | |
241 break; | |
1 | 242 |
408 | 243 default: |
1567 | 244 mp_msg(MSGT_WIN32,MSGL_ERR,"unsupported image format: 0x%x\n", outfmt); |
408 | 245 return 0; |
246 } | |
247 | |
248 sh_video->o_bih.biSizeImage = sh_video->o_bih.biWidth * sh_video->o_bih.biHeight * (sh_video->o_bih.biBitCount/8); | |
713 | 249 |
408 | 250 if(!(sh_video->codec->outflags[sh_video->outfmtidx]&CODECS_FLAG_FLIP)) { |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
414
diff
changeset
|
251 sh_video->o_bih.biHeight=-sh_video->bih->biHeight; // flip image! |
408 | 252 } |
1 | 253 |
489
2bb59b7c748a
BGR modes with VfW codecs fixed - biCompression must be 0 for BGR...
arpi_esp
parents:
469
diff
changeset
|
254 if(yuv && !(sh_video->codec->outflags[sh_video->outfmtidx] & CODECS_FLAG_YUVHACK)) |
408 | 255 sh_video->o_bih.biCompression = outfmt; |
759 | 256 else |
257 sh_video->o_bih.biCompression = 0; | |
1 | 258 |
259 if(verbose) { | |
260 printf("Starting decompression, format:\n"); | |
603 | 261 printf(" biSize %ld\n", sh_video->bih->biSize); |
262 printf(" biWidth %ld\n", sh_video->bih->biWidth); | |
263 printf(" biHeight %ld\n", sh_video->bih->biHeight); | |
432
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
414
diff
changeset
|
264 printf(" biPlanes %d\n", sh_video->bih->biPlanes); |
5251b0c57e39
sh_audio->wf and sh_video->bih changed to dynamic (thanx to Jens Hoffmann)
arpi_esp
parents:
414
diff
changeset
|
265 printf(" biBitCount %d\n", sh_video->bih->biBitCount); |
603 | 266 printf(" biCompression 0x%lx ('%.4s')\n", sh_video->bih->biCompression, (char *)&sh_video->bih->biCompression); |
267 printf(" biSizeImage %ld\n", sh_video->bih->biSizeImage); | |
1 | 268 printf("Dest fmt:\n"); |
603 | 269 printf(" biSize %ld\n", sh_video->o_bih.biSize); |
270 printf(" biWidth %ld\n", sh_video->o_bih.biWidth); | |
271 printf(" biHeight %ld\n", sh_video->o_bih.biHeight); | |
291 | 272 printf(" biPlanes %d\n", sh_video->o_bih.biPlanes); |
273 printf(" biBitCount %d\n", sh_video->o_bih.biBitCount); | |
603 | 274 printf(" biCompression 0x%lx ('%.4s')\n", sh_video->o_bih.biCompression, (char *)&sh_video->o_bih.biCompression); |
275 printf(" biSizeImage %ld\n", sh_video->o_bih.biSizeImage); | |
1 | 276 } |
277 | |
1297 | 278 ret = ex ? |
279 ICDecompressQueryEx(sh_video->hic, sh_video->bih, &sh_video->o_bih) : | |
280 ICDecompressQuery(sh_video->hic, sh_video->bih, &sh_video->o_bih); | |
1 | 281 if(ret){ |
1567 | 282 mp_msg(MSGT_WIN32,MSGL_ERR,"ICDecompressQuery failed: Error %d\n", (int)ret); |
1 | 283 return 0; |
284 } | |
1567 | 285 mp_msg(MSGT_WIN32,MSGL_V,"ICDecompressQuery OK\n"); |
1 | 286 |
1297 | 287 ret = ex ? |
288 ICDecompressBeginEx(sh_video->hic, sh_video->bih, &sh_video->o_bih) : | |
289 ICDecompressBegin(sh_video->hic, sh_video->bih, &sh_video->o_bih); | |
1 | 290 if(ret){ |
1567 | 291 mp_msg(MSGT_WIN32,MSGL_ERR,"ICDecompressBegin failed: Error %d\n", (int)ret); |
1 | 292 return 0; |
293 } | |
294 | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
295 sh_video->our_out_buffer = (char*)memalign(64,sh_video->o_bih.biSizeImage); |
291 | 296 if(!sh_video->our_out_buffer){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1653
diff
changeset
|
297 mp_msg(MSGT_WIN32,MSGL_ERR,MSGTR_NoMemForDecodedImage, sh_video->o_bih.biSizeImage); |
1 | 298 return 0; |
299 } | |
300 | |
489
2bb59b7c748a
BGR modes with VfW codecs fixed - biCompression must be 0 for BGR...
arpi_esp
parents:
469
diff
changeset
|
301 if(yuv && sh_video->codec->outflags[sh_video->outfmtidx] & CODECS_FLAG_YUVHACK) |
469 | 302 sh_video->o_bih.biCompression = outfmt; |
1 | 303 |
304 // avi_header.our_in_buffer=malloc(avi_header.video.dwSuggestedBufferSize); // FIXME!!!! | |
2087 | 305 |
306 ICSendMessage(sh_video->hic, ICM_USER+80, (long)(&divx_quality) ,NULL); | |
307 | |
1567 | 308 mp_msg(MSGT_WIN32,MSGL_V,"VIDEO CODEC Init OK!!! ;-)\n"); |
1 | 309 return 1; |
310 } | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
311 |
2087 | 312 int vfw_set_postproc(sh_video_t* sh_video,int quality){ |
313 // Works only with opendivx/divx4 based DLL | |
314 return ICSendMessage(sh_video->hic, ICM_USER+80, (long)(&quality) ,NULL); | |
315 } | |
316 | |
2049
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
317 int vfw_decode_video(sh_video_t* sh_video,void* start,int in_size,int drop_frame,int ex){ |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
318 HRESULT ret; |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
319 |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
320 sh_video->bih->biSizeImage = in_size; |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
321 |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
322 if(ex) |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
323 ret = ICDecompressEx(sh_video->hic, |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
324 ( (sh_video->ds->flags&1) ? 0 : ICDECOMPRESS_NOTKEYFRAME ) | |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
325 ( (drop_frame==2 && !(sh_video->ds->flags&1))?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ) , |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
326 sh_video->bih, start, |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
327 &sh_video->o_bih, |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
328 drop_frame ? 0 : sh_video->our_out_buffer); |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
329 else |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
330 ret = ICDecompress(sh_video->hic, |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
331 ( (sh_video->ds->flags&1) ? 0 : ICDECOMPRESS_NOTKEYFRAME ) | |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
332 ( (drop_frame==2 && !(sh_video->ds->flags&1))?(ICDECOMPRESS_HURRYUP|ICDECOMPRESS_PREROL):0 ) , |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
333 sh_video->bih, start, |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
334 &sh_video->o_bih, |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
335 drop_frame ? 0 : sh_video->our_out_buffer); |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
336 |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
337 return (int)ret; |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
338 } |
df41903fd7d7
VfW stuff moved to dll_init, warnings fixed, using dll_init.h
arpi
parents:
1973
diff
changeset
|
339 |