From aebfbbf2bdda8e18beef90c16da97bd335f7d3b0 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 12 Aug 2012 15:30:21 +0200 Subject: Remove win32/qt/xanim/real binary codecs loading Remove the win32 loader - the win32 emulation layer, as well as the code for using DirectShow/DMO/VFW codecs. Remove loading of xanim, QuickTime, and RealMedia codecs. The win32 emulation layer is based on a very old version of wine. Apparently, wine code was copied and hacked until it was somehow able to load a limited collection of binary codecs. It poked around in the code segment of some known binary codecs to disable unsupported win32 API calls to make them work. Example from module.c: for (i=0;i<5;i++) RVA(0x19e842)[i]=0x90; // make_new_region ? for (i=0;i<28;i++) RVA(0x19e86d)[i]=0x90; // call__call_CreateCompatibleDC ? for (i=0;i<5;i++) RVA(0x19e898)[i]=0x90; // jmp_to_call_loadbitmap ? for (i=0;i<9;i++) RVA(0x19e8ac)[i]=0x90; // call__calls_OLE_shit ? for (i=0;i<106;i++) RVA(0x261b10)[i]=0x90; // disable threads Just to show how utterly insane this code is. You wouldn't want even your worst enemy to have to maintain this. In fact, it seems nobody made major changes to this code ever since it was committed. Most formats can be decoded by libavcodecs these days, and the loader couldn't be used on 64 bit platforms anyway. The same is (probably) true for the other binary codecs. General note about how support for win32 codecs could be added back: It's not possible to replace the win32 loader code by using wine as library, because modern wine can not be linked with native Linux programs for certain reasons. It would be possible to to move DirectShow video decoding into a separate process linked with wine, like the CoreAVC-for-Linux patches do. There is also the mplayer-ww fork, which uses the dshownative library to use DirectShow codecs on Windows. --- libmpcodecs/ad.c | 19 -- libmpcodecs/ad_acm.c | 259 -------------- libmpcodecs/ad_dmo.c | 126 ------- libmpcodecs/ad_dshow.c | 114 ------- libmpcodecs/ad_qtaudio.c | 353 -------------------- libmpcodecs/ad_realaud.c | 463 ------------------------- libmpcodecs/vd.c | 20 -- libmpcodecs/vd_dmo.c | 134 -------- libmpcodecs/vd_dshow.c | 133 -------- libmpcodecs/vd_qtvideo.c | 321 ------------------ libmpcodecs/vd_realvid.c | 453 ------------------------- libmpcodecs/vd_vfw.c | 355 -------------------- libmpcodecs/vd_vfwex.c | 4 - libmpcodecs/vd_xanim.c | 854 ----------------------------------------------- 14 files changed, 3608 deletions(-) delete mode 100644 libmpcodecs/ad_acm.c delete mode 100644 libmpcodecs/ad_dmo.c delete mode 100644 libmpcodecs/ad_dshow.c delete mode 100644 libmpcodecs/ad_qtaudio.c delete mode 100644 libmpcodecs/ad_realaud.c delete mode 100644 libmpcodecs/vd_dmo.c delete mode 100644 libmpcodecs/vd_dshow.c delete mode 100644 libmpcodecs/vd_qtvideo.c delete mode 100644 libmpcodecs/vd_realvid.c delete mode 100644 libmpcodecs/vd_vfw.c delete mode 100644 libmpcodecs/vd_vfwex.c delete mode 100644 libmpcodecs/vd_xanim.c (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c index 2e67bd23af..d1e3c91430 100644 --- a/libmpcodecs/ad.c +++ b/libmpcodecs/ad.c @@ -40,15 +40,9 @@ extern const ad_functions_t mpcodecs_ad_pcm; extern const ad_functions_t mpcodecs_ad_dvdpcm; extern const ad_functions_t mpcodecs_ad_alaw; extern const ad_functions_t mpcodecs_ad_imaadpcm; -extern const ad_functions_t mpcodecs_ad_msadpcm; -extern const ad_functions_t mpcodecs_ad_dshow; -extern const ad_functions_t mpcodecs_ad_dmo; -extern const ad_functions_t mpcodecs_ad_acm; extern const ad_functions_t mpcodecs_ad_faad; extern const ad_functions_t mpcodecs_ad_libmad; -extern const ad_functions_t mpcodecs_ad_realaud; extern const ad_functions_t mpcodecs_ad_libdv; -extern const ad_functions_t mpcodecs_ad_qtaudio; extern const ad_functions_t mpcodecs_ad_spdif; extern const ad_functions_t mpcodecs_ad_libdca; @@ -68,25 +62,12 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = &mpcodecs_ad_dvdpcm, &mpcodecs_ad_alaw, &mpcodecs_ad_imaadpcm, - &mpcodecs_ad_msadpcm, -#ifdef CONFIG_WIN32DLL - &mpcodecs_ad_dshow, - &mpcodecs_ad_dmo, - &mpcodecs_ad_acm, - &mpcodecs_ad_twin, -#endif -#ifdef CONFIG_QTX_CODECS - &mpcodecs_ad_qtaudio, -#endif #ifdef CONFIG_FAAD &mpcodecs_ad_faad, #endif #ifdef CONFIG_LIBMAD &mpcodecs_ad_libmad, #endif -#ifdef CONFIG_REALCODECS - &mpcodecs_ad_realaud, -#endif #ifdef CONFIG_LIBDV095 &mpcodecs_ad_libdv, #endif diff --git a/libmpcodecs/ad_acm.c b/libmpcodecs/ad_acm.c deleted file mode 100644 index 1b1184a06a..0000000000 --- a/libmpcodecs/ad_acm.c +++ /dev/null @@ -1,259 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include - -#include "config.h" -#include "mp_msg.h" -#include "libmpdemux/aviprint.h" -#include "loader/wineacm.h" - -#include "ad_internal.h" -#include "osdep/timer.h" - -static const ad_info_t info = -{ - "Win32/ACM decoders", - "acm", - "A'rpi", - "A'rpi & Alex", - "" -}; - -LIBAD_EXTERN(acm) - -typedef struct { - WAVEFORMATEX *o_wf; - HACMSTREAM handle; -} acm_context_t; - -static int init(sh_audio_t *sh_audio) -{ - int ret=decode_audio(sh_audio,sh_audio->a_buffer,4096,sh_audio->a_buffer_size); - if(ret<0){ - mp_msg(MSGT_DECAUDIO,MSGL_INFO,"ACM decoding error: %d\n",ret); - return 0; - } - sh_audio->a_buffer_len=ret; - return 1; -} - -static int preinit(sh_audio_t *sh_audio) -{ - HRESULT ret; - WAVEFORMATEX *in_fmt = sh_audio->wf; - DWORD srcsize = 0; - acm_context_t *priv; - - priv = malloc(sizeof(acm_context_t)); - if (!priv) - return 0; - sh_audio->context = priv; - - mp_msg(MSGT_WIN32, MSGL_V, "======= Win32 (ACM) AUDIO Codec init =======\n"); - -// priv->handle = NULL; - - priv->o_wf = malloc(sizeof(*priv->o_wf)); - if (!priv->o_wf) - { - mp_tmsg(MSGT_DECAUDIO,MSGL_ERR,"Could not load/initialize Win32/ACM audio codec (missing DLL file?).\n"); - return 0; - } - - priv->o_wf->nChannels = in_fmt->nChannels; - priv->o_wf->nSamplesPerSec = in_fmt->nSamplesPerSec; - priv->o_wf->nAvgBytesPerSec = 2*in_fmt->nSamplesPerSec*in_fmt->nChannels; - priv->o_wf->wFormatTag = WAVE_FORMAT_PCM; - priv->o_wf->nBlockAlign = 2*in_fmt->nChannels; - priv->o_wf->wBitsPerSample = 16; -// priv->o_wf->wBitsPerSample = inf_fmt->wBitsPerSample; - priv->o_wf->cbSize = 0; - - if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) - { - mp_msg(MSGT_DECAUDIO, MSGL_V, "Input format:\n"); - print_wave_header(in_fmt, MSGL_V); - mp_msg(MSGT_DECAUDIO, MSGL_V, "Output format:\n"); - print_wave_header(priv->o_wf, MSGL_V); - } - - MSACM_RegisterDriver((const char *)sh_audio->codec->dll, in_fmt->wFormatTag, 0); - ret = acmStreamOpen(&priv->handle, (HACMDRIVER)NULL, in_fmt, - priv->o_wf, NULL, 0, 0, 0); - if (ret) - { - if (ret == ACMERR_NOTPOSSIBLE) - mp_msg(MSGT_WIN32, MSGL_ERR, "ACM_Decoder: Unappropriate audio format\n"); - else - mp_msg(MSGT_WIN32, MSGL_ERR, "ACM_Decoder: acmStreamOpen error: %d\n", - (int)ret); - mp_tmsg(MSGT_DECAUDIO,MSGL_ERR,"Could not load/initialize Win32/ACM audio codec (missing DLL file?).\n"); - return 0; - } - mp_msg(MSGT_WIN32, MSGL_V, "Audio codec opened OK! ;-)\n"); - - acmStreamSize(priv->handle, in_fmt->nBlockAlign, &srcsize, ACM_STREAMSIZEF_SOURCE); - //if ( mp_msg_test(MSGT_DECAUDIO,MSGL_V) ) printf("Audio ACM output buffer min. size: %ld (reported by codec)\n", srcsize); - srcsize *= 2; - //if (srcsize < MAX_OUTBURST) srcsize = MAX_OUTBURST; - if (!srcsize) - { - mp_msg(MSGT_WIN32, MSGL_WARN, "Warning! ACM codec reports srcsize=0\n"); - srcsize = 16384; - } - // limit srcsize to 4-16kb - //while(srcsize && srcsize<4096) srcsize*=2; - //while(srcsize>16384) srcsize/=2; - sh_audio->audio_out_minsize=srcsize; // audio output min. size - mp_msg(MSGT_WIN32,MSGL_V,"Audio ACM output buffer min. size: %ld\n",srcsize); - - acmStreamSize(priv->handle, srcsize, &srcsize, ACM_STREAMSIZEF_DESTINATION); -// if(srcsizenBlockAlign) srcsize=in_fmt->nBlockAlign; - - if (!srcsize) - { - mp_msg(MSGT_WIN32, MSGL_WARN, "Warning! ACM codec reports srcsize=0\n"); - srcsize = 2*in_fmt->nBlockAlign; - } - - mp_msg(MSGT_WIN32,MSGL_V,"Audio ACM input buffer min. size: %ld\n",srcsize); - - sh_audio->audio_in_minsize=2*srcsize; // audio input min. size - - sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; - sh_audio->channels=priv->o_wf->nChannels; - sh_audio->samplerate=priv->o_wf->nSamplesPerSec; - sh_audio->samplesize=2; - - mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/ACM audio codec init OK!\n"); - return 1; -} - -static void uninit(sh_audio_t *sh) -{ - HRESULT ret; - acm_context_t *priv = sh->context; - -retry: - ret = acmStreamClose(priv->handle, 0); - - if (ret) - switch(ret) - { - case ACMERR_BUSY: - case ACMERR_CANCELED: - mp_msg(MSGT_WIN32, MSGL_DBG2, "ACM_Decoder: stream busy, waiting..\n"); - usec_sleep(100000000); - goto retry; - case ACMERR_UNPREPARED: - case ACMERR_NOTPOSSIBLE: - return; - default: - mp_msg(MSGT_WIN32, MSGL_WARN, "ACM_Decoder: unknown error occurred: %ld\n", ret); - return; - } - - MSACM_UnregisterAllDrivers(); - - free(priv->o_wf); - free(priv); -} - -static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...) -{ - int skip; - switch(cmd) - { - case ADCTRL_SKIP_FRAME: - skip=sh_audio->wf->nBlockAlign; - if(skip<16){ - skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7); - if(skip<16) skip=16; - } - demux_read_data(sh_audio->ds,NULL,skip); - return CONTROL_TRUE; - } - return CONTROL_UNKNOWN; -} - -static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) -{ - ACMSTREAMHEADER ash; - HRESULT hr; - DWORD srcsize=0; - DWORD len=minlen; - acm_context_t *priv = sh_audio->context; - - acmStreamSize(priv->handle, len, &srcsize, ACM_STREAMSIZEF_DESTINATION); - mp_msg(MSGT_WIN32,MSGL_DBG3,"acm says: srcsize=%ld (buffsize=%d) out_size=%ld\n",srcsize,sh_audio->a_in_buffer_size,len); - - if(srcsizewf->nBlockAlign){ - srcsize=sh_audio->wf->nBlockAlign; - acmStreamSize(priv->handle, srcsize, &len, ACM_STREAMSIZEF_SOURCE); - if(len>maxlen) len=maxlen; - } - -// if(srcsize==0) srcsize=((WAVEFORMATEX *)&sh_audio->o_wf_ext)->nBlockAlign; - if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!! - if(sh_audio->a_in_buffer_lena_in_buffer_len+= - demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], - srcsize-sh_audio->a_in_buffer_len); - } - mp_msg(MSGT_WIN32,MSGL_DBG3,"acm convert %d -> %ld bytes\n",sh_audio->a_in_buffer_len,len); - memset(&ash, 0, sizeof(ash)); - ash.cbStruct=sizeof(ash); - ash.fdwStatus=0; - ash.dwUser=0; - ash.pbSrc=sh_audio->a_in_buffer; - ash.cbSrcLength=sh_audio->a_in_buffer_len; - ash.pbDst=buf; - ash.cbDstLength=len; - hr=acmStreamPrepareHeader(priv->handle,&ash,0); - if(hr){ - mp_msg(MSGT_WIN32,MSGL_V,"ACM_Decoder: acmStreamPrepareHeader error %d\n",(int)hr); - return -1; - } - hr=acmStreamConvert(priv->handle,&ash,0); - if(hr){ - mp_msg(MSGT_WIN32,MSGL_DBG2,"ACM_Decoder: acmStreamConvert error %d\n",(int)hr); - switch(hr) - { - case ACMERR_NOTPOSSIBLE: - case ACMERR_UNPREPARED: - mp_msg(MSGT_WIN32, MSGL_DBG2, "ACM_Decoder: acmStreamConvert error: probarly not initialized!\n"); - } -// return -1; - } - mp_msg(MSGT_WIN32,MSGL_DBG2,"acm converted %ld -> %ld\n",ash.cbSrcLengthUsed,ash.cbDstLengthUsed); - if(ash.cbSrcLengthUsed>=sh_audio->a_in_buffer_len){ - sh_audio->a_in_buffer_len=0; - } else { - sh_audio->a_in_buffer_len-=ash.cbSrcLengthUsed; - memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[ash.cbSrcLengthUsed],sh_audio->a_in_buffer_len); - } - len=ash.cbDstLengthUsed; - hr=acmStreamUnprepareHeader(priv->handle,&ash,0); - if(hr){ - mp_msg(MSGT_WIN32,MSGL_V,"ACM_Decoder: acmStreamUnprepareHeader error %d\n",(int)hr); - } - return len; -} diff --git a/libmpcodecs/ad_dmo.c b/libmpcodecs/ad_dmo.c deleted file mode 100644 index 714651a7e4..0000000000 --- a/libmpcodecs/ad_dmo.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include - -#include "config.h" -#include "options.h" -#include "mp_msg.h" - -#include "ad_internal.h" -#include "libaf/reorder_ch.h" - -static const ad_info_t info = -{ - "Win32/DMO decoders", - "dmo", - "A'rpi", - "avifile.sf.net", - "" -}; - -LIBAD_EXTERN(dmo) - -#include "loader/dmo/DMO_AudioDecoder.h" - -static int init(sh_audio_t *sh) -{ - return 1; -} - -static int preinit(sh_audio_t *sh_audio) -{ - struct MPOpts *opts = sh_audio->opts; - DMO_AudioDecoder* ds_adec; - int chans=(opts->audio_output_channels==sh_audio->wf->nChannels) ? - opts->audio_output_channels : (sh_audio->wf->nChannels>=2 ? 2 : 1); - if(!(ds_adec=DMO_AudioDecoder_Open(sh_audio->codec->dll,&sh_audio->codec->guid,sh_audio->wf,chans))) - { - mp_tmsg(MSGT_DECAUDIO,MSGL_ERR,"ERROR: Could not open required DirectShow codec %s.\n",sh_audio->codec->dll); - return 0; - } - sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; - sh_audio->channels=chans; - sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; - sh_audio->samplesize=2; - sh_audio->audio_in_minsize=4*sh_audio->wf->nBlockAlign; - if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192; - sh_audio->audio_out_minsize=4*16384; - sh_audio->context = ds_adec; - mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DMO audio codec init OK!\n"); - return 1; -} - -static void uninit(sh_audio_t *sh) -{ - DMO_AudioDecoder* ds_adec = sh->context; - DMO_AudioDecoder_Destroy(ds_adec); -} - -static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...) -{ - int skip; - switch(cmd) - { - case ADCTRL_SKIP_FRAME: - skip=sh_audio->wf->nBlockAlign; - if(skip<16){ - skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7); - if(skip<16) skip=16; - } - demux_read_data(sh_audio->ds,NULL,skip); - return CONTROL_TRUE; - } - return CONTROL_UNKNOWN; -} - -static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) -{ - DMO_AudioDecoder* ds_adec = sh_audio->context; -// int len=-1; - int size_in=0; - int size_out=0; - int srcsize=DMO_AudioDecoder_GetSrcSize(ds_adec, maxlen); - mp_msg(MSGT_DECAUDIO,MSGL_DBG3,"DMO says: srcsize=%d (buffsize=%d) out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,maxlen); - if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!! - if(sh_audio->a_in_buffer_lena_in_buffer_len+= - demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], - srcsize-sh_audio->a_in_buffer_len); - } - DMO_AudioDecoder_Convert(ds_adec, sh_audio->a_in_buffer,sh_audio->a_in_buffer_len, - buf,maxlen, &size_in,&size_out); - mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"DMO: audio %d -> %d converted (in_buf_len=%d of %d) %d\n",size_in,size_out,sh_audio->a_in_buffer_len,sh_audio->a_in_buffer_size,ds_tell_pts(sh_audio->ds)); - if(size_in>=sh_audio->a_in_buffer_len){ - sh_audio->a_in_buffer_len=0; - } else { - sh_audio->a_in_buffer_len-=size_in; - memmove(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[size_in],sh_audio->a_in_buffer_len); - } - if (size_out > 0 && sh_audio->channels >= 5) { - reorder_channel_nch(buf, AF_CHANNEL_LAYOUT_WAVEEX_DEFAULT, - AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT, - sh_audio->channels, - size_out / sh_audio->samplesize, - sh_audio->samplesize); - } -// len=size_out; - return size_out; -} diff --git a/libmpcodecs/ad_dshow.c b/libmpcodecs/ad_dshow.c deleted file mode 100644 index 8fb94660a4..0000000000 --- a/libmpcodecs/ad_dshow.c +++ /dev/null @@ -1,114 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include - -#include "config.h" -#include "mp_msg.h" - -#include "ad_internal.h" - -static const ad_info_t info = -{ - "Win32/DirectShow decoders", - "dshow", - "Nick Kurshev", - "avifile.sf.net", - "" -}; - -LIBAD_EXTERN(dshow) - -#include "loader/dshow/DS_AudioDecoder.h" - -static int init(sh_audio_t *sh) -{ - return 1; -} - -static int preinit(sh_audio_t *sh_audio) -{ - DS_AudioDecoder* ds_adec; - if(!(ds_adec=DS_AudioDecoder_Open(sh_audio->codec->dll,&sh_audio->codec->guid,sh_audio->wf))) - { - mp_tmsg(MSGT_DECAUDIO,MSGL_ERR,"ERROR: Could not open required DirectShow codec %s.\n",sh_audio->codec->dll); - return 0; - } - sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec; - sh_audio->channels=sh_audio->wf->nChannels; - sh_audio->samplerate=sh_audio->wf->nSamplesPerSec; - sh_audio->samplesize=2; - sh_audio->audio_in_minsize=2*sh_audio->wf->nBlockAlign; - if(sh_audio->audio_in_minsize<8192) sh_audio->audio_in_minsize=8192; - sh_audio->audio_out_minsize=16384; - sh_audio->context = ds_adec; - mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DShow audio codec init OK!\n"); - return 1; -} - -static void uninit(sh_audio_t *sh) -{ - DS_AudioDecoder* ds_adec = sh->context; - DS_AudioDecoder_Destroy(ds_adec); -} - -static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...) -{ - int skip; - switch(cmd) - { - case ADCTRL_SKIP_FRAME: - skip=sh_audio->wf->nBlockAlign; - if(skip<16){ - skip=(sh_audio->wf->nAvgBytesPerSec/16)&(~7); - if(skip<16) skip=16; - } - demux_read_data(sh_audio->ds,NULL,skip); - return CONTROL_TRUE; - } - return CONTROL_UNKNOWN; -} - -static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int maxlen) -{ - DS_AudioDecoder* ds_adec = sh_audio->context; -// int len=-1; - int size_in=0; - int size_out=0; - int srcsize=DS_AudioDecoder_GetSrcSize(ds_adec, maxlen); - mp_msg(MSGT_DECAUDIO,MSGL_DBG3,"DShow says: srcsize=%d (buffsize=%d) out_size=%d\n",srcsize,sh_audio->a_in_buffer_size,maxlen); - if(srcsize>sh_audio->a_in_buffer_size) srcsize=sh_audio->a_in_buffer_size; // !!!!!! - if(sh_audio->a_in_buffer_lena_in_buffer_len+= - demux_read_data(sh_audio->ds,&sh_audio->a_in_buffer[sh_audio->a_in_buffer_len], - srcsize-sh_audio->a_in_buffer_len); - } - DS_AudioDecoder_Convert(ds_adec, sh_audio->a_in_buffer,sh_audio->a_in_buffer_len, - buf,maxlen, &size_in,&size_out); - mp_dbg(MSGT_DECAUDIO,MSGL_DBG2,"DShow: audio %d -> %d converted (in_buf_len=%d of %d) %d\n",size_in,size_out,sh_audio->a_in_buffer_len,sh_audio->a_in_buffer_size,ds_tell_pts(sh_audio->ds)); - if(size_in>=sh_audio->a_in_buffer_len){ - sh_audio->a_in_buffer_len=0; - } else { - sh_audio->a_in_buffer_len-=size_in; - memcpy(sh_audio->a_in_buffer,&sh_audio->a_in_buffer[size_in],sh_audio->a_in_buffer_len); - } -// len=size_out; - return size_out; -} diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c deleted file mode 100644 index 1edd87cd17..0000000000 --- a/libmpcodecs/ad_qtaudio.c +++ /dev/null @@ -1,353 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include -#include - -#include "config.h" -#include "mp_msg.h" -#include "mpbswap.h" -#include "ad_internal.h" - -#ifdef CONFIG_QUICKTIME -#include -#else -#include "loader/ldt_keeper.h" -#include "loader/wine/winbase.h" -#include "loader/wine/windef.h" -#endif - -static const ad_info_t info = { - "QuickTime Audio Decoder", - "qtaudio", - "A'rpi", - "Sascha Sommer", - "uses win32 quicktime DLLs" -}; - -LIBAD_EXTERN(qtaudio) - -#ifndef CONFIG_QUICKTIME -typedef struct OpaqueSoundConverter* SoundConverter; -typedef unsigned long OSType; -typedef unsigned long UnsignedFixed; -typedef uint8_t Byte; -typedef struct SoundComponentData { - long flags; - OSType format; - short numChannels; - short sampleSize; - UnsignedFixed sampleRate; - long sampleCount; - Byte * buffer; - long reserved; -}SoundComponentData; - -typedef int (__cdecl* LPFUNC1)(long flag); -typedef int (__cdecl* LPFUNC2)(const SoundComponentData *, const SoundComponentData *,SoundConverter *); -typedef int (__cdecl* LPFUNC3)(SoundConverter sc); -typedef int (__cdecl* LPFUNC4)(void); -typedef int (__cdecl* LPFUNC5)(SoundConverter sc, OSType selector,void * infoPtr); -typedef int (__cdecl* LPFUNC6)(SoundConverter sc, - unsigned long inputBytesTarget, - unsigned long *inputFrames, - unsigned long *inputBytes, - unsigned long *outputBytes ); -typedef int (__cdecl* LPFUNC7)(SoundConverter sc, - const void *inputPtr, - unsigned long inputFrames, - void *outputPtr, - unsigned long *outputFrames, - unsigned long *outputBytes ); -typedef int (__cdecl* LPFUNC8)(SoundConverter sc, - void *outputPtr, - unsigned long *outputFrames, - unsigned long *outputBytes); -typedef int (__cdecl* LPFUNC9)(SoundConverter sc) ; - -static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts -static HINSTANCE qtml_dll; -static LPFUNC1 InitializeQTML; -static LPFUNC2 SoundConverterOpen; -static LPFUNC3 SoundConverterClose; -static LPFUNC4 TerminateQTML; -static LPFUNC5 SoundConverterSetInfo; -static LPFUNC6 SoundConverterGetBufferSizes; -static LPFUNC7 SoundConverterConvertBuffer; -static LPFUNC8 SoundConverterEndConversion; -static LPFUNC9 SoundConverterBeginConversion; - -#define siDecompressionParams 2002876005 // siDecompressionParams = FOUR_CHAR_CODE('wave') - -static int loader_init(void) -{ - -#ifdef WIN32_LOADER - Setup_LDT_Keeper(); -#endif - //preload quicktime.qts to avoid the problems caused by the hardcoded path inside the dll - qtime_qts = LoadLibraryA("QuickTime.qts"); - if( qtime_qts == (HMODULE)NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading QuickTime.qts\n" ); - return 1; - } - qtml_dll = LoadLibraryA("qtmlClient.dll"); - if( qtml_dll == (HMODULE)NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading qtmlClient.dll\n" ); - return 1; - } - InitializeQTML = (LPFUNC1)GetProcAddress(qtml_dll,"InitializeQTML"); - if ( InitializeQTML == NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed geting proc address InitializeQTML\n"); - return 1; - } - SoundConverterOpen = (LPFUNC2)GetProcAddress(qtml_dll,"SoundConverterOpen"); - if ( SoundConverterOpen == NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterOpen\n"); - return 1; - } - SoundConverterClose = (LPFUNC3)GetProcAddress(qtml_dll,"SoundConverterClose"); - if ( SoundConverterClose == NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterClose\n"); - return 1; - } - TerminateQTML = (LPFUNC4)GetProcAddress(qtml_dll,"TerminateQTML"); - if ( TerminateQTML == NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address TerminateQTML\n"); - return 1; - } - SoundConverterSetInfo = (LPFUNC5)GetProcAddress(qtml_dll,"SoundConverterSetInfo"); - if ( SoundConverterSetInfo == NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterSetInfo\n"); - return 1; - } - SoundConverterGetBufferSizes = (LPFUNC6)GetProcAddress(qtml_dll,"SoundConverterGetBufferSizes"); - if ( SoundConverterGetBufferSizes == NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterGetBufferSizes\n"); - return 1; - } - SoundConverterConvertBuffer = (LPFUNC7)GetProcAddress(qtml_dll,"SoundConverterConvertBuffer"); - if ( SoundConverterConvertBuffer == NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterConvertBuffer1\n"); - return 1; - } - SoundConverterEndConversion = (LPFUNC8)GetProcAddress(qtml_dll,"SoundConverterEndConversion"); - if ( SoundConverterEndConversion == NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterEndConversion\n"); - return 1; - } - SoundConverterBeginConversion = (LPFUNC9)GetProcAddress(qtml_dll,"SoundConverterBeginConversion"); - if ( SoundConverterBeginConversion == NULL ) - { - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed getting proc address SoundConverterBeginConversion\n"); - return 1; - } - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE???\n"); - return 0; -} -#endif /* #ifndef CONFIG_QUICKTIME */ - -static SoundConverter myConverter = NULL; -static SoundComponentData InputFormatInfo,OutputFormatInfo; - -static int InFrameSize; -static int OutFrameSize; - -static int preinit(sh_audio_t *sh){ - int error; - unsigned long FramesToGet=0; //how many frames the demuxer has to get - unsigned long InputBufferSize=0; //size of the input buffer - unsigned long OutputBufferSize=0; //size of the output buffer - unsigned long WantedBufferSize=0; //the size you want your buffers to be - void* codecdata = sh->codecdata; - - if (!sh->codecdata_len && sh->wf && sh->wf->cbSize){ - codecdata = sh->wf + 1; - } - -#ifdef CONFIG_QUICKTIME - EnterMovies(); -#else - if(loader_init()) return 0; // failed to load DLL - - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"loader_init DONE!\n"); - - error = InitializeQTML(6+16); - if(error){ - mp_msg(MSGT_DECAUDIO,MSGL_ERR,"InitializeQTML:%i\n",error); - return 0; - } -#endif - - OutputFormatInfo.flags = InputFormatInfo.flags = 0; - OutputFormatInfo.sampleCount = InputFormatInfo.sampleCount = 0; - OutputFormatInfo.buffer = InputFormatInfo.buffer = NULL; - OutputFormatInfo.reserved = InputFormatInfo.reserved = 0; - OutputFormatInfo.numChannels = InputFormatInfo.numChannels = sh->wf->nChannels; - InputFormatInfo.sampleSize = sh->wf->wBitsPerSample; - OutputFormatInfo.sampleSize = 16; - OutputFormatInfo.sampleRate = InputFormatInfo.sampleRate = sh->wf->nSamplesPerSec; - InputFormatInfo.format = bswap_32(sh->format); //1363430706;///*1768775988;//*/1902406962;//qdm2//1768775988;//FOUR_CHAR_CODE('ima4'); - OutputFormatInfo.format = 1313820229;// FOUR_CHAR_CODE('NONE'); - - error = SoundConverterOpen(&InputFormatInfo, &OutputFormatInfo, &myConverter); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterOpen:%i\n",error); - if(error) return 0; - - if(codecdata){ - error = SoundConverterSetInfo(myConverter,siDecompressionParams,codecdata); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterSetInfo:%i\n",error); -// if(error) return 0; - } - - WantedBufferSize=OutputFormatInfo.numChannels*OutputFormatInfo.sampleRate*2; - error = SoundConverterGetBufferSizes(myConverter, - WantedBufferSize,&FramesToGet,&InputBufferSize,&OutputBufferSize); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterGetBufferSizes:%i\n",error); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"WantedBufferSize = %li\n",WantedBufferSize); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"InputBufferSize = %li\n",InputBufferSize); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"OutputBufferSize = %li\n",OutputBufferSize); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FramesToGet = %li\n",FramesToGet); - - InFrameSize=(InputBufferSize+FramesToGet-1)/FramesToGet; - OutFrameSize=OutputBufferSize/FramesToGet; - - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FrameSize: %i -> %i\n",InFrameSize,OutFrameSize); - - error = SoundConverterBeginConversion(myConverter); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterBeginConversion:%i\n",error); - if(error) return 0; - - sh->audio_out_minsize=OutputBufferSize; - sh->audio_in_minsize=InputBufferSize; - - sh->channels=sh->wf->nChannels; - sh->samplerate=sh->wf->nSamplesPerSec; - sh->samplesize=2; //(sh->wf->wBitsPerSample+7)/8; - - sh->i_bps=sh->wf->nAvgBytesPerSec; -//InputBufferSize*WantedBufferSize/OutputBufferSize; - - if(sh->format==0x3343414D){ - // MACE 3:1 - sh->ds->ss_div = 2*3; // 1 samples/packet - sh->ds->ss_mul = sh->channels*2*1; // 1 bytes/packet - } else - if(sh->format==0x3643414D){ - // MACE 6:1 - sh->ds->ss_div = 2*6; // 1 samples/packet - sh->ds->ss_mul = sh->channels*2*1; // 1 bytes/packet - } - - return 1; // return values: 1=OK 0=ERROR -} - -static int init(sh_audio_t *sh_audio){ - - return 1; // return values: 1=OK 0=ERROR -} - -static void uninit(sh_audio_t *sh){ - int error; - unsigned long ConvertedFrames=0; - unsigned long ConvertedBytes=0; - -#if defined(WIN32_LOADER) && !defined(CONFIG_QUICKTIME) - Setup_FS_Segment(); -#endif - - error=SoundConverterEndConversion(myConverter,NULL,&ConvertedFrames,&ConvertedBytes); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterEndConversion:%i\n",error); - error = SoundConverterClose(myConverter); - mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"SoundConverterClose:%i\n",error); -// error = TerminateQTML(); -// printf("TerminateQTML:%i\n",error); -// FreeLibrary( qtml_dll ); -// qtml_dll = NULL; -// FreeLibrary( qtime_qts ); -// qtime_qts = NULL; -// printf("qt dll loader uninit done\n"); -#ifdef CONFIG_QUICKTIME - ExitMovies(); -#endif -} - -static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen){ - unsigned long FramesToGet=0; //how many frames the demuxer has to get - unsigned long InputBufferSize=0; //size of the input buffer - unsigned long ConvertedFrames=0; - unsigned long ConvertedBytes=0; - -#if defined(WIN32_LOADER) && !defined(CONFIG_QUICKTIME) - Setup_FS_Segment(); -#endif - - FramesToGet=minlen/OutFrameSize; - if(FramesToGet*OutFrameSizesh->a_in_buffer_size) - FramesToGet=sh->a_in_buffer_size/InFrameSize; - - InputBufferSize=FramesToGet*InFrameSize; - -// printf("FramesToGet = %li (%li -> %li bytes)\n",FramesToGet, -// InputBufferSize, FramesToGet*OutFrameSize); - - if(InputBufferSize>sh->a_in_buffer_len){ - int x=demux_read_data(sh->ds,&sh->a_in_buffer[sh->a_in_buffer_len], - InputBufferSize-sh->a_in_buffer_len); - if(x>0) sh->a_in_buffer_len+=x; - if(InputBufferSize>sh->a_in_buffer_len) - FramesToGet=sh->a_in_buffer_len/InFrameSize; // not enough data! - } - -// printf("\nSoundConverterConvertBuffer(myConv=%p,inbuf=%p,frames=%d,outbuf=%p,&convframes=%p,&convbytes=%p)\n", -// myConverter,sh->a_in_buffer,FramesToGet,buf,&ConvertedFrames,&ConvertedBytes); - SoundConverterConvertBuffer(myConverter,sh->a_in_buffer, - FramesToGet,buf,&ConvertedFrames,&ConvertedBytes); -// printf("SoundConverterConvertBuffer:%i\n",error); -// printf("ConvertedFrames = %li\n",ConvertedFrames); -// printf("ConvertedBytes = %li\n",ConvertedBytes); - -// InputBufferSize=(ConvertedBytes/OutFrameSize)*InFrameSize; // FIXME!! - InputBufferSize=FramesToGet*InFrameSize; - sh->a_in_buffer_len-=InputBufferSize; - if(sh->a_in_buffer_len<0) sh->a_in_buffer_len=0; // should not happen... - else if(sh->a_in_buffer_len>0){ - memcpy(sh->a_in_buffer,&sh->a_in_buffer[InputBufferSize],sh->a_in_buffer_len); - } - - return ConvertedBytes; -} - -static int control(sh_audio_t *sh,int cmd,void* arg, ...){ - // various optional functions you MAY implement: - return CONTROL_UNKNOWN; -} diff --git a/libmpcodecs/ad_realaud.c b/libmpcodecs/ad_realaud.c deleted file mode 100644 index 3f221c61ef..0000000000 --- a/libmpcodecs/ad_realaud.c +++ /dev/null @@ -1,463 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include - -#include "config.h" - -//#include -#ifdef HAVE_LIBDL -#include -#endif -#include "path.h" -#include "libavutil/attributes.h" -#include "ad_internal.h" -#include "loader/wine/windef.h" - -static const ad_info_t info = { - "RealAudio decoder", - "realaud", - "Alex Beregszaszi", - "Florian Schneider, Arpad Gereoffy, Alex Beregszaszi, Donnie Smith", - "binary real audio codecs" -}; - -LIBAD_EXTERN(realaud) - -void *__builtin_new(unsigned long size); -void __builtin_delete(void *ize); - -void *__builtin_new(unsigned long size) { - return malloc(size); -} - -// required for cook's uninit: -void __builtin_delete(void* ize) { - free(ize); -} - -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) -void *__ctype_b=NULL; -#endif - -static unsigned long (*raCloseCodec)(void*); -static unsigned long (*raDecode)(void*, char*,unsigned long,char*,unsigned int*,long); -static unsigned long (*raFreeDecoder)(void*); -//static unsigned long (*raGetNumberOfFlavors2)(void); -static unsigned long (*raInitDecoder)(void*, void*); -static unsigned long (*raOpenCodec)(void*); -static unsigned long (*raOpenCodec2)(void*, void*); -static unsigned long (*raSetFlavor)(void*,unsigned long); -static void (*raSetDLLAccessPath)(char*); -static void (*raSetPwd)(char*,char*); -#ifdef CONFIG_WIN32DLL -static unsigned long WINAPI (*wraCloseCodec)(void*); -static unsigned long WINAPI (*wraDecode)(void*, char*,unsigned long,char*,unsigned int*,long); -static unsigned long WINAPI (*wraFreeDecoder)(void*); -static unsigned long WINAPI (*wraInitDecoder)(void*, void*); -static unsigned long WINAPI (*wraOpenCodec)(void*); -static unsigned long WINAPI (*wraOpenCodec2)(void*, void*); -static unsigned long WINAPI (*wraSetFlavor)(void*,unsigned long); -static void WINAPI (*wraSetDLLAccessPath)(char*); -static void WINAPI (*wraSetPwd)(char*,char*); - -static int dll_type = 0; /* 0 = unix dlopen, 1 = win32 dll */ -#endif - -static void *rv_handle = NULL; - -#if 0 -typedef struct { - int samplerate; - short bits; - short channels; - int unk1; - int unk2; - int packetsize; - int unk3; - void* unk4; -} ra_init_t ; -#else - -/* - Probably the linux .so-s were compiled with old GCC without setting - packing, so it adds 2 bytes padding after the quality field. - In windows it seems that there's no padding in it. - - -- alex -*/ - -/* linux dlls doesn't need packing */ -typedef struct /*__attribute__((__packed__))*/ { - int samplerate; - short bits; - short channels; - short quality; - /* 2bytes padding here, by gcc */ - int bits_per_frame; - int packetsize; - int extradata_len; - void* extradata; -} ra_init_t; - -/* windows dlls need packed structs (no padding) */ -typedef struct __attribute__((__packed__)) { - int samplerate; - short bits; - short channels; - short quality; - int bits_per_frame; - int packetsize; - int extradata_len; - void* extradata; -} wra_init_t; -#endif - -#ifdef HAVE_LIBDL -static int load_syms_linux(char *path) -{ - void *handle; - - mp_msg(MSGT_DECVIDEO, MSGL_V, "opening shared obj '%s'\n", path); - handle = dlopen(path, RTLD_LAZY); - if (!handle) - { - mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error: %s\n", dlerror()); - return 0; - } - - raCloseCodec = dlsym(handle, "RACloseCodec"); - raDecode = dlsym(handle, "RADecode"); - raFreeDecoder = dlsym(handle, "RAFreeDecoder"); - raOpenCodec = dlsym(handle, "RAOpenCodec"); - raOpenCodec2 = dlsym(handle, "RAOpenCodec2"); - raInitDecoder = dlsym(handle, "RAInitDecoder"); - raSetFlavor = dlsym(handle, "RASetFlavor"); - raSetDLLAccessPath = dlsym(handle, "SetDLLAccessPath"); - raSetPwd = dlsym(handle, "RASetPwd"); // optional, used by SIPR - - if (raCloseCodec && raDecode && raFreeDecoder && - (raOpenCodec||raOpenCodec2) && raSetFlavor && - /*raSetDLLAccessPath &&*/ raInitDecoder) - { - rv_handle = handle; - return 1; - } - - mp_msg(MSGT_DECAUDIO,MSGL_WARN,"Cannot resolve symbols - incompatible dll: %s\n",path); - dlclose(handle); - return 0; -} -#endif - -#ifdef CONFIG_WIN32DLL - -#ifdef WIN32_LOADER -#include "loader/ldt_keeper.h" -#endif -void* WINAPI LoadLibraryA(char* name); -void* WINAPI GetProcAddress(void* handle,char *func); -int WINAPI FreeLibrary(void *handle); - -static int load_syms_windows(char *path) -{ - void *handle; - - mp_msg(MSGT_DECVIDEO, MSGL_V, "opening win32 dll '%s'\n", path); -#ifdef WIN32_LOADER - Setup_LDT_Keeper(); -#endif - handle = LoadLibraryA(path); - if (!handle) - { - mp_msg(MSGT_DECVIDEO, MSGL_WARN, "Error loading dll\n"); - return 0; - } - - wraCloseCodec = GetProcAddress(handle, "RACloseCodec"); - wraDecode = GetProcAddress(handle, "RADecode"); - wraFreeDecoder = GetProcAddress(handle, "RAFreeDecoder"); - wraOpenCodec = GetProcAddress(handle, "RAOpenCodec"); - wraOpenCodec2 = GetProcAddress(handle, "RAOpenCodec2"); - wraInitDecoder = GetProcAddress(handle, "RAInitDecoder"); - wraSetFlavor = GetProcAddress(handle, "RASetFlavor"); - wraSetDLLAccessPath = GetProcAddress(handle, "SetDLLAccessPath"); - wraSetPwd = GetProcAddress(handle, "RASetPwd"); // optional, used by SIPR - - if (wraCloseCodec && wraDecode && wraFreeDecoder && - (wraOpenCodec || wraOpenCodec2) && wraSetFlavor && - /*wraSetDLLAccessPath &&*/ wraInitDecoder) - { - rv_handle = handle; - dll_type = 1; - return 1; - } - - mp_msg(MSGT_DECAUDIO,MSGL_WARN,"Cannot resolve symbols - incompatible dll: %s\n",path); - FreeLibrary(handle); - return 0; - -} -#endif - - -static int preinit(sh_audio_t *sh){ - // let's check if the driver is available, return 0 if not. - // (you should do that if you use external lib(s) which is optional) - unsigned int result; - char *path; - - path = malloc(strlen(codec_path) + strlen(sh->codec->dll) + 2); - if (!path) return 0; - sprintf(path, "%s/%s", codec_path, sh->codec->dll); - - /* first try to load linux dlls, if failed and we're supporting win32 dlls, - then try to load the windows ones */ - -#ifdef HAVE_LIBDL - if (strstr(sh->codec->dll,".dll") || !load_syms_linux(path)) -#endif -#ifdef CONFIG_WIN32DLL - if (!load_syms_windows(sh->codec->dll)) -#endif - { - mp_tmsg(MSGT_DECVIDEO, MSGL_ERR, "ERROR: Could not open required DirectShow codec %s.\n", sh->codec->dll); - mp_msg(MSGT_DECVIDEO, MSGL_HINT, "Read the RealAudio section of the DOCS!\n"); - free(path); - return 0; - } - -#ifdef CONFIG_WIN32DLL - if((raSetDLLAccessPath && dll_type == 0) || (wraSetDLLAccessPath && dll_type == 1)){ -#else - if(raSetDLLAccessPath){ -#endif - // used by 'SIPR' - path = realloc(path, strlen(codec_path) + 13); - sprintf(path, "DT_Codecs=%s", codec_path); - if(path[strlen(path)-1]!='/'){ - path[strlen(path)+1]=0; - path[strlen(path)]='/'; - } - path[strlen(path)+1]=0; -#ifdef CONFIG_WIN32DLL - if (dll_type == 1) - { - int i; - for (i=0; i < strlen(path); i++) - if (path[i] == '/') path[i] = '\\'; - wraSetDLLAccessPath(path); - } - else -#endif - raSetDLLAccessPath(path); - } - -#ifdef CONFIG_WIN32DLL - if (dll_type == 1){ - if (wraOpenCodec2) { - sprintf(path, "%s\\", codec_path); - result = wraOpenCodec2(&sh->context, path); - } else - result=wraOpenCodec(&sh->context); - } else -#endif - if (raOpenCodec2) { - sprintf(path, "%s/", codec_path); - result = raOpenCodec2(&sh->context, path); - } else - result=raOpenCodec(&sh->context); - if(result){ - mp_msg(MSGT_DECAUDIO,MSGL_WARN,"Decoder open failed, error code: 0x%X\n",result); - return 0; - } -// printf("opencodec ok (result: %x)\n", result); - free(path); /* after this it isn't used anymore */ - - sh->samplerate=sh->wf->nSamplesPerSec; - sh->samplesize=sh->wf->wBitsPerSample/8; - sh->channels=sh->wf->nChannels; - - { - ra_init_t init_data={ - sh->wf->nSamplesPerSec, - sh->wf->wBitsPerSample, - sh->wf->nChannels, - 100, // quality - sh->wf->nBlockAlign, // subpacket size - sh->wf->nBlockAlign, // coded frame size - sh->wf->cbSize, // codec data length - (char*)(sh->wf+1) // extras - }; -#ifdef CONFIG_WIN32DLL - wra_init_t winit_data={ - sh->wf->nSamplesPerSec, - sh->wf->wBitsPerSample, - sh->wf->nChannels, - 100, // quality - sh->wf->nBlockAlign, // subpacket size - sh->wf->nBlockAlign, // coded frame size - sh->wf->cbSize, // codec data length - (char*)(sh->wf+1) // extras - }; -#endif -#ifdef CONFIG_WIN32DLL - if (dll_type == 1) - result=wraInitDecoder(sh->context,&winit_data); - else -#endif - result=raInitDecoder(sh->context,&init_data); - - if(result){ - mp_msg(MSGT_DECAUDIO,MSGL_WARN,"Decoder init failed, error code: 0x%X\n",result); - return 0; - } -// printf("initdecoder ok (result: %x)\n", result); - } - -#ifdef CONFIG_WIN32DLL - if((raSetPwd && dll_type == 0) || (wraSetPwd && dll_type == 1)){ -#else - if(raSetPwd){ -#endif - // used by 'SIPR' -#ifdef CONFIG_WIN32DLL - if (dll_type == 1) - wraSetPwd(sh->context,"Ardubancel Quazanga"); - else -#endif - raSetPwd(sh->context,"Ardubancel Quazanga"); // set password... lol. - } - - if (sh->format == mmioFOURCC('s','i','p','r')) { - short flavor; - - if (sh->wf->nAvgBytesPerSec > 1531) - flavor = 3; - else if (sh->wf->nAvgBytesPerSec > 937) - flavor = 1; - else if (sh->wf->nAvgBytesPerSec > 719) - flavor = 0; - else - flavor = 2; - mp_msg(MSGT_DECAUDIO,MSGL_V,"Got sipr flavor %d from bitrate %d\n",flavor, sh->wf->nAvgBytesPerSec); - -#ifdef CONFIG_WIN32DLL - if (dll_type == 1) - result=wraSetFlavor(sh->context,flavor); - else -#endif - result=raSetFlavor(sh->context,flavor); - if(result){ - mp_msg(MSGT_DECAUDIO,MSGL_WARN,"Decoder flavor setup failed, error code: 0x%X\n",result); - return 0; - } - } // sipr flavor - - sh->i_bps=sh->wf->nAvgBytesPerSec; - - sh->audio_out_minsize=128000; // no idea how to get... :( - sh->audio_in_minsize = sh->wf->nBlockAlign; - - return 1; // return values: 1=OK 0=ERROR -} - -static int init(sh_audio_t *sh_audio){ - // initialize the decoder, set tables etc... - - // you can store HANDLE or private struct pointer at sh->context - // you can access WAVEFORMATEX header at sh->wf - - // set sample format/rate parameters if you didn't do it in preinit() yet. - - return 1; // return values: 1=OK 0=ERROR -} - -static void uninit(sh_audio_t *sh){ - // uninit the decoder etc... - // again: you don't have to free() a_in_buffer here! it's done by the core. -#ifdef CONFIG_WIN32DLL - if (dll_type == 1) - { - if (wraFreeDecoder) wraFreeDecoder(sh->context); - if (wraCloseCodec) wraCloseCodec(sh->context); - } -#endif - - if (raFreeDecoder) raFreeDecoder(sh->context); - if (raCloseCodec) raCloseCodec(sh->context); - - -#ifdef CONFIG_WIN32DLL - if (dll_type == 1) - { - if (rv_handle) FreeLibrary(rv_handle); - } else -#endif -// this dlclose() causes some memory corruption, and crashes soon (in caller): -// if (rv_handle) dlclose(rv_handle); - rv_handle = NULL; -} - -static int decode_audio(sh_audio_t *sh,unsigned char *buf,int minlen,int maxlen){ - int result av_unused; - int len=-1; - - if(sh->a_in_buffer_len<=0){ - // fill the buffer! - if (sh->ds->eof) - return 0; - demux_read_data(sh->ds, sh->a_in_buffer, sh->wf->nBlockAlign); - sh->a_in_buffer_size= - sh->a_in_buffer_len=sh->wf->nBlockAlign; - } - -#ifdef CONFIG_WIN32DLL - if (dll_type == 1) - result=wraDecode(sh->context, sh->a_in_buffer+sh->a_in_buffer_size-sh->a_in_buffer_len, sh->wf->nBlockAlign, - buf, &len, -1); - else -#endif - result=raDecode(sh->context, sh->a_in_buffer+sh->a_in_buffer_size-sh->a_in_buffer_len, sh->wf->nBlockAlign, - buf, &len, -1); - sh->a_in_buffer_len-=sh->wf->nBlockAlign; - -// printf("radecode: %d bytes, res=0x%X \n",len,result); - - return len; // return value: number of _bytes_ written to output buffer, - // or -1 for EOF (or uncorrectable error) -} - -static int control(sh_audio_t *sh,int cmd,void* arg, ...){ - // various optional functions you MAY implement: - switch(cmd){ - case ADCTRL_RESYNC_STREAM: - // it is called once after seeking, to resync. - // Note: sh_audio->a_in_buffer_len=0; is done _before_ this call! - return CONTROL_TRUE; - case ADCTRL_SKIP_FRAME: - // it is called to skip (jump over) small amount (1/10 sec or 1 frame) - // of audio data - used to sync audio to video after seeking - // if you don't return CONTROL_TRUE, it will defaults to: - // ds_fill_buffer(sh_audio->ds); // skip 1 demux packet - return CONTROL_TRUE; - } - return CONTROL_UNKNOWN; -} diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index a9dbbf2fe6..9594cfba24 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -39,13 +39,8 @@ extern const vd_functions_t mpcodecs_vd_null; extern const vd_functions_t mpcodecs_vd_ffmpeg; -extern const vd_functions_t mpcodecs_vd_dshow; -extern const vd_functions_t mpcodecs_vd_dmo; -extern const vd_functions_t mpcodecs_vd_vfw; -extern const vd_functions_t mpcodecs_vd_vfwex; extern const vd_functions_t mpcodecs_vd_raw; extern const vd_functions_t mpcodecs_vd_hmblck; -extern const vd_functions_t mpcodecs_vd_xanim; extern const vd_functions_t mpcodecs_vd_mpng; extern const vd_functions_t mpcodecs_vd_ijpg; extern const vd_functions_t mpcodecs_vd_mtga; @@ -61,18 +56,9 @@ extern const vd_functions_t mpcodecs_vd_qtvideo; const vd_functions_t * const mpcodecs_vd_drivers[] = { &mpcodecs_vd_null, &mpcodecs_vd_ffmpeg, -#ifdef CONFIG_WIN32DLL - &mpcodecs_vd_dshow, - &mpcodecs_vd_dmo, - &mpcodecs_vd_vfw, - &mpcodecs_vd_vfwex, -#endif &mpcodecs_vd_lzo, &mpcodecs_vd_raw, &mpcodecs_vd_hmblck, -#ifdef CONFIG_XANIM - &mpcodecs_vd_xanim, -#endif #ifdef CONFIG_PNG &mpcodecs_vd_mpng, #endif @@ -80,14 +66,8 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = { &mpcodecs_vd_ijpg, #endif &mpcodecs_vd_mtga, -#ifdef CONFIG_REALCODECS - &mpcodecs_vd_realvid, -#endif #ifdef CONFIG_LIBDV095 &mpcodecs_vd_libdv, -#endif -#ifdef CONFIG_QTX_CODECS - &mpcodecs_vd_qtvideo, #endif /* Please do not add any new decoders here. If you want to implement a new * decoder, add it to libavcodec, except for wrappers around external diff --git a/libmpcodecs/vd_dmo.c b/libmpcodecs/vd_dmo.c deleted file mode 100644 index e300edd371..0000000000 --- a/libmpcodecs/vd_dmo.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include "config.h" - -#include -#include -#include - -#include "mp_msg.h" - -#include "vd_internal.h" - -#include "loader/dmo/DMO_VideoDecoder.h" - -static const vd_info_t info = { - "DMO video codecs", - "dmo", - "A'rpi", - "based on http://avifile.sf.net", - "win32 codecs" -}; - -LIBVD_EXTERN(dmo) - -struct context { - void *decoder; - uint8_t *buffer; - int stride; -}; - -// to set/get/query special features/parameters -static int control(sh_video_t *sh,int cmd,void* arg,...){ - return CONTROL_UNKNOWN; -} - -// init driver -static int init(sh_video_t *sh){ - unsigned int out_fmt=sh->codec->outfmt[0]; - struct context *ctx; - void *decoder; - if(!(decoder=DMO_VideoDecoder_Open(sh->codec->dll,&sh->codec->guid, sh->bih, 0, 0))){ - mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"ERROR: Could not open required DirectShow codec %s.\n",sh->codec->dll); - mp_tmsg(MSGT_DECVIDEO,MSGL_HINT,"You need to upgrade/install the binary codecs package.\nGo to http://www.mplayerhq.hu/dload.html\n"); - return 0; - } - if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,out_fmt)) return 0; - // mpcodecs_config_vo can change the format - out_fmt=sh->codec->outfmt[sh->outfmtidx]; - sh->context = ctx = calloc(1, sizeof(*ctx)); - ctx->decoder = decoder; - switch(out_fmt){ - case IMGFMT_YUY2: - case IMGFMT_UYVY: - DMO_VideoDecoder_SetDestFmt(ctx->decoder,16,out_fmt);break; // packed YUV - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - DMO_VideoDecoder_SetDestFmt(ctx->decoder,12,out_fmt);break; // planar YUV - case IMGFMT_YVU9: - DMO_VideoDecoder_SetDestFmt(ctx->decoder,9,out_fmt);break; - case IMGFMT_RGB24: - case IMGFMT_BGR24: - if (sh->disp_w & 3) - { - ctx->stride = ((sh->disp_w * 3) + 3) & ~3; - ctx->buffer = av_malloc(ctx->stride * sh->disp_h); - } - default: - DMO_VideoDecoder_SetDestFmt(ctx->decoder,out_fmt&255,0); // RGB/BGR - } - DMO_VideoDecoder_StartInternal(ctx->decoder); - mp_tmsg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DMO video codec init OK.\n"); - return 1; -} - -// uninit driver -static void uninit(sh_video_t *sh){ - struct context *ctx = sh->context; - DMO_VideoDecoder_Destroy(ctx->decoder); - av_free(ctx->buffer); - free(ctx); - sh->context = NULL; -} - -//mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h); - -// decode a frame -static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ - struct context *ctx = sh->context; - uint8_t *buffer = ctx->buffer; - int type = ctx->buffer ? MP_IMGTYPE_EXPORT : MP_IMGTYPE_TEMP; - mp_image_t* mpi; - if(len<=0) return NULL; // skipped frame - - if(flags&3){ - // framedrop: - DMO_VideoDecoder_DecodeInternal(ctx->decoder, data, len, 0, 0); - return NULL; - } - - mpi=mpcodecs_get_image(sh, type, MP_IMGFLAG_COMMON_PLANE, - sh->disp_w, sh->disp_h); - if (buffer) { - mpi->planes[0] = buffer; - mpi->stride[0] = ctx->stride; - } else { - buffer = mpi->planes[0]; - } - - if(!mpi){ // temporary! - mp_tmsg(MSGT_DECVIDEO,MSGL_WARN,"[VD_DMO] Couldn't allocate image for cinepak codec.\n"); - return NULL; - } - - DMO_VideoDecoder_DecodeInternal(ctx->decoder, data, len, 1, buffer); - - return mpi; -} diff --git a/libmpcodecs/vd_dshow.c b/libmpcodecs/vd_dshow.c deleted file mode 100644 index 7e8fe35ce0..0000000000 --- a/libmpcodecs/vd_dshow.c +++ /dev/null @@ -1,133 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include - -#include "config.h" - -#include "mp_msg.h" - -#include "vd_internal.h" - -#include "loader/dshow/DS_VideoDecoder.h" - -static const vd_info_t info = { - "DirectShow video codecs", - "dshow", - "A'rpi", - "based on http://avifile.sf.net", - "win32 codecs" -}; - -LIBVD_EXTERN(dshow) - -// to set/get/query special features/parameters -static int control(sh_video_t *sh,int cmd,void* arg,...){ - switch(cmd){ - case VDCTRL_QUERY_MAX_PP_LEVEL: - return 4; - case VDCTRL_SET_PP_LEVEL: - if(!sh->context) return CONTROL_ERROR; - DS_VideoDecoder_SetValue(sh->context,"Quality",*((int*)arg)); - return CONTROL_OK; - - case VDCTRL_SET_EQUALIZER: { - va_list ap; - int value; - va_start(ap, arg); - value=va_arg(ap, int); - va_end(ap); - if(DS_VideoDecoder_SetValue(sh->context,arg,50+value/2)==0) - return CONTROL_OK; - return CONTROL_FALSE; - } - - } - return CONTROL_UNKNOWN; -} - -// init driver -static int init(sh_video_t *sh){ - unsigned int out_fmt=sh->codec->outfmt[0]; - - /* Hack for VSSH codec: new dll can't decode old files - * In my samples old files have no extradata, so use that info - * to decide what dll should be used (here and in vd_vfw). - */ - if (!strcmp(sh->codec->dll, "vsshdsd.dll") && (sh->bih->biSize == 40)) - return 0; - - if(!(sh->context=DS_VideoDecoder_Open(sh->codec->dll,&sh->codec->guid, sh->bih, 0, 0))){ - mp_tmsg(MSGT_DECVIDEO,MSGL_ERR,"ERROR: Could not open required DirectShow codec %s.\n",sh->codec->dll); - mp_tmsg(MSGT_DECVIDEO,MSGL_HINT,"You need to upgrade/install the binary codecs package.\nGo to http://www.mplayerhq.hu/dload.html\n"); - return 0; - } - if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,out_fmt)) return 0; - // mpcodecs_config_vo can change the format - out_fmt=sh->codec->outfmt[sh->outfmtidx]; - switch(out_fmt){ - case IMGFMT_YUY2: - case IMGFMT_UYVY: - DS_VideoDecoder_SetDestFmt(sh->context,16,out_fmt);break; // packed YUV - case IMGFMT_YV12: - case IMGFMT_I420: - case IMGFMT_IYUV: - DS_VideoDecoder_SetDestFmt(sh->context,12,out_fmt);break; // planar YUV - case IMGFMT_YVU9: - DS_VideoDecoder_SetDestFmt(sh->context,9,out_fmt);break; - default: - DS_VideoDecoder_SetDestFmt(sh->context,out_fmt&255,0); // RGB/BGR - } - DS_SetAttr_DivX("Quality",divx_quality); - DS_VideoDecoder_StartInternal(sh->context); - mp_tmsg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DShow video codec init OK.\n"); - return 1; -} - -// uninit driver -static void uninit(sh_video_t *sh){ - DS_VideoDecoder_Destroy(sh->context); -} - -//mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h); - -// decode a frame -static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ - mp_image_t* mpi; - if(len<=0) return NULL; // skipped frame - - if(flags&3){ - // framedrop: - DS_VideoDecoder_DecodeInternal(sh->context, data, len, 0, 0); - return NULL; - } - - mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, MP_IMGFLAG_COMMON_PLANE, - sh->disp_w, sh->disp_h); - - if(!mpi){ // temporary! - mp_tmsg(MSGT_DECVIDEO,MSGL_WARN,"[VD_DMO] Couldn't allocate image for cinepak codec.\n"); - return NULL; - } - - DS_VideoDecoder_DecodeInternal(sh->context, data, len, 0, mpi->planes[0]); - - return mpi; -} diff --git a/libmpcodecs/vd_qtvideo.c b/libmpcodecs/vd_qtvideo.c deleted file mode 100644 index 5e37ca456e..0000000000 --- a/libmpcodecs/vd_qtvideo.c +++ /dev/null @@ -1,321 +0,0 @@ -/* - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include -#include -#include - -#include "config.h" -#include "mp_msg.h" -#include "mpbswap.h" -#include "vd_internal.h" - -#ifdef CONFIG_QUICKTIME -#include -#define dump_ImageDescription(x) -#else -#include "loader/ldt_keeper.h" -#include "loader/qtx/qtxsdk/components.h" -#include "loader/wine/winbase.h" -#include "loader/wine/windef.h" -#endif - -static const vd_info_t info = { - "Quicktime Video decoder", - "qtvideo", - "A'rpi", - "Sascha Sommer", - "win32" -}; - -LIBVD_EXTERN(qtvideo) - -static mp_image_t* mpi; -static Rect OutBufferRect; //the dimensions of our GWorld - -static GWorldPtr OutBufferGWorld = NULL;//a GWorld is some kind of description for a drawing environment -static ImageDescriptionHandle framedescHandle; -static ImageSequence imageSeq; - -#ifndef CONFIG_QUICKTIME -static HINSTANCE qtime_qts; // handle to the preloaded quicktime.qts -static HMODULE handler; -static OSErr (*InitializeQTML)(long flags); -static OSErr (*EnterMovies)(void); -static void (*ExitMovies)(void); -static OSErr (*DecompressSequenceBegin)(ImageSequence *seqID, - ImageDescriptionHandle desc, - CGrafPtr port, - /*GDHandle*/void* gdh, - const Rect *srcRect, - MatrixRecordPtr matrix, - short mode, - RgnHandle mask, - CodecFlags flags, - CodecQ accuracy, - DecompressorComponent codec); -static OSErr (*DecompressSequenceFrameS)(ImageSequence seqID, - Ptr data, - long dataSize, - CodecFlags inFlags, - CodecFlags *outFlags, - ICMCompletionProcRecordPtr asyncCompletionProc); -static PixMapHandle (*GetGWorldPixMap)(GWorldPtr offscreenGWorld); -static OSErr (*QTNewGWorldFromPtr)(GWorldPtr *gw, - OSType pixelFormat, - const Rect *boundsRect, - CTabHandle cTable, - /*GDHandle*/void* aGDevice, //unused anyway - GWorldFlags flags, - void *baseAddr, - long rowBytes); -static Handle (*NewHandleClear)(Size byteCount); -static void (*DisposeHandle)(Handle h); -static void (*DisposeGWorld)(GWorldPtr offscreenGWorld); -static OSErr (*CDSequenceEnd)(ImageSequence seqID); -#endif /* #ifndef CONFIG_QUICKTIME */ - -// to set/get/query special features/parameters -static int control(sh_video_t *sh,int cmd,void* arg,...){ - return CONTROL_UNKNOWN; -} - -// init driver -static int init(sh_video_t *sh){ - OSErr result = 1; - int extradata_size = sh->bih ? sh->bih->biSize - sizeof(*sh->bih) : 0; - void *extradata = sh->bih + 1; - - if (!sh->ImageDesc) - mp_msg(MSGT_DECVIDEO,MSGL_ERR,"sh->ImageDesc not set, try -demuxer mov if this fails.\n"); - -#ifndef CONFIG_QUICKTIME -#ifdef WIN32_LOADER - Setup_LDT_Keeper(); -#endif - - //preload quicktime.qts to avoid the problems caused by the hardcoded path inside the dll - qtime_qts = LoadLibraryA("QuickTime.qts"); - if(!qtime_qts){ - mp_msg(MSGT_DECVIDEO,MSGL_ERR,"unable to load QuickTime.qts\n" ); - return 0; - } - - handler = LoadLibraryA("qtmlClient.dll"); - if(!handler){ - mp_msg(MSGT_DECVIDEO,MSGL_ERR,"unable to load qtmlClient.dll\n"); - return 0; - } - - InitializeQTML = (OSErr (*)(long))GetProcAddress(handler, "InitializeQTML"); - EnterMovies = (OSErr (*)(void))GetProcAddress(handler, "EnterMovies"); - ExitMovies = (void (*)(void))GetProcAddress(handler, "ExitMovies"); - DecompressSequenceBegin = (OSErr (*)(ImageSequence*,ImageDescriptionHandle,CGrafPtr,void *,const Rect *,MatrixRecordPtr,short,RgnHandle,CodecFlags,CodecQ,DecompressorComponent))GetProcAddress(handler, "DecompressSequenceBegin"); - DecompressSequenceFrameS = (OSErr (*)(ImageSequence,Ptr,long,CodecFlags,CodecFlags*,ICMCompletionProcRecordPtr))GetProcAddress(handler, "DecompressSequenceFrameS"); - GetGWorldPixMap = (PixMapHandle (*)(GWorldPtr))GetProcAddress(handler, "GetGWorldPixMap"); - QTNewGWorldFromPtr = (OSErr(*)(GWorldPtr *,OSType,const Rect *,CTabHandle,void*,GWorldFlags,void *,long))GetProcAddress(handler, "QTNewGWorl