November 2002 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/etc codecs.conf,1.248,1.249
by Arpi of Ize 26 Nov '02

26 Nov '02

Update of /cvsroot/mplayer/main/etc In directory mail:/var/tmp.root/cvs-serv17199 Modified Files: codecs.conf Log Message: DMO video codecs added: WMV1, WMV2, WMV3 (get DLLs from mphq releases/Win32_dmo.tgz) Index: codecs.conf =================================================================== RCS file: /cvsroot/mplayer/main/etc/codecs.conf,v retrieving revision 1.248 retrieving revision 1.249 diff -u -r1.248 -r1.249 --- codecs.conf 25 Nov 2002 18:05:56 -0000 1.248 +++ codecs.conf 26 Nov 2002 23:06:05 -0000 1.249 @@ -455,6 +455,30 @@ out YUY2,UYVY out BGR32,BGR24,BGR16,BGR15 +videocodec wmv9dmo + info "Windows Media Video 9 DMO" + status working + fourcc WMV3 + driver dmo + dll "wmv9dmod.dll" + guid 0x724bb6a4, 0xe526, 0x450f, 0xaf, 0xfa, 0xab, 0x9b, 0x45, 0x12, 0x91, 0x11 + out YV12 ;,I420,IYUV + out YUY2,UYVY + out BGR32,BGR24,BGR16 ;,BGR15 + +videocodec wmvdmo + info "Windows Media Video DMO" + status working + fourcc WMV1 + fourcc WMV2 + fourcc WMV3 + driver dmo + dll "wmvdmod.dll" + guid 0x82d353df, 0x90bd, 0x4382, 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34 + out YV12 ;,I420,IYUV + out YUY2,UYVY + out BGR32,BGR24,BGR16 ;,BGR15 + videocodec ubmp4 info "UB Video MPEG 4" comment "black&white" @@ -955,9 +979,11 @@ videocodec qtsvq3 info "win32/quicktime SVQ3 decoder" status untested +; fourcc SVQ1 fourcc SVQ3 driver qtvideo dll "QuickTime.qts" +; out YVU9 out YUY2 ; buggy codecs: (any volunteers for native rewrite?)

1 0

CVS: main/libvo vo_dxr3.c,1.110,1.111
by David Holm CVS 26 Nov '02

26 Nov '02

Update of /cvsroot/mplayer/main/libvo In directory mail:/var/tmp.root/cvs-serv13808/libvo Modified Files: vo_dxr3.c Log Message: Fix Index: vo_dxr3.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_dxr3.c,v retrieving revision 1.110 retrieving revision 1.111 diff -u -r1.110 -r1.111 --- vo_dxr3.c 11 Nov 2002 15:20:25 -0000 1.110 +++ vo_dxr3.c 26 Nov 2002 22:58:56 -0000 1.111 @@ -409,7 +409,7 @@ } /* Set the playmode to play (just in case another app has set it to something else) */ - ioval = EM8300_PLAYMODE_PLAY; + ioval = EM8300_PLAYMODE_SYNC; if (ioctl(fd_control, EM8300_IOCTL_SET_PLAYMODE, &ioval) < 0) { printf("VO: [dxr3] Unable to set playmode!\n"); }

1 0

CVS: main configure,1.613,1.614 Makefile,1.236,1.237
by Arpi of Ize 26 Nov '02

26 Nov '02

Update of /cvsroot/mplayer/main In directory mail:/var/tmp.root/cvs-serv9839 Modified Files: configure Makefile Log Message: DMO support Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.613 retrieving revision 1.614 diff -u -r1.613 -r1.614 --- configure 26 Nov 2002 18:34:09 -0000 1.613 +++ configure 26 Nov 2002 22:55:32 -0000 1.614 @@ -3685,12 +3685,12 @@ if test "$_dshow" = yes ; then _def_dshow='#define USE_DIRECTSHOW 1' - _ld_dshow='loader/dshow/libDS_Filter.a' - _dep_dshow='loader/dshow/libDS_Filter.a' - _codecmodules="directshow $_codecmodules" + _ld_dshow='loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a' + _dep_dshow='loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a' + _codecmodules="dshow/dmo $_codecmodules" else _def_dshow='#undef USE_DIRECTSHOW' - _nocodecmodules="directshow $_nocodecmodules" + _nocodecmodules="dshow/dmo $_nocodecmodules" fi Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.236 retrieving revision 1.237 diff -u -r1.236 -r1.237 --- Makefile 16 Nov 2002 22:27:26 -0000 1.236 +++ Makefile 26 Nov 2002 22:55:32 -0000 1.237 @@ -62,7 +62,7 @@ PARTS += Gui endif ifneq ($(W32_LIB),) -PARTS += loader loader/dshow +PARTS += loader loader/dshow loader/dmo endif ifeq ($(LIBMENU),yes) PARTS += libmenu @@ -135,6 +135,9 @@ loader/dshow/libDS_Filter.a: $(MAKE) -C loader/dshow + +loader/dmo/libDMO_Filter.a: + $(MAKE) -C loader/dmo libavcodec/libavcodec.a: $(MAKE) -C libavcodec

1 0

CVS: main/libmpcodecs vd_dmo.c,NONE,1.1 vd.c,1.62,1.63 Makefile,1.79,1.80
by Arpi of Ize 26 Nov '02

26 Nov '02

Update of /cvsroot/mplayer/main/libmpcodecs In directory mail:/var/tmp.root/cvs-serv7881 Modified Files: vd.c Makefile Added Files: vd_dmo.c Log Message: DMO support --- NEW FILE --- #include <stdio.h> #include <stdlib.h> #include <stdarg.h> #include "config.h" #ifdef USE_DIRECTSHOW #include "mp_msg.h" #include "help_mp.h" #include "vd_internal.h" #include "loader/dmo/DMO_VideoDecoder.h" static vd_info_t info = { "DMO video codecs", "dmo", "A'rpi", "based on http://avifile.sf.net", "win32 codecs" }; LIBVD_EXTERN(dmo) // 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; if(!(sh->context=DMO_VideoDecoder_Open(sh->codec->dll,&sh->codec->guid, sh->bih, 0, 0))){ mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh->codec->dll); mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n"); mp_msg(MSGT_DECVIDEO,MSGL_HINT,"package from: ftp://mplayerhq.hu/MPlayer/releases/w32codec.zip !\n"); return 0; } if(!mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YUY2)) return 0; out_fmt=sh->codec->outfmt[sh->outfmtidx]; switch(out_fmt){ case IMGFMT_YUY2: case IMGFMT_UYVY: DMO_VideoDecoder_SetDestFmt(sh->context,16,out_fmt);break; // packed YUV case IMGFMT_YV12: case IMGFMT_I420: case IMGFMT_IYUV: DMO_VideoDecoder_SetDestFmt(sh->context,12,out_fmt);break; // planar YUV case IMGFMT_YVU9: DMO_VideoDecoder_SetDestFmt(sh->context,9,out_fmt);break; default: DMO_VideoDecoder_SetDestFmt(sh->context,out_fmt&255,0); // RGB/BGR } DMO_VideoDecoder_StartInternal(sh->context); mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: Win32/DMOhow video codec init OK!\n"); return 1; } // uninit driver static void uninit(sh_video_t *sh){ DMO_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: DMO_VideoDecoder_DecodeInternal(sh->context, data, len, 0, 0); return NULL; } mpi=mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0 /*MP_IMGFLAG_ACCEPT_STRIDE*/, sh->disp_w, sh->disp_h); if(!mpi){ // temporary! printf("couldn't allocate image for cinepak codec\n"); return NULL; } DMO_VideoDecoder_DecodeInternal(sh->context, data, len, 1, mpi->planes[0]); return mpi; } #endif Index: vd.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/vd.c,v retrieving revision 1.62 retrieving revision 1.63 diff -u -r1.62 -r1.63 --- vd.c 12 Nov 2002 00:06:36 -0000 1.62 +++ vd.c 26 Nov 2002 22:54:59 -0000 1.63 @@ -30,6 +30,7 @@ extern vd_functions_t mpcodecs_vd_qtrpza; extern vd_functions_t mpcodecs_vd_ffmpeg; extern vd_functions_t mpcodecs_vd_dshow; +extern vd_functions_t mpcodecs_vd_dmo; extern vd_functions_t mpcodecs_vd_vfw; extern vd_functions_t mpcodecs_vd_vfwex; extern vd_functions_t mpcodecs_vd_odivx; @@ -68,6 +69,7 @@ #ifdef USE_WIN32DLL #ifdef USE_DIRECTSHOW &mpcodecs_vd_dshow, + &mpcodecs_vd_dmo, #endif &mpcodecs_vd_vfw, &mpcodecs_vd_vfwex, Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- Makefile 23 Nov 2002 10:58:10 -0000 1.79 +++ Makefile 26 Nov 2002 22:54:59 -0000 1.80 @@ -11,7 +11,7 @@ VIDEO_SRCS_LIB=vd_libmpeg2.c vd_nuv.c vd_lzo.c VIDEO_SRCS_NAT=vd_null.c vd_cinepak.c vd_qtrpza.c vd_raw.c vd_msvidc.c vd_fli.c vd_qtrle.c vd_qtsmc.c vd_roqvideo.c vd_cyuv.c vd_msrle.c vd_huffyuv.c vd_mpegpes.c vd_svq1.c vd_lcl.c vd_mtga.c -VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c +VIDEO_SRCS_OPT=vd_realvid.c vd_ffmpeg.c vd_dshow.c vd_dmo.c vd_vfw.c vd_vfwex.c vd_odivx.c vd_divx4.c vd_xanim.c vd_xvid.c vd_libdv.c vd_qtvideo.c VIDEO_SRCS=dec_video.c vd.c $(VIDEO_SRCS_NAT) $(VIDEO_SRCS_LIB) $(VIDEO_SRCS_OPT) VFILTER_SRCS=vf.c vf_vo.c vf_crop.c vf_expand.c vf_pp.c vf_scale.c vf_format.c vf_yuy2.c vf_flip.c vf_rgb2bgr.c vf_rotate.c vf_mirror.c vf_palette.c vf_lavc.c vf_dvbscale.c vf_cropdetect.c vf_test.c vf_noise.c vf_yvu9.c vf_rectangle.c vf_lavcdeint.c vf_eq.c vf_eq2.c vf_halfpack.c vf_dint.c vf_1bpp.c vf_bmovl.c vf_2xsai.c vf_unsharp.c vf_swapuv.c vf_il.c vf_boxblur.c vf_sab.c vf_smartblur.c vf_perspective.c

1 0

CVS: main/loader/dmo DMO_Filter.h,NONE,1.1 DMO_VideoDecoder.c,NONE,1.1 DMO_VideoDecoder.h,NONE,1.1 Makefile,NONE,1.1 buffer.c,NONE,1.1 dmo.c,NONE,1.1 dmo.h,NONE,1.1 dmo_guids.c,NONE,1.1 dmo_guids.h,NONE,1.1 dmo_interfaces.h,NONE,1.1
by Arpi of Ize 26 Nov '02

26 Nov '02

Update of /cvsroot/mplayer/main/loader/dmo In directory mail:/var/tmp.root/cvs-serv6047 Added Files: DMO_Filter.h DMO_VideoDecoder.c DMO_VideoDecoder.h Makefile buffer.c dmo.c dmo.h dmo_guids.c dmo_guids.h dmo_interfaces.h Log Message: DMO interfaces (copied/converted(c++->c) from avifile) --- NEW FILE --- #ifndef DMO_FILTER_H #define DMO_FILTER_H #include "dmo_guids.h" #include "dmo_interfaces.h" #if defined(__cplusplus) extern "C" { #endif typedef struct _DMO_Filter { int m_iHandle; IDMOVideoOutputOptimizations* m_pOptim; IMediaObject* m_pMedia; IMediaObjectInPlace* m_pInPlace; AM_MEDIA_TYPE *m_pOurType, *m_pDestType; } DMO_Filter; typedef struct _CMediaBuffer CMediaBuffer; /** * Create DMO_Filter object - similar syntax as for DS_Filter */ DMO_Filter* DMO_FilterCreate(const char* dllname, const GUID* id, AM_MEDIA_TYPE* in_fmt, AM_MEDIA_TYPE* out_fmt); /** * Destroy DMO_Filter object - release all allocated resources */ void DMO_Filter_Destroy(DMO_Filter* This); /** * Create IMediaBuffer object - to pass/receive data from DMO_Filter * * maxlen - maximum size for this buffer * mem - initial memory 0 - creates memory * len - initial size of used portion of the buffer * copy - make a local copy of data */ CMediaBuffer* CMediaBufferCreate(unsigned long maxlen, void* mem, unsigned long len, int copy); #if defined(__cplusplus) } #endif #endif /* DS_FILTER_H */ --- NEW FILE --- /******************************************************** DirectShow Video decoder implementation Copyright 2000 Eugene Kuznetsov (divx(a)euro.ru) *********************************************************/ #include "guids.h" #include "interfaces.h" #include "registry.h" #ifndef NOAVIFILE_HEADERS #include "videodecoder.h" #else #include "libwin32.h" #endif #include "DMO_Filter.h" #include "DMO_VideoDecoder.h" struct _DMO_VideoDecoder { IVideoDecoder iv; DMO_Filter* m_pDMO_Filter; AM_MEDIA_TYPE m_sOurType, m_sDestType; VIDEOINFOHEADER* m_sVhdr; VIDEOINFOHEADER* m_sVhdr2; int m_Caps;//CAPS m_Caps; // capabilities of DirectShow decoder int m_iLastQuality; // remember last quality as integer int m_iMinBuffers; int m_iMaxAuto; }; //#include "DMO_VideoDecoder.h" #include "../wine/winerror.h" #ifndef NOAVIFILE_HEADERS #define VFW_E_NOT_RUNNING 0x80040226 #include "fourcc.h" #include "except.h" #endif #include <unistd.h> #include <fcntl.h> #include <errno.h> #include <sys/types.h> #include <sys/mman.h> #include <stdio.h> #include <stdlib.h> // labs // strcmp((const char*)info.dll,...) is used instead of (... == ...) // so Arpi could use char* pointer in his simplified DMO_VideoDecoder class #define __MODULE__ "DirectShow_VideoDecoder" #define false 0 #define true 1 //int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this){return this->m_Caps;} typedef struct _ct ct; struct _ct { fourcc_t fcc; unsigned int bits; const GUID* subtype; int cap; }; static ct check[] = { { fccI420, 12, &MEDIASUBTYPE_I420, CAP_I420 }, { fccYV12, 12, &MEDIASUBTYPE_YV12, CAP_YV12 }, { fccYUY2, 16, &MEDIASUBTYPE_YUY2, CAP_YUY2 }, { fccUYVY, 16, &MEDIASUBTYPE_UYVY, CAP_UYVY }, { fccYVYU, 16, &MEDIASUBTYPE_YVYU, CAP_YVYU }, { fccIYUV, 24, &MEDIASUBTYPE_IYUV, CAP_IYUV }, { 8, 8, &MEDIASUBTYPE_RGB8, CAP_NONE }, { 15, 16, &MEDIASUBTYPE_RGB555, CAP_NONE }, { 16, 16, &MEDIASUBTYPE_RGB565, CAP_NONE }, { 24, 24, &MEDIASUBTYPE_RGB24, CAP_NONE }, { 32, 32, &MEDIASUBTYPE_RGB32, CAP_NONE }, {0}, }; DMO_VideoDecoder * DMO_VideoDecoder_Open(char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto) { DMO_VideoDecoder *this; HRESULT result; ct* c; this = malloc(sizeof(DMO_VideoDecoder)); memset( this, 0, sizeof(DMO_VideoDecoder)); this->m_sVhdr2 = 0; this->m_iLastQuality = -1; this->m_iMaxAuto = maxauto; Setup_LDT_Keeper(); //memset(&m_obh, 0, sizeof(m_obh)); //m_obh.biSize = sizeof(m_obh); /*try*/ { unsigned int bihs; bihs = (format->biSize < (int) sizeof(BITMAPINFOHEADER)) ? sizeof(BITMAPINFOHEADER) : format->biSize; this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs); memcpy(this->iv.m_bh, format, bihs); this->iv.m_State = STOP; //this->iv.m_pFrame = 0; this->iv.m_Mode = DIRECT; this->iv.m_iDecpos = 0; this->iv.m_iPlaypos = -1; this->iv.m_fQuality = 0.0f; this->iv.m_bCapable16b = true; bihs += sizeof(VIDEOINFOHEADER) - sizeof(BITMAPINFOHEADER); this->m_sVhdr = (VIDEOINFOHEADER*)malloc(bihs); memset(this->m_sVhdr, 0, bihs); memcpy(&this->m_sVhdr->bmiHeader, this->iv.m_bh, this->iv.m_bh->biSize); this->m_sVhdr->rcSource.left = this->m_sVhdr->rcSource.top = 0; this->m_sVhdr->rcSource.right = this->m_sVhdr->bmiHeader.biWidth; this->m_sVhdr->rcSource.bottom = this->m_sVhdr->bmiHeader.biHeight; //this->m_sVhdr->rcSource.right = 0; //this->m_sVhdr->rcSource.bottom = 0; this->m_sVhdr->rcTarget = this->m_sVhdr->rcSource; this->m_sOurType.majortype = MEDIATYPE_Video; this->m_sOurType.subtype = MEDIATYPE_Video; this->m_sOurType.subtype.f1 = this->m_sVhdr->bmiHeader.biCompression; this->m_sOurType.formattype = FORMAT_VideoInfo; this->m_sOurType.bFixedSizeSamples = false; this->m_sOurType.bTemporalCompression = true; this->m_sOurType.pUnk = 0; this->m_sOurType.cbFormat = bihs; this->m_sOurType.pbFormat = (char*)this->m_sVhdr; this->m_sVhdr2 = (VIDEOINFOHEADER*)(malloc(sizeof(VIDEOINFOHEADER)+12)); memcpy(this->m_sVhdr2, this->m_sVhdr, sizeof(VIDEOINFOHEADER)); memset((char*)this->m_sVhdr2 + sizeof(VIDEOINFOHEADER), 0, 12); this->m_sVhdr2->bmiHeader.biCompression = 0; this->m_sVhdr2->bmiHeader.biBitCount = 24; // memset((char*)this->m_sVhdr2, 0, sizeof(VIDEOINFOHEADER)+12); this->m_sVhdr2->rcTarget = this->m_sVhdr->rcTarget; // this->m_sVhdr2->rcSource = this->m_sVhdr->rcSource; memset(&this->m_sDestType, 0, sizeof(this->m_sDestType)); this->m_sDestType.majortype = MEDIATYPE_Video; this->m_sDestType.subtype = MEDIASUBTYPE_RGB24; this->m_sDestType.formattype = FORMAT_VideoInfo; this->m_sDestType.bFixedSizeSamples = true; this->m_sDestType.bTemporalCompression = false; this->m_sDestType.lSampleSize = labs(this->m_sVhdr2->bmiHeader.biWidth*this->m_sVhdr2->bmiHeader.biHeight * ((this->m_sVhdr2->bmiHeader.biBitCount + 7) / 8)); this->m_sVhdr2->bmiHeader.biSizeImage = this->m_sDestType.lSampleSize; this->m_sDestType.pUnk = 0; this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER); this->m_sDestType.pbFormat = (char*)this->m_sVhdr2; memset(&this->iv.m_obh, 0, sizeof(this->iv.m_obh)); memcpy(&this->iv.m_obh, this->iv.m_bh, sizeof(this->iv.m_obh) < (unsigned) this->iv.m_bh->biSize ? sizeof(this->iv.m_obh) : (unsigned) this->iv.m_bh->biSize); this->iv.m_obh.biBitCount=24; this->iv.m_obh.biSize = sizeof(BITMAPINFOHEADER); this->iv.m_obh.biCompression = 0; //BI_RGB //this->iv.m_obh.biHeight = labs(this->iv.m_obh.biHeight); this->iv.m_obh.biSizeImage = labs(this->iv.m_obh.biWidth * this->iv.m_obh.biHeight) * ((this->iv.m_obh.biBitCount + 7) / 8); this->m_pDMO_Filter = DMO_FilterCreate(dllname, guid, &this->m_sOurType, &this->m_sDestType); if (!this->m_pDMO_Filter) { printf("Failed to create DMO filter\n"); return 0; } if (!flip) { this->iv.m_obh.biHeight *= -1; this->m_sVhdr2->bmiHeader.biHeight = this->iv.m_obh.biHeight; // result = this->m_pDMO_Filter->m_pOutputPin->vt->QueryAccept(this->m_pDMO_Filter->m_pOutputPin, &this->m_sDestType); result = this->m_pDMO_Filter->m_pMedia->vt->SetOutputType(this->m_pDMO_Filter->m_pMedia, 0, &this->m_sDestType, DMO_SET_TYPEF_TEST_ONLY); if (result) { printf("Decoder does not support upside-down RGB frames\n"); this->iv.m_obh.biHeight *= -1; this->m_sVhdr2->bmiHeader.biHeight = this->iv.m_obh.biHeight; } } memcpy( &this->iv.m_decoder, &this->iv.m_obh, sizeof(this->iv.m_obh) ); switch (this->iv.m_bh->biCompression) { #if 0 case fccDIV3: case fccDIV4: case fccDIV5: case fccDIV6: case fccMP42: case fccWMV2: //YV12 seems to be broken for DivX :-) codec // case fccIV50: //produces incorrect picture //m_Caps = (CAPS) (m_Caps & ~CAP_YV12); //m_Caps = CAP_UYVY;//CAP_YUY2; // | CAP_I420; //m_Caps = CAP_I420; this->m_Caps = (CAP_YUY2 | CAP_UYVY); break; #endif default: this->m_Caps = CAP_NONE; printf("Decoder supports the following YUV formats: "); for (c = check; c->bits; c++) { this->m_sVhdr2->bmiHeader.biBitCount = c->bits; this->m_sVhdr2->bmiHeader.biCompression = c->fcc; this->m_sDestType.subtype = *c->subtype; //result = this->m_pDMO_Filter->m_pOutputPin->vt->QueryAccept(this->m_pDMO_Filter->m_pOutputPin, &this->m_sDestType); result = this->m_pDMO_Filter->m_pMedia->vt->SetOutputType(this->m_pDMO_Filter->m_pMedia, 0, &this->m_sDestType, DMO_SET_TYPEF_TEST_ONLY); if (!result) { this->m_Caps = (this->m_Caps | c->cap); printf("%.4s ", &c->fcc); } } printf("\n"); } if (this->m_Caps != CAP_NONE) printf("Decoder is capable of YUV output (flags 0x%x)\n", (int)this->m_Caps); this->m_sVhdr2->bmiHeader.biBitCount = 24; this->m_sVhdr2->bmiHeader.biCompression = 0; this->m_sDestType.subtype = MEDIASUBTYPE_RGB24; this->m_iMinBuffers = this->iv.VBUFSIZE; } /*catch (FatalError& error) { delete[] m_sVhdr; delete[] m_sVhdr2; delete m_pDMO_Filter; throw; }*/ return this; } void DMO_VideoDecoder_Destroy(DMO_VideoDecoder *this) { DMO_VideoDecoder_StopInternal(this); this->iv.m_State = STOP; free(this->m_sVhdr); free(this->m_sVhdr2); DMO_Filter_Destroy(this->m_pDMO_Filter); } void DMO_VideoDecoder_StartInternal(DMO_VideoDecoder *this) { #if 0 ALLOCATOR_PROPERTIES props, props1; Debug printf("DMO_VideoDecoder_StartInternal\n"); //cout << "DSSTART" << endl; this->m_pDMO_Filter->Start(this->m_pDMO_Filter); props.cBuffers = 1; props.cbBuffer = this->m_sDestType.lSampleSize; //don't know how to do this correctly props.cbAlign = props.cbPrefix = 0; this->m_pDMO_Filter->m_pAll->vt->SetProperties(this->m_pDMO_Filter->m_pAll, &props, &props1); this->m_pDMO_Filter->m_pAll->vt->Commit(this->m_pDMO_Filter->m_pAll); #endif this->iv.m_State = START; } void DMO_VideoDecoder_StopInternal(DMO_VideoDecoder *this) { // this->m_pDMO_Filter->Stop(this->m_pDMO_Filter); //??? why was this here ??? m_pOurOutput->SetFramePointer(0); } int DMO_VideoDecoder_DecodeInternal(DMO_VideoDecoder *this, const void* src, int size, int is_keyframe, char* imdata) { // IMediaSample* sample = 0; char* ptr; int result; unsigned long status; // to be ignored by M$ specs DMO_OUTPUT_DATA_BUFFER db; CMediaBuffer* bufferin; //+ uint8_t* imdata = dest ? dest->Data() : 0; Debug printf("DMO_VideoDecoder_DecodeInternal(%p,%p,%d,%d,%p)\n",this,src,size,is_keyframe,imdata); // this->m_pDMO_Filter->m_pAll->vt->GetBuffer(this->m_pDMO_Filter->m_pAll, &sample, 0, 0, 0); // if (!sample) // { // Debug printf("ERROR: null sample\n"); // return -1; // } Setup_FS_Segment(); bufferin = CMediaBufferCreate(size, (void*)src, size, 0); result = this->m_pDMO_Filter->m_pMedia->vt->ProcessInput(this->m_pDMO_Filter->m_pMedia, 0, (IMediaBuffer*)bufferin, (is_keyframe) ? DMO_INPUT_DATA_BUFFERF_SYNCPOINT : 0, 0, 0); ((IMediaBuffer*)bufferin)->vt->Release((IUnknown*)bufferin); if (result != S_OK) { /* something for process */ if (result != S_FALSE) printf("ProcessInputError r:0x%x=%d (keyframe: %d)\n", result, result, is_keyframe); else printf("ProcessInputError FALSE ?? (keyframe: %d)\n", is_keyframe); return size; } db.rtTimestamp = 0; db.rtTimelength = 0; db.dwStatus = 0; db.pBuffer = (IMediaBuffer*) CMediaBufferCreate(this->m_sDestType.lSampleSize, imdata, 0, 0); result = this->m_pDMO_Filter->m_pMedia->vt->ProcessOutput(this->m_pDMO_Filter->m_pMedia, (imdata) ? 0 : DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER, 1, &db, &status); //m_pDMO_Filter->m_pMedia->vt->Lock(m_pDMO_Filter->m_pMedia, 0); if ((unsigned)result == DMO_E_NOTACCEPTING) printf("ProcessOutputError: Not accepting\n"); else if (result) printf("ProcessOutputError: r:0x%x=%d %ld stat:%ld\n", result, result, status, db.dwStatus); ((IMediaBuffer*)db.pBuffer)->vt->Release((IUnknown*)db.pBuffer); //int r = m_pDMO_Filter->m_pMedia->vt->Flush(m_pDMO_Filter->m_pMedia); //printf("FLUSH %d\n", r); return 0; } /* * bits == 0 - leave unchanged */ //int SetDestFmt(DMO_VideoDecoder * this, int bits = 24, fourcc_t csp = 0); int DMO_VideoDecoder_SetDestFmt(DMO_VideoDecoder *this, int bits, unsigned int csp) { HRESULT result; int should_test=1; int stoped = 0; Debug printf("DMO_VideoDecoder_SetDestFmt (%p, %d, %d)\n",this,bits,(int)csp); /* if (!CImage::Supported(csp, bits)) return -1; */ // BitmapInfo temp = m_obh; if (!csp) // RGB { int ok = true; switch (bits) { case 15: this->m_sDestType.subtype = MEDIASUBTYPE_RGB555; break; case 16: this->m_sDestType.subtype = MEDIASUBTYPE_RGB565; break; case 24: this->m_sDestType.subtype = MEDIASUBTYPE_RGB24; break; case 32: this->m_sDestType.subtype = MEDIASUBTYPE_RGB32; break; default: ok = false; break; } if (ok) { this->iv.m_obh.biBitCount=bits; if( bits == 15 || bits == 16 ) { this->iv.m_obh.biSize=sizeof(BITMAPINFOHEADER)+12; this->iv.m_obh.biCompression=3;//BI_BITFIELDS this->iv.m_obh.biSizeImage=abs((int)(2*this->iv.m_obh.biWidth*this->iv.m_obh.biHeight)); } if( bits == 16 ) { this->iv.m_obh.colors[0]=0xF800; this->iv.m_obh.colors[1]=0x07E0; this->iv.m_obh.colors[2]=0x001F; } else if ( bits == 15 ) { this->iv.m_obh.colors[0]=0x7C00; this->iv.m_obh.colors[1]=0x03E0; this->iv.m_obh.colors[2]=0x001F; } else { this->iv.m_obh.biSize = sizeof(BITMAPINFOHEADER); this->iv.m_obh.biCompression = 0; //BI_RGB //this->iv.m_obh.biHeight = labs(this->iv.m_obh.biHeight); this->iv.m_obh.biSizeImage = labs(this->iv.m_obh.biWidth * this->iv.m_obh.biHeight) * ((this->iv.m_obh.biBitCount + 7) / 8); } } //.biSizeImage=abs(temp.biWidth*temp.biHeight*((temp.biBitCount+7)/8)); } else { // YUV int ok = true; switch (csp) { case fccYUY2: this->m_sDestType.subtype = MEDIASUBTYPE_YUY2; break; case fccYV12: this->m_sDestType.subtype = MEDIASUBTYPE_YV12; break; case fccIYUV: this->m_sDestType.subtype = MEDIASUBTYPE_IYUV; break; case fccI420: this->m_sDestType.subtype = MEDIASUBTYPE_I420; break; case fccUYVY: this->m_sDestType.subtype = MEDIASUBTYPE_UYVY; break; case fccYVYU: this->m_sDestType.subtype = MEDIASUBTYPE_YVYU; break; case fccYVU9: this->m_sDestType.subtype = MEDIASUBTYPE_YVU9; default: ok = false; break; } if (ok) { if (csp != 0 && csp != 3 && this->iv.m_obh.biHeight > 0) this->iv.m_obh.biHeight *= -1; // YUV formats uses should have height < 0 this->iv.m_obh.biSize = sizeof(BITMAPINFOHEADER); this->iv.m_obh.biCompression=csp; this->iv.m_obh.biBitCount=bits; this->iv.m_obh.biSizeImage=labs(this->iv.m_obh.biBitCount* this->iv.m_obh.biWidth*this->iv.m_obh.biHeight)>>3; } } this->m_sDestType.lSampleSize = this->iv.m_obh.biSizeImage; memcpy(&(this->m_sVhdr2->bmiHeader), &this->iv.m_obh, sizeof(this->iv.m_obh)); this->m_sVhdr2->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); if (this->m_sVhdr2->bmiHeader.biCompression == 3) this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER) + 12; else this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER); switch(csp) { case fccYUY2: if(!(this->m_Caps & CAP_YUY2)) should_test=false; break; case fccYV12: if(!(this->m_Caps & CAP_YV12)) should_test=false; break; case fccIYUV: if(!(this->m_Caps & CAP_IYUV)) should_test=false; break; case fccI420: if(!(this->m_Caps & CAP_I420)) should_test=false; break; case fccUYVY: if(!(this->m_Caps & CAP_UYVY)) should_test=false; break; case fccYVYU: if(!(this->m_Caps & CAP_YVYU)) should_test=false; break; case fccYVU9: if(!(this->m_Caps & CAP_YVU9)) should_test=false; break; } Setup_FS_Segment(); // if(should_test) // result = this->m_pDMO_Filter->m_pOutputPin->vt->QueryAccept(this->m_pDMO_Filter->m_pOutputPin, &this->m_sDestType); // else // result = -1; // test accept if(!this->m_pDMO_Filter) return 0; result = this->m_pDMO_Filter->m_pMedia->vt->SetOutputType(this->m_pDMO_Filter->m_pMedia, 0, &this->m_sDestType, DMO_SET_TYPEF_TEST_ONLY); if (result != 0) { if (csp) printf("Warning: unsupported color space\n"); else printf("Warning: unsupported bit depth\n"); this->m_sDestType.lSampleSize = this->iv.m_decoder.biSizeImage; memcpy(&(this->m_sVhdr2->bmiHeader), &this->iv.m_decoder, sizeof(this->iv.m_decoder)); this->m_sVhdr2->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); if (this->m_sVhdr2->bmiHeader.biCompression == 3) this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER) + 12; else this->m_sDestType.cbFormat = sizeof(VIDEOINFOHEADER); return -1; } memcpy( &this->iv.m_decoder, &this->iv.m_obh, sizeof(this->iv.m_obh)); // m_obh=temp; // if(csp) // m_obh.biBitCount=BitmapInfo::BitCount(csp); this->iv.m_bh->biBitCount = bits; //DMO_VideoDecoder_Restart(this); this->m_pDMO_Filter->m_pMedia->vt->SetOutputType(this->m_pDMO_Filter->m_pMedia, 0, &this->m_sDestType, 0); return 0; } int DMO_VideoDecoder_SetDirection(DMO_VideoDecoder *this, int d) { this->iv.m_obh.biHeight = (d) ? this->iv.m_bh->biHeight : -this->iv.m_bh->biHeight; this->m_sVhdr2->bmiHeader.biHeight = this->iv.m_obh.biHeight; return 0; } --- NEW FILE --- #ifndef AVIFILE_DMO_VIDEODECODER_H #define AVIFILE_DMO_VIDEODECODER_H typedef struct _DMO_VideoDecoder DMO_VideoDecoder; int DMO_VideoDecoder_GetCapabilities(DMO_VideoDecoder *this); DMO_VideoDecoder * DMO_VideoDecoder_Open(char* dllname, GUID* guid, BITMAPINFOHEADER * format, int flip, int maxauto); void DMO_VideoDecoder_Destroy(DMO_VideoDecoder *this); void DMO_VideoDecoder_StartInternal(DMO_VideoDecoder *this); void DMO_VideoDecoder_StopInternal(DMO_VideoDecoder *this); int DMO_VideoDecoder_DecodeInternal(DMO_VideoDecoder *this, const void* src, int size, int is_keyframe, char* pImage); /* * bits == 0 - leave unchanged */ //int SetDestFmt(DMO_VideoDecoder * this, int bits = 24, fourcc_t csp = 0); int DMO_VideoDecoder_SetDestFmt(DMO_VideoDecoder *this, int bits, unsigned int csp); int DMO_VideoDecoder_SetDirection(DMO_VideoDecoder *this, int d); #endif /* AVIFILE_DMO_VIDEODECODER_H */ --- NEW FILE --- LIBNAME = libDMO_Filter.a include ../../config.mak # DS_AudioDec.c SRCS = DMO_VideoDecoder.c buffer.c dmo.c dmo_guids.c OBJS = $(SRCS:.c=.o) INCLUDE = -I. -I../dshow -I.. $(EXTRA_INC) CFLAGS = $(OPTFLAGS) $(INCLUDE) -DNOAVIFILE_HEADERS .SUFFIXES: .c .o # .PHONY: all clean .c.o: $(CC) -c $(CFLAGS) -o $@ $< $(LIBNAME): $(OBJS) $(AR) r $(LIBNAME) $(OBJS) test: test.c $(LIBNAME) $(CC) test.c $(CFLAGS) -o test ./libDMO_Filter.a ../libloader.a $(ARCH_LIBS) -lstdc++ all: $(LIBNAME) clean: rm -f *.o *.a *~ distclean: rm -f Makefile.bak *.o *.a *~ .depend test test.raw dep: depend depend: $(CC) -MM $(CFLAGS) $(SRCS) 1>.depend # # include dependency files if they exist # ifneq ($(wildcard .depend),) include .depend endif --- NEW FILE --- #include "DMO_Filter.h" #include "wine/winerror.h" #include "wine/windef.h" #include <stdio.h> #include <string.h> #include <stdlib.h> struct _CMediaBuffer { IMediaBuffer_vt* vt; DECLARE_IUNKNOWN(); GUID interfaces[2]; void* mem; unsigned long len; unsigned long maxlen; int freemem; }; static HRESULT STDCALL CMediaBuffer_SetLength(IMediaBuffer* This, unsigned long cbLength) { CMediaBuffer* cmb = (CMediaBuffer*) This; Debug printf("CMediaBuffer_SetLength(%p) called (%ld, %ld)\n", This, cbLength, cmb->maxlen); if (cbLength > cmb->maxlen) return E_INVALIDARG; cmb->len = cbLength; return S_OK; } static HRESULT STDCALL CMediaBuffer_GetMaxLength(IMediaBuffer* This, /* [out] */ unsigned long *pcbMaxLength) { CMediaBuffer* cmb = (CMediaBuffer*) This; Debug printf("CMediaBuffer_GetMaxLength(%p) called -> %ld\n", This, cmb->maxlen); if (!pcbMaxLength) return E_POINTER; *pcbMaxLength = cmb->maxlen; return S_OK; } static HRESULT STDCALL CMediaBuffer_GetBufferAndLength(IMediaBuffer* This, /* [out] */ char** ppBuffer, /* [out] */ unsigned long* pcbLength) { CMediaBuffer* cmb = (CMediaBuffer*) This; Debug printf("CMediaBuffer_GetBufferAndLength(%p) called -> %p %ld\n", This, cmb->mem, cmb->len); if (!ppBuffer && !pcbLength) return E_POINTER; if (ppBuffer) *ppBuffer = cmb->mem; if (pcbLength) *pcbLength = cmb->len; return S_OK; } static void CMediaBuffer_Destroy(CMediaBuffer* This) { Debug printf("CMediaBuffer_Destroy(%p) called\n", This); if (This->freemem) free(This->mem); free(This->vt); free(This); } IMPLEMENT_IUNKNOWN(CMediaBuffer) CMediaBuffer* CMediaBufferCreate(unsigned long maxlen, void* mem, unsigned long len, int copy) { CMediaBuffer* This = (CMediaBuffer*) malloc(sizeof(CMediaBuffer)); if (!This) return NULL; This->vt = (IMediaBuffer_vt*) malloc(sizeof(IMediaBuffer_vt)); if (!This->vt) { CMediaBuffer_Destroy(This); return NULL; } This->refcount = 1; This->len = len; This->maxlen = maxlen; This->freemem = 0; This->mem = mem; if (copy) /* make a private copy of data */ This->mem = 0; if (This->mem == NULL) { if (This->maxlen) { This->mem = malloc(This->maxlen); if (!This->mem) { CMediaBuffer_Destroy(This); return NULL; } This->freemem = 1; if (copy) memcpy(This->mem, mem, This->len); } } This->vt->QueryInterface = CMediaBuffer_QueryInterface; This->vt->AddRef = CMediaBuffer_AddRef; This->vt->Release = CMediaBuffer_Release; This->vt->SetLength = CMediaBuffer_SetLength; This->vt->GetMaxLength = CMediaBuffer_GetMaxLength; This->vt->GetBufferAndLength = CMediaBuffer_GetBufferAndLength; This->interfaces[0] = IID_IUnknown; This->interfaces[1] = IID_IMediaBuffer; return This; } --- NEW FILE --- #include "DMO_Filter.h" #include "driver.h" #include "com.h" #include <stdio.h> #include <stdlib.h> #include <string.h> #include "win32.h" // printf macro void trapbug(); typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**); void DMO_Filter_Destroy(DMO_Filter* This) { if (This->m_pOptim) This->m_pOptim->vt->Release((IUnknown*)This->m_pOptim); if (This->m_pInPlace) This->m_pInPlace->vt->Release((IUnknown*)This->m_pInPlace); if (This->m_pMedia) This->m_pMedia->vt->Release((IUnknown*)This->m_pMedia); free(This); CodecRelease(); } DMO_Filter* DMO_FilterCreate(const char* dllname, const GUID* id, DMO_MEDIA_TYPE* in_fmt, DMO_MEDIA_TYPE* out_fmt) { HRESULT hr = 0; const char* em = NULL; DMO_Filter* This = (DMO_Filter*) malloc(sizeof(DMO_Filter)); if (!This) return NULL; memset(This, 0, sizeof(DMO_Filter)); CodecAlloc(); //This->Start = DS_Filter_Start; //This->Stop = DS_Filter_Stop; for (;;) { GETCLASS func; struct IClassFactory* factory = NULL; struct IUnknown* object = NULL; unsigned int i; unsigned long inputs, outputs; This->m_iHandle = LoadLibraryA(dllname); if (!This->m_iHandle) { em = "could not open DMO DLL"; break; } func = (GETCLASS)GetProcAddress((unsigned)This->m_iHandle, "DllGetClassObject"); if (!func) { em = "illegal or corrupt DMO DLL"; break; } //trapbug(); hr = func(id, &IID_IClassFactory, (void**)&factory); if (hr || !factory) { em = "no such class object"; break; } hr = factory->vt->CreateInstance(factory, 0, &IID_IUnknown, (void**)&object); factory->vt->Release((IUnknown*)factory); if (hr || !object) { em = "class factory failure"; break; } hr = object->vt->QueryInterface(object, &IID_IMediaObject, (void**)&This->m_pMedia); if (hr == 0) { /* query for some extra available interface */ HRESULT r = object->vt->QueryInterface(object, &IID_IMediaObjectInPlace, (void**)&This->m_pInPlace); if (r == 0 && This->m_pInPlace) printf("DMO dll supports InPlace - PLEASE REPORT to developer\n"); r = object->vt->QueryInterface(object, &IID_IDMOVideoOutputOptimizations, (void**)&This->m_pOptim); if (r == 0 && This->m_pOptim) { unsigned long flags; r = This->m_pOptim->vt->QueryOperationModePreferences(This->m_pOptim, 0, &flags); printf("DMO dll supports VO Optimizations %ld %lx\n", r, flags); if (flags & DMO_VOSF_NEEDS_PREVIOUS_SAMPLE) printf("DMO dll might use previous sample when requested\n"); } } object->vt->Release((IUnknown*)object); if (hr || !This->m_pMedia) { em = "object does not provide IMediaObject interface"; break; } hr = This->m_pMedia->vt->SetInputType(This->m_pMedia, 0, in_fmt, 0); if (hr) { em = "input format not accepted"; break; } if (0) { DMO_MEDIA_TYPE dmo; VIDEOINFOHEADER* vi; memset(&dmo, 0, sizeof(dmo)); i = This->m_pMedia->vt->GetOutputType(This->m_pMedia, 0, 2, &dmo); printf("GetOutputType %x \n", i); printf("DMO 0x%x (%.4s) 0x%x (%.4s)\n" //printf("DMO 0x%x 0x%x\n" ":: fixszsamp:%d tempcomp:%d sampsz:%ld\n" ":: formtype: 0x%x\n" ":: unk %p cbform: %ld pbform:%p\n", dmo.majortype.f1, (const char*)&dmo.majortype.f1, dmo.subtype.f1, (const char*)&dmo.subtype.f1, dmo.bFixedSizeSamples, dmo.bTemporalCompression, dmo.lSampleSize, dmo.formattype.f1, dmo.pUnk, dmo.cbFormat, dmo.pbFormat ); /* vi = (VIDEOINFOHEADER*) dmo.pbFormat; vi = (VIDEOINFOHEADER*) out_fmt->pbFormat; for (i = 0; i < out_fmt->cbFormat; i++) printf("BYTE %d %02x %02x\n", i, ((uint8_t*)dmo.pbFormat)[i], ((uint8_t*)out_fmt->pbFormat)[i]); */ } hr = This->m_pMedia->vt->SetOutputType(This->m_pMedia, 0, out_fmt, 0); if (hr) { em = "output format no accepted"; break; } inputs = outputs = 0; hr = This->m_pMedia->vt->GetOutputSizeInfo(This->m_pMedia, 0, &inputs, &outputs); printf("GetOutput r=0x%lx size:%ld align:%ld\n", hr, inputs, outputs); // This->m_pMedia->vt->AllocateStreamingResources(This->m_pMedia); hr = This->m_pMedia->vt->GetStreamCount(This->m_pMedia, &inputs, &outputs); printf("StreamCount r=0x%lx %ld %ld\n", hr, inputs, outputs); break; } if (em) { DMO_Filter_Destroy(This); printf("IMediaObject ERROR: %p %s (0x%lx : %ld)\n", em, em ? em : "", hr, hr); This = 0; } return This; } --- NEW FILE --- #ifndef DMO_H #define DMO_H /* * * Definition of important DMO interfaces. * Created using freely-available DirectX 8.1 SDK * ( http://msdn.microsoft.com ) * */ #include "dshow/iunk.h" #include "dshow/guids.h" typedef AM_MEDIA_TYPE DMO_MEDIA_TYPE; enum _DMO_INPUT_DATA_BUFFER_FLAGS { DMO_INPUT_DATA_BUFFERF_SYNCPOINT = 0x1, DMO_INPUT_DATA_BUFFERF_TIME = 0x2, DMO_INPUT_DATA_BUFFERF_TIMELENGTH = 0x4 }; enum _DMO_OUTPUT_DATA_BUFFER_FLAGS { DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT = 0x1, DMO_OUTPUT_DATA_BUFFERF_TIME = 0x2, DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH = 0x4, DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE = 0x1000000 }; enum _DMO_INPUT_STATUS_FLAGS { DMO_INPUT_STATUSF_ACCEPT_DATA = 0x1 }; enum _DMO_INPUT_STREAM_INFO_FLAGS { DMO_INPUT_STREAMF_WHOLE_SAMPLES = 0x1, DMO_INPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER = 0x2, DMO_INPUT_STREAMF_FIXED_SAMPLE_SIZE = 0x4, DMO_INPUT_STREAMF_HOLDS_BUFFERS = 0x8 }; enum _DMO_OUTPUT_STREAM_INFO_FLAGS { DMO_OUTPUT_STREAMF_WHOLE_SAMPLES = 0x1, DMO_OUTPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER = 0x2, DMO_OUTPUT_STREAMF_FIXED_SAMPLE_SIZE = 0x4, DMO_OUTPUT_STREAMF_DISCARDABLE = 0x8, DMO_OUTPUT_STREAMF_OPTIONAL = 0x10 }; enum _DMO_SET_TYPE_FLAGS { DMO_SET_TYPEF_TEST_ONLY = 0x1, DMO_SET_TYPEF_CLEAR = 0x2 }; enum _DMO_PROCESS_OUTPUT_FLAGS { DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x1 }; enum _DMO_VIDEO_OUTPUT_STREAM_FLAGS { DMO_VOSF_NEEDS_PREVIOUS_SAMPLE = 0x1 }; /* MediaErr.h */ #define DMO_E_INVALIDSTREAMINDEX 0x80040201 #define DMO_E_INVALIDTYPE 0x80040202 #define DMO_E_TYPE_NOT_SET 0x80040203 #define DMO_E_NOTACCEPTING 0x80040204 #define DMO_E_TYPE_NOT_ACCEPTED 0x80040205 #define DMO_E_NO_MORE_ITEMS 0x80040206 #endif /* DMO_H */ --- NEW FILE --- #include "dmo_guids.h" int DMO_DEBUG = 0; const GUID IID_IMediaBuffer = { 0x59eff8b9, 0x938c, 0x4a26, { 0x82, 0xf2, 0x95, 0xcb, 0x84, 0xcd, 0xc8, 0x37}}; const GUID IID_IMediaObject = { 0xd8ad0f58, 0x5494, 0x4102, { 0x97, 0xc5, 0xec, 0x79, 0x8e, 0x59, 0xbc, 0xf4}}; const GUID IID_IEnumDMO = { 0x2c3cd98a, 0x2bfa, 0x4a53, { 0x9c, 0x27, 0x52, 0x49, 0xba, 0x64, 0xba, 0x0f}}; const GUID IID_IMediaObjectInPlace = { 0x651b9ad0, 0x0fc7, 0x4aa9, { 0x95, 0x38, 0xd8, 0x99, 0x31, 0x01, 0x07, 0x41}}; const GUID IID_IDMOQualityControl = { 0x65abea96, 0xcf36, 0x453f, { 0xaf, 0x8a, 0x70, 0x5e, 0x98, 0xf1, 0x62, 0x60}}; const GUID IID_IDMOVideoOutputOptimizations = { 0xbe8f4f4e, 0x5b16, 0x4d29, { 0xb3, 0x50, 0x7f, 0x6b, 0x5d, 0x92, 0x98, 0xac}}; const GUID DMOCATEGORY_AUDIO_DECODER = { 0x57f2db8b, 0xe6bb, 0x4513, { 0x9d, 0x43, 0xdc, 0xd2, 0xa6, 0x59, 0x31, 0x25}}; const GUID DMOCATEGORY_AUDIO_ENCODER = { 0x33d9a761, 0x90c8, 0x11d0, { 0xbd, 0x43, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86}}; const GUID DMOCATEGORY_VIDEO_DECODER = { 0x4a69b442, 0x28be, 0x4991, { 0x96, 0x9c, 0xb5, 0x00, 0xad, 0xf5, 0xd8, 0xa8}}; const GUID DMOCATEGORY_VIDEO_ENCODER = { 0x33d9a760, 0x90c8, 0x11d0, { 0xbd, 0x43, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86}}; const GUID DMOCATEGORY_AUDIO_EFFECT = { 0xf3602b3f, 0x0592, 0x48df, { 0xa4, 0xcd, 0x67, 0x47, 0x21, 0xe7, 0xeb, 0xeb}}; const GUID DMOCATEGORY_VIDEO_EFFECT = { 0xd990ee14, 0x776c, 0x4723, { 0xbe, 0x46, 0x3d, 0xa2, 0xf5, 0x6f, 0x10,0xb9}}; const GUID DMOCATEGORY_AUDIO_CAPTURE_EFFECT = { 0xf665aaba, 0x3e09, 0x4920, { 0xaa, 0x5f, 0x21, 0x98, 0x11, 0x14, 0x8f, 0x09}}; const GUID DMOCATEGORY_ACOUSTIC_ECHO_CANCEL = { 0xBF963D80L, 0xC559, 0x11D0, { 0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; const GUID DMOCATEGORY_AUDIO_NOISE_SUPPRESS = { 0xe07f903f, 0x62fd, 0x4e60, { 0x8c, 0xdd, 0xde, 0xa7, 0x23, 0x66, 0x65, 0xb5}}; const GUID DMOCATEGORY_AGC = { 0xe88c9ba0l, 0xc557, 0x11d0, { 0x8a, 0x2b, 0x00, 0xa0, 0xc9, 0x25, 0x5a, 0xc1}}; --- NEW FILE --- #ifndef DMO_GUIDS_H #define DMO_GUIDS_H #include "dshow/guids.h" extern const GUID IID_IMediaBuffer; extern const GUID IID_IMediaObject; extern const GUID IID_IEnumDMO; extern const GUID IID_IMediaObjectInPlace; extern const GUID IID_IDMOQualityControl; extern const GUID IID_IDMOVideoOutputOptimizations; /* to be removed extern const GUID DMOCATEGORY_AUDIO_DECODER; extern const GUID DMOCATEGORY_AUDIO_ENCODER; extern const GUID DMOCATEGORY_VIDEO_DECODER; extern const GUID DMOCATEGORY_VIDEO_ENCODER; extern const GUID DMOCATEGORY_AUDIO_EFFECT; extern const GUID DMOCATEGORY_VIDEO_EFFECT; extern const GUID DMOCATEGORY_AUDIO_CAPTURE_EFFECT; // Acoustic Echo Canceller // Matches KSNODETYPE_ACOUSTIC_ECHO_CANCEL extern const GUID DMOCATEGORY_ACOUSTIC_ECHO_CANCEL; // Noise Supression // Matches KSNODETYPE_AUDIO_NOISE_SUPPRESS extern const GUID DMOCATEGORY_AUDIO_NOISE_SUPPRESS; // Automatic Gain Control // Matches KSNODETYPE_AGC extern const GUID DMOCATEGORY_AGC; */ #endif --- NEW FILE --- #ifndef DMO_INTERFACE_H #define DMO_INTERFACE_H #include "dmo.h" /* * IMediaBuffer interface */ typedef struct _IMediaBuffer IMediaBuffer; typedef struct IMediaBuffer_vt { INHERIT_IUNKNOWN(); HRESULT STDCALL ( *SetLength )(IMediaBuffer* This, unsigned long cbLength); HRESULT STDCALL ( *GetMaxLength )(IMediaBuffer* This, /* [out] */ unsigned long *pcbMaxLength); HRESULT STDCALL ( *GetBufferAndLength )(IMediaBuffer* This, /* [out] */ char** ppBuffer, /* [out] */ unsigned long* pcbLength); } IMediaBuffer_vt; struct _IMediaBuffer { IMediaBuffer_vt* vt; }; typedef struct _DMO_OUTPUT_DATA_BUFFER { IMediaBuffer *pBuffer; unsigned long dwStatus; REFERENCE_TIME rtTimestamp; REFERENCE_TIME rtTimelength; } DMO_OUTPUT_DATA_BUFFER; /* * IMediaObject interface */ typedef struct _IMediaObject IMediaObject; typedef struct IMediaObject_vt { INHERIT_IUNKNOWN(); HRESULT STDCALL ( *GetStreamCount )(IMediaObject * This, /* [out] */ unsigned long *pcInputStreams, /* [out] */ unsigned long *pcOutputStreams); HRESULT STDCALL ( *GetInputStreamInfo )(IMediaObject * This, unsigned long dwInputStreamIndex, /* [out] */ unsigned long *pdwFlags); HRESULT STDCALL ( *GetOutputStreamInfo )(IMediaObject * This, unsigned long dwOutputStreamIndex, /* [out] */ unsigned long *pdwFlags); HRESULT STDCALL ( *GetInputType )(IMediaObject * This, unsigned long dwInputStreamIndex, unsigned long dwTypeIndex, /* [out] */ DMO_MEDIA_TYPE *pmt); HRESULT STDCALL ( *GetOutputType )(IMediaObject * This, unsigned long dwOutputStreamIndex, unsigned long dwTypeIndex, /* [out] */ DMO_MEDIA_TYPE *pmt); HRESULT STDCALL ( *SetInputType )(IMediaObject * This, unsigned long dwInputStreamIndex, /* [in] */ const DMO_MEDIA_TYPE *pmt, unsigned long dwFlags); HRESULT STDCALL ( *SetOutputType )(IMediaObject * This, unsigned long dwOutputStreamIndex, /* [in] */ const DMO_MEDIA_TYPE *pmt, unsigned long dwFlags); HRESULT STDCALL ( *GetInputCurrentType )(IMediaObject * This, unsigned long dwInputStreamIndex, /* [out] */ DMO_MEDIA_TYPE *pmt); HRESULT STDCALL ( *GetOutputCurrentType )(IMediaObject * This, unsigned long dwOutputStreamIndex, /* [out] */ DMO_MEDIA_TYPE *pmt); HRESULT STDCALL ( *GetInputSizeInfo )(IMediaObject * This, unsigned long dwInputStreamIndex, /* [out] */ unsigned long *pcbSize, /* [out] */ unsigned long *pcbMaxLookahead, /* [out] */ unsigned long *pcbAlignment); HRESULT STDCALL ( *GetOutputSizeInfo )(IMediaObject * This, unsigned long dwOutputStreamIndex, /* [out] */ unsigned long *pcbSize, /* [out] */ unsigned long *pcbAlignment); HRESULT STDCALL ( *GetInputMaxLatency )(IMediaObject * This, unsigned long dwInputStreamIndex, /* [out] */ REFERENCE_TIME *prtMaxLatency); HRESULT STDCALL ( *SetInputMaxLatency )(IMediaObject * This, unsigned long dwInputStreamIndex, REFERENCE_TIME rtMaxLatency); HRESULT STDCALL ( *Flush )(IMediaObject * This); HRESULT STDCALL ( *Discontinuity )(IMediaObject * This, unsigned long dwInputStreamIndex); HRESULT STDCALL ( *AllocateStreamingResources )(IMediaObject * This); HRESULT STDCALL ( *FreeStreamingResources )(IMediaObject * This); HRESULT STDCALL ( *GetInputStatus )(IMediaObject * This, unsigned long dwInputStreamIndex, /* [out] */ unsigned long *dwFlags); HRESULT STDCALL ( *ProcessInput )(IMediaObject * This, unsigned long dwInputStreamIndex, IMediaBuffer *pBuffer, unsigned long dwFlags, REFERENCE_TIME rtTimestamp, REFERENCE_TIME rtTimelength); HRESULT STDCALL ( *ProcessOutput )(IMediaObject * This, unsigned long dwFlags, unsigned long cOutputBufferCount, /* [size_is][out][in] */ DMO_OUTPUT_DATA_BUFFER *pOutputBuffers, /* [out] */ unsigned long *pdwStatus); HRESULT STDCALL ( *Lock )(IMediaObject * This, long bLock); } IMediaObject_vt; struct _IMediaObject { IMediaObject_vt* vt; }; /* * IEnumDMO interface */ typedef struct _IEnumDMO IEnumDMO; typedef struct IEnumDMO_vt { INHERIT_IUNKNOWN(); HRESULT STDCALL ( *Next )(IEnumDMO * This, unsigned long cItemsToFetch, /* [length_is][size_is][out] */ CLSID *pCLSID, /* [string][length_is][size_is][out] */ WCHAR **Names, /* [out] */ unsigned long *pcItemsFetched); HRESULT STDCALL ( *Skip )(IEnumDMO * This, unsigned long cItemsToSkip); HRESULT STDCALL ( *Reset )(IEnumDMO * This); HRESULT STDCALL ( *Clone )(IEnumDMO * This, /* [out] */ IEnumDMO **ppEnum); } IEnumDMO_vt; struct _IEnumDMO { IEnumDMO_vt* vt; }; /* * IMediaObjectInPlace interface */ typedef struct _IMediaObjectInPlace IMediaObjectInPlace; typedef struct IMediaObjectInPlace_vt { INHERIT_IUNKNOWN(); HRESULT STDCALL ( *Process )(IMediaObjectInPlace * This, /* [in] */ unsigned long ulSize, /* [size_is][out][in] */ BYTE *pData, /* [in] */ REFERENCE_TIME refTimeStart, /* [in] */ unsigned long dwFlags); HRESULT STDCALL ( *Clone )(IMediaObjectInPlace * This, /* [out] */ IMediaObjectInPlace **ppMediaObject); HRESULT STDCALL ( *GetLatency )(IMediaObjectInPlace * This, /* [out] */ REFERENCE_TIME *pLatencyTime); } IMediaObjectInPlace_vt; struct _IMediaObjectInPlace { IMediaObjectInPlace_vt* vt; }; /* * IDMOQualityControl interface */ typedef struct _IDMOQualityControl IDMOQualityControl; typedef struct IDMOQualityControl_vt { INHERIT_IUNKNOWN(); HRESULT STDCALL ( *SetNow )(IDMOQualityControl * This, /* [in] */ REFERENCE_TIME rtNow); HRESULT STDCALL ( *SetStatus )(IDMOQualityControl * This, /* [in] */ unsigned long dwFlags); HRESULT STDCALL ( *GetStatus )(IDMOQualityControl * This, /* [out] */ unsigned long *pdwFlags); } IDMOQualityControl_vt; struct _IDMOQualityControl { IDMOQualityControl_vt* vt; }; /* * IDMOVideoOutputOptimizations interface */ typedef struct _IDMOVideoOutputOptimizations IDMOVideoOutputOptimizations; typedef struct IDMOVideoOutputOptimizations_vt { INHERIT_IUNKNOWN(); HRESULT STDCALL ( *QueryOperationModePreferences )(IDMOVideoOutputOptimizations * This, unsigned long ulOutputStreamIndex, unsigned long *pdwRequestedCapabilities); HRESULT STDCALL ( *SetOperationMode )(IDMOVideoOutputOptimizations * This, unsigned long ulOutputStreamIndex, unsigned long dwEnabledFeatures); HRESULT STDCALL ( *GetCurrentOperationMode )(IDMOVideoOutputOptimizations * This, unsigned long ulOutputStreamIndex, unsigned long *pdwEnabledFeatures); HRESULT STDCALL ( *GetCurrentSampleRequirements )(IDMOVideoOutputOptimizations * This, unsigned long ulOutputStreamIndex, unsigned long *pdwRequestedFeatures); } IDMOVideoOutputOptimizations_vt; struct _IDMOVideoOutputOptimizations { IDMOVideoOutputOptimizations_vt* vt; }; #endif /* DMO_INTERFACE_H */

1 0

CVS: main/loader/dmo - New directory
by Arpi of Ize 26 Nov '02

26 Nov '02

Update of /cvsroot/mplayer/main/loader/dmo In directory mail:/var/tmp.root/cvs-serv4885/dmo Log Message: Directory /cvsroot/mplayer/main/loader/dmo added to the repository

1 0

CVS: main/loader win32.c,1.67,1.68
by Arpi of Ize 26 Nov '02

26 Nov '02

Update of /cvsroot/mplayer/main/loader In directory mail:/var/tmp.root/cvs-serv30058 Modified Files: win32.c Log Message: avifile sync (added only the new functions, all cosmetics ignored) Index: win32.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/win32.c,v retrieving revision 1.67 retrieving revision 1.68 diff -u -r1.67 -r1.68 --- win32.c 25 Nov 2002 18:51:25 -0000 1.67 +++ win32.c 26 Nov 2002 21:03:46 -0000 1.68 @@ -2815,16 +2815,24 @@ return ret; } +static long WINAPI expInterlockedCompareExchange( unsigned long* dest, unsigned long exchange, unsigned long comperand) +{ + unsigned long retval = *dest; + if(*dest == comperand) + *dest = exchange; + return retval; +} + static long WINAPI expInterlockedIncrement( long* dest ) { long result=expInterlockedExchangeAdd( dest, 1 ) + 1; -// dbgprintf("InterlockedIncrement(0x%x => %d) => %d\n", dest, *dest, result); + dbgprintf("InterlockedIncrement(0x%x => %d) => %d\n", dest, *dest, result); return result; } static long WINAPI expInterlockedDecrement( long* dest ) { long result=expInterlockedExchangeAdd( dest, -1 ) - 1; -// dbgprintf("InterlockedDecrement(0x%x => %d) => %d\n", dest, *dest, result); + dbgprintf("InterlockedDecrement(0x%x => %d) => %d\n", dest, *dest, result); return result; } @@ -3190,9 +3198,8 @@ static int WINAPI expIsRectEmpty(CONST RECT *lprc) { int r = 0; -// int r = (!lprc || (lprc->right == lprc->left) || (lprc->top == lprc->bottom)); int w,h; - +//trapbug(); if (lprc) { w = lprc->right - lprc->left; @@ -3204,9 +3211,9 @@ r = 1; dbgprintf("IsRectEmpty(%p) => %s\n", lprc, (r) ? "TRUE" : "FALSE"); -// printf("Rect: left: %d, top: %d, right: %d, bottom: %d\n", -// lprc->left, lprc->top, lprc->right, lprc->bottom); - return r; + //printf("Rect: left: %d, top: %d, right: %d, bottom: %d\n", lprc->left, lprc->top, lprc->right, lprc->bottom); +// return 0; // wmv9? + return r; // TM20 } static int _adjust_fdiv=0; //what's this? - used to adjust division @@ -3286,7 +3293,7 @@ } static UINT WINAPI expSetErrorMode(UINT i) { -// dbgprintf("SetErrorMode(%d) => 0\n", i); + dbgprintf("SetErrorMode(%d) => 0\n", i); return 0; } static UINT WINAPI expGetWindowsDirectoryA(LPSTR s,UINT c) @@ -3757,6 +3764,80 @@ my_release(memory); return 0; } + +/* + * local definition - we need only the last two members at this point + * otherwice we would have to introduce here GUIDs and some more types.. + */ +typedef struct __attribute__((__packed__)) +{ + char hay[0x40]; + unsigned long cbFormat; //0x40 + char* pbFormat; //0x44 +} MY_MEDIA_TYPE; +static HRESULT WINAPI expMoCopyMediaType(MY_MEDIA_TYPE* dest, const MY_MEDIA_TYPE* src) +{ + if (!dest || !src) + return E_POINTER; + memcpy(dest, src, sizeof(MY_MEDIA_TYPE)); + if (dest->cbFormat) + { + dest->pbFormat = (char*) my_mreq(dest->cbFormat, 0); + if (!dest->pbFormat) + return E_OUTOFMEMORY; + memcpy(dest->pbFormat, src->pbFormat, dest->cbFormat); + } + return S_OK; +} +static HRESULT WINAPI expMoInitMediaType(MY_MEDIA_TYPE* dest, DWORD cbFormat) +{ + if (!dest) + return E_POINTER; + memset(dest, 0, sizeof(MY_MEDIA_TYPE)); + if (cbFormat) + { + dest->pbFormat = (char*) my_mreq(cbFormat, 0); + if (!dest->pbFormat) + return E_OUTOFMEMORY; + } + return S_OK; +} +static HRESULT WINAPI expMoCreateMediaType(MY_MEDIA_TYPE** dest, DWORD cbFormat) +{ + if (!dest) + return E_POINTER; + *dest = my_mreq(sizeof(MY_MEDIA_TYPE), 0); + return expMoInitMediaType(*dest, cbFormat); +} +static HRESULT WINAPI expMoDuplicateMediaType(MY_MEDIA_TYPE** dest, const void* src) +{ + if (!dest) + return E_POINTER; + *dest = my_mreq(sizeof(MY_MEDIA_TYPE), 0); + return expMoCopyMediaType(*dest, src); +} +static HRESULT WINAPI expMoFreeMediaType(MY_MEDIA_TYPE* dest) +{ + if (!dest) + return E_POINTER; + if (dest->pbFormat) + { + my_release(dest->pbFormat); + dest->pbFormat = 0; + dest->cbFormat = 0; + } + return S_OK; +} +static HRESULT WINAPI expMoDeleteMediaType(MY_MEDIA_TYPE* dest) +{ + if (!dest) + return E_POINTER; + expMoFreeMediaType(dest); + my_release(dest); + return S_OK; +} + + #if 0 static int exp_initterm(int v1, int v2) { @@ -4079,12 +4160,31 @@ ); } +#warning check for _CIpow +static double exp_CIpow(double x, double y) +{ + /*printf("Pow %f %f 0x%Lx 0x%Lx => %f\n", x, y, *((int64_t*)&x), *((int64_t*)&y), pow(x, y));*/ + return pow(x, y); +} + static double exppow(double x, double y) { /*printf("Pow %f %f 0x%Lx 0x%Lx => %f\n", x, y, *((int64_t*)&x), *((int64_t*)&y), pow(x, y));*/ return pow(x, y); } +static double expldexp(double x, int expo) +{ + /*printf("Cos %f => %f 0x%Lx\n", x, cos(x), *((int64_t*)&x));*/ + return ldexp(x, expo); +} + +static double expfrexp(double x, int* expo) +{ + /*printf("Cos %f => %f 0x%Lx\n", x, cos(x), *((int64_t*)&x));*/ + return frexp(x, expo); +} + static int exp_stricmp(const char* s1, const char* s2) @@ -4580,6 +4680,7 @@ FF(IsProcessorFeaturePresent, -1) FF(GetProcessAffinityMask, -1) FF(InterlockedExchange, -1) + FF(InterlockedCompareExchange, -1) FF(MulDiv, -1) FF(lstrcmpiA, -1) FF(lstrlenA, -1) @@ -4635,13 +4736,18 @@ FF(pow, -1) FF(cos, -1) FF(_ftol,-1) + FF(_CIpow,-1) + FF(ldexp,-1) + FF(frexp,-1) FF(sprintf,-1) FF(sscanf,-1) FF(fopen,-1) FF(fprintf,-1) FF(printf,-1) FF(getenv,-1) +#ifdef MPLAYER FF(_EH_prolog,-1) +#endif FF(calloc,-1) {"ceil",-1,(void*)&ceil}, /* needed by imagepower mjpeg2k */ @@ -4762,14 +4868,12 @@ }; struct exports exp_msdmo[]={ FF(memcpy, -1) // just test -/* - FF(MoCopyMediaType) - FF(MoCreateMediaType) - FF(MoDeleteMediaType) - FF(MoDuplicateMediaType) - FF(MoFreeMediaType) - FF(MoInitMediaType) -*/ + FF(MoCopyMediaType, -1) + FF(MoCreateMediaType, -1) + FF(MoDeleteMediaType, -1) + FF(MoDuplicateMediaType, -1) + FF(MoFreeMediaType, -1) + FF(MoInitMediaType, -1) }; struct exports exp_oleaut32[]={ FF(VariantInit, 8) @@ -4886,7 +4990,7 @@ static char extcode[20000];// place for 200 unresolved exports static const char* called_unk = "Called unk_%s\n"; -static void* add_stub() +static void* add_stub(void) { // generated code in runtime! char* answ = (char*)extcode+pos*0x30;

1 0

CVS: main/loader/dshow DS_AudioDecoder.c,1.10,1.11 DS_Filter.c,1.16,1.17 allocator.c,1.7,1.8 allocator.h,1.6,1.7 cmediasample.c,1.8,1.9 guids.c,1.6,1.7 guids.h,1.7,1.8 inputpin.h,1.6,1.7 iunk.h,1.4,1.5 outputpin.c,1.10,1.11
by Arpi of Ize 26 Nov '02

26 Nov '02

Update of /cvsroot/mplayer/main/loader/dshow In directory mail:/var/tmp.root/cvs-serv26451 Modified Files: DS_AudioDecoder.c DS_Filter.c allocator.c allocator.h cmediasample.c guids.c guids.h inputpin.h iunk.h outputpin.c Log Message: avifile sync (mostly cosmetics) Index: DS_AudioDecoder.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/dshow/DS_AudioDecoder.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- DS_AudioDecoder.c 20 May 2002 03:51:58 -0000 1.10 +++ DS_AudioDecoder.c 26 Nov 2002 21:00:20 -0000 1.11 @@ -30,18 +30,6 @@ #include <stdlib.h> #define __MODULE__ "DirectShow audio decoder" -const GUID FORMAT_WaveFormatEx = { - 0x05589f81, 0xc356, 0x11CE, - { 0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A } -}; -const GUID MEDIATYPE_Audio = { - 0x73647561, 0x0000, 0x0010, - { 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71 } -}; -const GUID MEDIASUBTYPE_PCM = { - 0x00000001, 0x0000, 0x0010, - { 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71 } -}; typedef long STDCALL (*GETCLASS) (GUID*, GUID*, void**); Index: DS_Filter.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/dshow/DS_Filter.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- DS_Filter.c 22 Sep 2002 02:33:27 -0000 1.16 +++ DS_Filter.c 26 Nov 2002 21:00:20 -0000 1.17 @@ -8,7 +8,7 @@ typedef long STDCALL (*GETCLASS) (const GUID*, const GUID*, void**); -//extern "C" STDCALL void* GetProcAddress(int, const char*); // STDCALL has to be first NetBSD +//void trapbug(); static void DS_Filter_Start(DS_Filter* This) { @@ -18,7 +18,7 @@ return; //Debug printf("DS_Filter_Start(%p)\n", This); - hr = This->m_pFilter->vt->Run(This->m_pFilter, 0); + hr = This->m_pFilter->vt->Run(This->m_pFilter, (REFERENCE_TIME)0); if (hr != 0) { Debug printf("WARNING: m_Filter->Run() failed, error code %x\n", (int)hr); @@ -73,7 +73,7 @@ // FIXME - we are still leaving few things allocated! if (This->m_iHandle) - FreeLibrary(This->m_iHandle); + FreeLibrary((unsigned)This->m_iHandle); free(This); @@ -87,6 +87,7 @@ int init = 0; // char eb[250]; const char* em = NULL; + HRESULT result; DS_Filter* This = (DS_Filter*) malloc(sizeof(DS_Filter)); if (!This) return NULL; @@ -108,7 +109,6 @@ for (;;) { - HRESULT result; GETCLASS func; struct IClassFactory* factory = NULL; struct IUnknown* object = NULL; @@ -123,7 +123,7 @@ em = "could not open DirectShow DLL"; break; } - func = (GETCLASS)GetProcAddress(This->m_iHandle, "DllGetClassObject"); + func = (GETCLASS)GetProcAddress((unsigned)This->m_iHandle, "DllGetClassObject"); if (!func) { em = "illegal or corrupt DirectShow DLL"; @@ -159,7 +159,7 @@ enum_pins->vt->Reset(enum_pins); result = enum_pins->vt->Next(enum_pins, (ULONG)256, (IPin**)array, &fetched); - Debug printf("Pins enumeration returned %d pins, error is %x\n", (int)fetched, (int)result); + Debug printf("Pins enumeration returned %ld pins, error is %x\n", fetched, (int)result); for (i = 0; i < fetched; i++) { @@ -236,7 +236,7 @@ if (!init) { DS_Filter_Destroy(This); - printf("Warning: DS_Filter() %s. (DLL=%.200s)\n", em, dllname); + printf("Warning: DS_Filter() %s. (DLL=%.200s, r=0x%x)\n", em, dllname, result); This = 0; } return This; Index: allocator.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/dshow/allocator.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- allocator.c 13 Sep 2002 19:43:15 -0000 1.7 +++ allocator.c 26 Nov 2002 21:00:20 -0000 1.8 @@ -283,7 +283,7 @@ } } -void MemAllocator_Destroy(MemAllocator* This) +static void MemAllocator_Destroy(MemAllocator* This) { Debug printf("MemAllocator_Destroy(%p) called (%d, %d)\n", This, This->refcount, AllocatorKeeper); if (--AllocatorKeeper == 0) Index: allocator.h =================================================================== RCS file: /cvsroot/mplayer/main/loader/dshow/allocator.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- allocator.h 13 Sep 2002 19:43:15 -0000 1.6 +++ allocator.h 26 Nov 2002 21:00:20 -0000 1.7 @@ -22,6 +22,6 @@ void ( *ResetPointer )(MemAllocator* This); }; -MemAllocator* MemAllocatorCreate(); +MemAllocator* MemAllocatorCreate(void); #endif /* DS_ALLOCATOR_H */ Index: cmediasample.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/dshow/cmediasample.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cmediasample.c 13 Sep 2002 19:43:15 -0000 1.8 +++ cmediasample.c 26 Nov 2002 21:00:20 -0000 1.9 @@ -4,6 +4,13 @@ #include <string.h> #include <stdlib.h> +/* + * currently hack to make some extra room for DS Acel codec which + * seems to overwrite allocated memory - FIXME better later + * check the buffer allocation + */ +static const int SAFETY_ACEL = 1024; + static long STDCALL CMediaSample_QueryInterface(IUnknown* This, /* [in] */ const GUID* iid, /* [iid_is][out] */ void **ppv) @@ -78,7 +85,7 @@ /* [out] */ REFERENCE_TIME *pTimeStart, /* [out] */ REFERENCE_TIME *pTimeEnd) { - Debug printf("CMediaSample_GetTime(%p) called (UNIMPLIMENTED)\n", This); + Debug printf("CMediaSample_GetTime(%p) called (UNIMPLEMENTED)\n", This); return E_NOTIMPL; } @@ -86,7 +93,7 @@ /* [in] */ REFERENCE_TIME *pTimeStart, /* [in] */ REFERENCE_TIME *pTimeEnd) { - Debug printf("CMediaSample_SetTime(%p) called (UNIMPLIMENTED)\n", This); + Debug printf("CMediaSample_SetTime(%p) called (UNIMPLEMENTED)\n", This); return E_NOTIMPL; } @@ -135,12 +142,13 @@ { CMediaSample* cms = (CMediaSample*)This; Debug printf("CMediaSample_SetActualDataLength(%p, %ld) called\n", This, __MIDL_0010); + if (__MIDL_0010 > cms->size) { char* c = cms->own_block; - Debug printf(" CMediaSample - buffer overflow %ld %d %p %p\n", + Debug printf("CMediaSample - buffer overflow %ld %d %p %p\n", __MIDL_0010, ((CMediaSample*)This)->size, cms->own_block, cms->block); - cms->own_block = realloc(cms->own_block, __MIDL_0010); + cms->own_block = (char*) realloc(cms->own_block, (size_t) __MIDL_0010 + SAFETY_ACEL); if (c == cms->block) cms->block = cms->own_block; cms->size = __MIDL_0010; @@ -266,7 +274,7 @@ // _size = (_size + 0xfff) & ~0xfff; This->vt = (IMediaSample_vt*) malloc(sizeof(IMediaSample_vt)); - This->own_block = (char*) malloc(_size); + This->own_block = (char*) malloc((size_t)_size + SAFETY_ACEL); This->media_type.pbFormat = 0; if (!This->vt || !This->own_block) Index: guids.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/dshow/guids.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- guids.c 13 Sep 2002 19:43:15 -0000 1.6 +++ guids.c 26 Nov 2002 21:00:20 -0000 1.7 @@ -1,5 +1,4 @@ #include "guids.h" -int DSHOW_DEBUG = 0; const GUID CLSID_DivxDecompressorCF={0x82CCd3E0, 0xF71A, 0x11D0, { 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa}}; @@ -27,6 +26,12 @@ {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}}; const GUID FORMAT_VideoInfo={0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; +const GUID MEDIASUBTYPE_RGB1={0xe436eb78, 0x524f, 0x11ce, + {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; +const GUID MEDIASUBTYPE_RGB4={0xe436eb79, 0x524f, 0x11ce, + {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; +const GUID MEDIASUBTYPE_RGB8={0xe436eb7a, 0x524f, 0x11ce, + {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; const GUID MEDIASUBTYPE_RGB565={0xe436eb7b, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; const GUID MEDIASUBTYPE_RGB555={0xe436eb7c, 0x524f, 0x11ce, @@ -65,3 +70,10 @@ {0xa1, 0xc1, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa}}; const GUID IID_Iv50Hidden={0x665a4442, 0xd905, 0x11d0, {0xa3, 0x0e, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; + +const GUID FORMAT_WaveFormatEx = {0x05589f81, 0xc356, 0x11CE, + {0xBF, 0x01, 0x00, 0xAA, 0x00, 0x55, 0x59, 0x5A}}; +const GUID MEDIATYPE_Audio = {0x73647561, 0x0000, 0x0010, + {0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71}}; +const GUID MEDIASUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, + {0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71}}; Index: guids.h =================================================================== RCS file: /cvsroot/mplayer/main/loader/dshow/guids.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- guids.h 13 Sep 2002 19:43:15 -0000 1.7 +++ guids.h 26 Nov 2002 21:00:20 -0000 1.8 @@ -6,8 +6,8 @@ #include "wine/windef.h" #include "wine/vfw.h" -extern int DSHOW_DEBUG; -#define Debug if(DSHOW_DEBUG) +//#define Debug if(1) +#define Debug if(0) typedef struct __attribute__((__packed__)) _MediaType { @@ -58,6 +58,9 @@ extern const GUID MEDIATYPE_Video; extern const GUID GUID_NULL; extern const GUID FORMAT_VideoInfo; +extern const GUID MEDIASUBTYPE_RGB1; +extern const GUID MEDIASUBTYPE_RGB4; +extern const GUID MEDIASUBTYPE_RGB8; extern const GUID MEDIASUBTYPE_RGB565; extern const GUID MEDIASUBTYPE_RGB555; extern const GUID MEDIASUBTYPE_RGB24; @@ -74,5 +77,9 @@ extern const GUID MEDIASUBTYPE_YV12; extern const GUID MEDIASUBTYPE_I420; extern const GUID MEDIASUBTYPE_IF09; + +extern const GUID FORMAT_WaveFormatEx; +extern const GUID MEDIATYPE_Audio; +extern const GUID MEDIASUBTYPE_PCM; #endif /* DS_GUIDS_H */ Index: inputpin.h =================================================================== RCS file: /cvsroot/mplayer/main/loader/dshow/inputpin.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- inputpin.h 13 Sep 2002 19:43:15 -0000 1.6 +++ inputpin.h 26 Nov 2002 21:00:20 -0000 1.7 @@ -14,7 +14,7 @@ IPin* ( *GetPin )(CBaseFilter2* This); }; -CBaseFilter2* CBaseFilter2Create(); +CBaseFilter2* CBaseFilter2Create(void); typedef struct _CBaseFilter CBaseFilter; Index: iunk.h =================================================================== RCS file: /cvsroot/mplayer/main/loader/dshow/iunk.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- iunk.h 13 Sep 2002 19:43:15 -0000 1.4 +++ iunk.h 26 Nov 2002 21:00:20 -0000 1.5 @@ -18,7 +18,7 @@ CLASSNAME * me = (CLASSNAME *)This; \ GUID* r; unsigned int i = 0; \ Debug printf(#CLASSNAME "_QueryInterface(%p) called\n", This);\ - if (!ppvObject) return 0x80004003; \ + if (!ppvObject) return E_POINTER; \ for(r=me->interfaces; i<sizeof(me->interfaces)/sizeof(me->interfaces[0]); r++, i++) \ if(!memcmp(r, riid, sizeof(*r))) \ { \ @@ -26,7 +26,7 @@ *ppvObject=This; \ return 0; \ } \ - Debug printf("Query failed!\n"); \ + Debug printf("Query failed! (GUID: 0x%x)\n", *(unsigned int*)riid); \ return E_NOINTERFACE; \ } \ \ Index: outputpin.c =================================================================== RCS file: /cvsroot/mplayer/main/loader/dshow/outputpin.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- outputpin.c 13 Sep 2002 19:43:15 -0000 1.10 +++ outputpin.c 26 Nov 2002 21:00:20 -0000 1.11 @@ -84,7 +84,7 @@ return E_NOTIMPL; } -void CEnumMediaTypes_Destroy(CEnumMediaTypes* This) +static void CEnumMediaTypes_Destroy(CEnumMediaTypes* This) { free(This->vt); free(This); @@ -93,7 +93,7 @@ // IPin->IUnknown methods IMPLEMENT_IUNKNOWN(CEnumMediaTypes) -CEnumMediaTypes* CEnumMediaTypesCreate(const AM_MEDIA_TYPE* amt) +static CEnumMediaTypes* CEnumMediaTypesCreate(const AM_MEDIA_TYPE* amt) { CEnumMediaTypes *This = (CEnumMediaTypes*) malloc(sizeof(CEnumMediaTypes)) ;

1 0

CVS: main/libmenu menu_filesel.c,1.2,1.3
by J�rgen Keil CVS 26 Nov '02

26 Nov '02

Update of /cvsroot/mplayer/main/libmenu In directory mail:/var/tmp.root/cvs-serv10629 Modified Files: menu_filesel.c Log Message: limits.h required to get a PATH_MAX definition (on solaris) Index: menu_filesel.c =================================================================== RCS file: /cvsroot/mplayer/main/libmenu/menu_filesel.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- menu_filesel.c 18 Nov 2002 00:14:17 -0000 1.2 +++ menu_filesel.c 26 Nov 2002 18:54:23 -0000 1.3 @@ -8,6 +8,7 @@ #include <sys/stat.h> #include <ctype.h> #include <unistd.h> +#include <limits.h> #include "../config.h"

1 0

CVS: main/linux vsscanf.c,NONE,1.1 Makefile,1.6,1.7
by J�rgen Keil CVS 26 Nov '02

26 Nov '02

Update of /cvsroot/mplayer/main/linux In directory mail:/var/tmp.root/cvs-serv9563 Modified Files: Makefile Added Files: vsscanf.c Log Message: Add our own vsscanf implementation, in case the system's libc does not have one. (required for solaris, when the Ogg/Vorbis audio decoder is used) --- NEW FILE --- #include "../config.h" #ifndef HAVE_VSSCANF /* system has no vsscanf. try to provide one */ #include <stdio.h> #include <stdarg.h> int vsscanf(const char *str, const char *format, va_list ap) { /* XXX: can this be implemented in a more portable way? */ long p1 = va_arg(ap, long); long p2 = va_arg(ap, long); long p3 = va_arg(ap, long); long p4 = va_arg(ap, long); long p5 = va_arg(ap, long); return sscanf(str, format, p1, p2, p3, p4, p5); } #endif Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/linux/Makefile,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile 26 Nov 2002 18:31:30 -0000 1.6 +++ Makefile 26 Nov 2002 18:53:00 -0000 1.7 @@ -3,7 +3,7 @@ LIBNAME = libosdep.a -SRCS=getch2.c timer-lx.c shmem.c strsep.c scandir.c # timer.c +SRCS=getch2.c timer-lx.c shmem.c strsep.c vsscanf.c scandir.c # timer.c OBJS=$(SRCS:.c=.o) ifeq ($(TARGET_ARCH_X86),yes)

1 0