September 2007 - MPlayer-cvslog - lists.mplayerhq.hu

r24436 - trunk/fmt-conversion.h
by reimar 12 Sep '07

12 Sep '07

Author: reimar Date: Wed Sep 12 19:59:31 2007 New Revision: 24436 Log: DOCS/tech/colorspaces.txt says I420 and IYUV are the same, so add IYUV at the same place. It can't break anything worse than it is now (i.e. not working/supported at all) and hopefully triggers a bug report so it gets fixed if it's wrong ;-) Modified: trunk/fmt-conversion.h Modified: trunk/fmt-conversion.h ============================================================================== --- trunk/fmt-conversion.h (original) +++ trunk/fmt-conversion.h Wed Sep 12 19:59:31 2007 @@ -57,6 +57,7 @@ enum PixelFormat imgfmt2pixfmt(int fmt) case IMGFMT_YVU9: return PIX_FMT_YUV410P; case IMGFMT_I420: + case IMGFMT_IYUV: case IMGFMT_YV12: return PIX_FMT_YUV420P; case IMGFMT_411P:

1 0

Re: [MPlayer-cvslog] r24425 - in trunk/loader: dmo/dmo.c
by Bill Song 12 Sep '07

12 Sep '07

Dear: I think this change should be reverted void ** is correct The warning should be ignore! > Author: voroshil > Date: Mon Sep 10 20:27:45 2007 > New Revision: 24425 > > Log: > Fix for: > dshow/DS_Filter.c: In function 'DS_Filter_CopySample': > dshow/DS_Filter.c:103: warning: dereferencing type-punned pointer will > break strict-aliasing rules > dshow/DS_Filter.c:185: warning: dereferencing type-punned pointer will > break strict-aliasing rules > dshow/DS_Filter.c:191: warning: dereferencing type-punned pointer will > break strict-aliasing rules > dshow/DS_Filter.c:198: warning: dereferencing type-punned pointer will > break strict-aliasing rules > dshow/DS_Filter.c:220: warning: dereferencing type-punned pointer will > break strict-aliasing rules > dshow/DS_Filter.c:245: warning: dereferencing type-punned pointer will > break strict-aliasing rules > dmo/dmo.c: In function 'DMO_FilterCreate': > dmo/dmo.c:73: warning: dereferencing type-punned pointer will break > strict-aliasing rules > dmo/dmo.c:79: warning: dereferencing type-punned pointer will break > strict-aliasing rules > dmo/dmo.c:86: warning: dereferencing type-punned pointer will break > strict-aliasing rules > dmo/dmo.c:90: warning: dereferencing type-punned pointer will break > strict-aliasing rules > dmo/dmo.c:93: warning: dereferencing type-punned pointer will break > strict-aliasing rules > > > Modified: > trunk/loader/dmo/dmo.c > trunk/loader/dshow/DS_Filter.c > > Modified: trunk/loader/dmo/dmo.c > > ============================================================================== > --- trunk/loader/dmo/dmo.c (original) > +++ trunk/loader/dmo/dmo.c Mon Sep 10 20:27:45 2007 > @@ -70,27 +70,27 @@ DMO_Filter* DMO_FilterCreate(const char* > break; > } > //trapbug(); > - hr = func(id, &IID_IClassFactory, (void**)&factory); > + 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); > + 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); > + 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); > + 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); > + r = object->vt->QueryInterface(object, > &IID_IDMOVideoOutputOptimizations, (void*)&This->m_pOptim); > if (r == 0 && This->m_pOptim) > { > unsigned long flags; > > Modified: trunk/loader/dshow/DS_Filter.c > > ============================================================================== > --- trunk/loader/dshow/DS_Filter.c (original) > +++ trunk/loader/dshow/DS_Filter.c Mon Sep 10 20:27:45 2007 > @@ -96,7 +96,7 @@ void DS_Filter_Destroy(DS_Filter* This) > } > > static HRESULT STDCALL DS_Filter_CopySample(void* pUserData,IMediaSample* > pSample){ > - char* pointer; > + BYTE* pointer; > int len; > SampleProcUserData* pData=(SampleProcUserData*)pUserData; > Debug printf("CopySample called(%p,%p)\n",pSample,pUserData); > @@ -182,20 +182,20 @@ DS_Filter* DS_FilterCreate(const char* d > em = "illegal or corrupt DirectShow DLL"; > break; > } > - result = func(id, &IID_IClassFactory, (void**)&factory); > + result = func(id, &IID_IClassFactory, (void*)&factory); > if (result || !factory) > { > em = "no such class object"; > break; > } > - result = factory->vt->CreateInstance(factory, 0, &IID_IUnknown, > (void**)&object); > + result = factory->vt->CreateInstance(factory, 0, &IID_IUnknown, > (void*)&object); > factory->vt->Release((IUnknown*)factory); > if (result || !object) > { > em = "class factory failure"; > break; > } > - result = object->vt->QueryInterface(object, &IID_IBaseFilter, > (void**)&This->m_pFilter); > + result = object->vt->QueryInterface(object, &IID_IBaseFilter, > (void*)&This->m_pFilter); > object->vt->Release((IUnknown*)object); > if (result || !This->m_pFilter) > { > @@ -216,14 +216,14 @@ DS_Filter* DS_FilterCreate(const char* d > > for (i = 0; i < fetched; i++) > { > - int direction = -1; > + PIN_DIRECTION direction = -1; > array[i]->vt->QueryDirection(array[i], > (PIN_DIRECTION*)&direction); > - if (!This->m_pInputPin && direction == 0) > + if (!This->m_pInputPin && direction == PINDIR_INPUT) > { > This->m_pInputPin = array[i]; > > This->m_pInputPin->vt->AddRef((IUnknown*)This->m_pInputPin); > } > - if (!This->m_pOutputPin && direction == 1) > + if (!This->m_pOutputPin && direction == PINDIR_OUTPUT) > { > This->m_pOutputPin = array[i]; > > This->m_pOutputPin->vt->AddRef((IUnknown*)This->m_pOutputPin); > @@ -242,7 +242,7 @@ DS_Filter* DS_FilterCreate(const char* d > } > result = > This->m_pInputPin->vt->QueryInterface((IUnknown*)This->m_pInputPin, > &IID_IMemInputPin, > > - (void**)&This->m_pImp); > > + (void*)&This->m_pImp); > if (result) > { > em = "could not get IMemInputPin interface"; > > > ------------------------------ > > _______________________________________________ > MPlayer-cvslog mailing list > MPlayer-cvslog(a)mplayerhq.hu > http://lists.mplayerhq.hu/mailman/listinfo/mplayer-cvslog > > End of MPlayer-cvslog Digest, Vol 39, Issue 16 > ********************************************** > ------------------------------------------ Focus on next multimedia development Your potential.Our passion.

2 1

r24433 - in trunk/loader/wine: avifmt.h winestring.h winuser.h
by diego 12 Sep '07

12 Sep '07

Author: diego Date: Wed Sep 12 17:30:22 2007 New Revision: 24433 Log: Consistently use path as multiple inclusion guard. Modified: trunk/loader/wine/avifmt.h trunk/loader/wine/winestring.h trunk/loader/wine/winuser.h Modified: trunk/loader/wine/avifmt.h ============================================================================== --- trunk/loader/wine/avifmt.h (original) +++ trunk/loader/wine/avifmt.h Wed Sep 12 17:30:22 2007 @@ -3,10 +3,10 @@ * AVIFMT - AVI file format definitions * ****************************************************************************/ -#ifndef AVIFMT -#define AVIFMT +#ifndef WINE_AVIFMT_H +#define WINE_AVIFMT_H -#ifndef NOAVIFMT +#ifndef WINE_NOAVIFMT_H #ifndef __WINE_WINDEF_H #include "wine/windef.h" @@ -240,5 +240,5 @@ typedef struct ** ** Used in video streams. */ -#endif /* NOAVIFMT */ -#endif /* AVIFMT */ +#endif /* WINE_NOAVIFMT_H */ +#endif /* WINE_AVIFMT_H */ Modified: trunk/loader/wine/winestring.h ============================================================================== --- trunk/loader/wine/winestring.h (original) +++ trunk/loader/wine/winestring.h Wed Sep 12 17:30:22 2007 @@ -1,5 +1,5 @@ -#ifndef __WINE_WINE_WINESTRING_H -#define __WINE_WINE_WINESTRING_H +#ifndef __WINE_WINESTRING_H +#define __WINE_WINESTRING_H #include "windef.h" @@ -10,4 +10,4 @@ LPSTR WINAPI lstrcpynWtoA(LPSTR,LP #define lstrncmpiA strncasecmp -#endif /* __WINE_WINE_WINESTRING_H */ +#endif /* __WINE_WINESTRING_H */ Modified: trunk/loader/wine/winuser.h ============================================================================== --- trunk/loader/wine/winuser.h (original) +++ trunk/loader/wine/winuser.h Wed Sep 12 17:30:22 2007 @@ -1,5 +1,5 @@ -#ifndef _WINUSER_ -#define _WINUSER_ +#ifndef _WINE_WINUSER_H +#define _WINE_WINUSER_H #ifndef RC_INVOKED #include <stdarg.h> @@ -2926,4 +2926,4 @@ VOID WINAPI ScreenSwitchEnable16( } #endif -#endif /* _WINUSER_ */ +#endif /* _WINE_WINUSER_H */

1 0

r24431 - trunk/stream/tvi_bsdbt848.c
by diego 12 Sep '07

12 Sep '07

Author: diego Date: Wed Sep 12 10:49:25 2007 New Revision: 24431 Log: Add missing #include to fix compilation. patch by Bernd Ernesti, mplayer-dev-eng lists.veego de Modified: trunk/stream/tvi_bsdbt848.c Modified: trunk/stream/tvi_bsdbt848.c ============================================================================== --- trunk/stream/tvi_bsdbt848.c (original) +++ trunk/stream/tvi_bsdbt848.c Wed Sep 12 10:49:25 2007 @@ -63,6 +63,7 @@ #include "libaf/af_format.h" #include "libmpcodecs/img_format.h" #include "tv.h" +#include "help_mp.h" #include "mp_msg.h" static tvi_handle_t *tvi_init_bsdbt848(tv_param_t* tv_param);

1 0

r24430 - trunk/configure
by reimar 12 Sep '07

12 Sep '07

Author: reimar Date: Wed Sep 12 08:59:36 2007 New Revision: 24430 Log: Do not replace _ by - if x86_64 is given in --target. Patch by Andrew Calkin (andrew calkin gmail com) Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Wed Sep 12 08:59:36 2007 @@ -1282,7 +1282,10 @@ else # if test -z "$_target" mingw32msvc) system_name=MINGW32 ;; esac # We need to convert underscores so that values like k6-2 and pentium-mmx can be passed - host_arch=`echo $_target | cut -d '-' -f 1 | tr '_' '-'` + host_arch=`echo $_target | cut -d '-' -f 1` + if test `echo $host_arch` != "x86_64" ; then + host_arch=`echo $host_arch | tr '_' '-'` + fi fi echo "Detected operating system: $system_name"

1 0

r24428 - trunk/loader/dshow/cmediasample.c
by cehoyos 10 Sep '07

10 Sep '07

Author: cehoyos Date: Tue Sep 11 01:14:17 2007 New Revision: 24428 Log: Fix indentation after r24367. Modified: trunk/loader/dshow/cmediasample.c Modified: trunk/loader/dshow/cmediasample.c ============================================================================== --- trunk/loader/dshow/cmediasample.c (original) +++ trunk/loader/dshow/cmediasample.c Tue Sep 11 01:14:17 2007 @@ -83,7 +83,7 @@ void CMediaSample_Destroy(CMediaSample* free(This->vt); free(This->own_block); if(((CMediaSample*)This)->type_valid) - FreeMediaType(&(This->media_type)); + FreeMediaType(&(This->media_type)); free(This); } @@ -377,7 +377,7 @@ static HRESULT STDCALL CMediaSample_SetM return E_INVALIDARG; t = &((CMediaSample*)This)->media_type; if(((CMediaSample*)This)->type_valid) - FreeMediaType(t); + FreeMediaType(t); CopyMediaType(t,pMediaType); ((CMediaSample*) This)->type_valid=1;

1 0

r24426 - in trunk/loader/wine: mmreg.h module.h pe_image.h winbase.h winuser.h
by voroshil 10 Sep '07

10 Sep '07

Author: voroshil Date: Mon Sep 10 20:55:52 2007 New Revision: 24426 Log: Revert r24424. Fix is wrong, because 'packet' attribute can be placed before structure definition only when all members have this attribute. Modified: trunk/loader/wine/mmreg.h trunk/loader/wine/module.h trunk/loader/wine/pe_image.h trunk/loader/wine/winbase.h trunk/loader/wine/winuser.h Modified: trunk/loader/wine/mmreg.h ============================================================================== --- trunk/loader/wine/mmreg.h (original) +++ trunk/loader/wine/mmreg.h Mon Sep 10 20:55:52 2007 @@ -90,19 +90,19 @@ typedef struct { #ifndef _MPEGLAYER3WAVEFORMAT_ #define _MPEGLAYER3WAVEFORMAT_ -typedef struct WINE_PACKED mpeglayer3waveformat_tag { - WORD wFormatTag; - WORD nChannels; - DWORD nSamplesPerSec; - DWORD nAvgBytesPerSec; - WORD nBlockAlign; - WORD wBitsPerSample; - WORD cbSize; - WORD wID; - DWORD fdwFlags; - WORD nBlockSize; - WORD nFramesPerBlock; - WORD nCodecDelay; +typedef struct mpeglayer3waveformat_tag { + WORD wFormatTag WINE_PACKED; + WORD nChannels WINE_PACKED; + DWORD nSamplesPerSec WINE_PACKED; + DWORD nAvgBytesPerSec WINE_PACKED; + WORD nBlockAlign WINE_PACKED; + WORD wBitsPerSample WINE_PACKED; + WORD cbSize WINE_PACKED; + WORD wID WINE_PACKED; + DWORD fdwFlags WINE_PACKED; + WORD nBlockSize WINE_PACKED; + WORD nFramesPerBlock WINE_PACKED; + WORD nCodecDelay WINE_PACKED; } MPEGLAYER3WAVEFORMAT; #endif /* !_MPEGLAYER3WAVEFORMAT_ */ Modified: trunk/loader/wine/module.h ============================================================================== --- trunk/loader/wine/module.h (original) +++ trunk/loader/wine/module.h Mon Sep 10 20:55:52 2007 @@ -11,11 +11,11 @@ #include "pe_image.h" -typedef struct WINE_PACKED { +typedef struct { BYTE type; BYTE flags; BYTE segnum; - WORD offs; + WORD offs WINE_PACKED; } ET_ENTRY; typedef struct { @@ -57,12 +57,12 @@ typedef struct } SELFLOADHEADER; /* Parameters for LoadModule() */ -typedef struct WINE_PACKED +typedef struct { HGLOBAL16 hEnvironment; /* Environment segment */ - SEGPTR cmdLine; /* Command-line */ - SEGPTR showCmd; /* Code for ShowWindow() */ - SEGPTR reserved; + SEGPTR cmdLine WINE_PACKED; /* Command-line */ + SEGPTR showCmd WINE_PACKED; /* Code for ShowWindow() */ + SEGPTR reserved WINE_PACKED; } LOADPARAMS16; typedef struct Modified: trunk/loader/wine/pe_image.h ============================================================================== --- trunk/loader/wine/pe_image.h (original) +++ trunk/loader/wine/pe_image.h Mon Sep 10 20:55:52 2007 @@ -54,19 +54,19 @@ extern PIMAGE_RESOURCE_DIRECTORY GetResD typedef DWORD CALLBACK (*DLLENTRYPROC)(HMODULE,DWORD,LPVOID); -typedef struct WINE_PACKED { - WORD popl; /* 0x8f 0x05 */ - DWORD addr_popped; /* ... */ - BYTE pushl1; /* 0x68 */ - DWORD newret; /* ... */ - BYTE pushl2; /* 0x68 */ - DWORD origfun; /* original function */ - BYTE ret1; /* 0xc3 */ - WORD addesp; /* 0x83 0xc4 */ - BYTE nrofargs; /* nr of arguments to add esp, */ - BYTE pushl3; /* 0x68 */ - DWORD oldret; /* Filled out from popl above */ - BYTE ret2; /* 0xc3 */ +typedef struct { + WORD popl WINE_PACKED; /* 0x8f 0x05 */ + DWORD addr_popped WINE_PACKED;/* ... */ + BYTE pushl1 WINE_PACKED; /* 0x68 */ + DWORD newret WINE_PACKED; /* ... */ + BYTE pushl2 WINE_PACKED; /* 0x68 */ + DWORD origfun WINE_PACKED; /* original function */ + BYTE ret1 WINE_PACKED; /* 0xc3 */ + WORD addesp WINE_PACKED; /* 0x83 0xc4 */ + BYTE nrofargs WINE_PACKED; /* nr of arguments to add esp, */ + BYTE pushl3 WINE_PACKED; /* 0x68 */ + DWORD oldret WINE_PACKED; /* Filled out from popl above */ + BYTE ret2 WINE_PACKED; /* 0xc3 */ } ELF_STDCALL_STUB; typedef struct { Modified: trunk/loader/wine/winbase.h ============================================================================== --- trunk/loader/wine/winbase.h (original) +++ trunk/loader/wine/winbase.h Mon Sep 10 20:55:52 2007 @@ -536,14 +536,14 @@ typedef struct tagMEMORYSTATUS /* Debugging support (DEBUG SYSTEM ONLY) */ -typedef struct WINE_PACKED +typedef struct { UINT16 flags; - DWORD dwOptions; - DWORD dwFilter; - CHAR achAllocModule[8]; - DWORD dwAllocBreak; - DWORD dwAllocCount; + DWORD dwOptions WINE_PACKED; + DWORD dwFilter WINE_PACKED; + CHAR achAllocModule[8] WINE_PACKED; + DWORD dwAllocBreak WINE_PACKED; + DWORD dwAllocCount WINE_PACKED; } WINDEBUGINFO, *LPWINDEBUGINFO; /* WINDEBUGINFO flags values */ Modified: trunk/loader/wine/winuser.h ============================================================================== --- trunk/loader/wine/winuser.h (original) +++ trunk/loader/wine/winuser.h Mon Sep 10 20:55:52 2007 @@ -172,14 +172,14 @@ typedef struct HWND hwnd; } CWPRETSTRUCT, *LPCWPRETSTRUCT; -typedef struct WINE_PACKED +typedef struct { UINT length; UINT flags; UINT showCmd; - POINT ptMinPosition; - POINT ptMaxPosition; - RECT rcNormalPosition; + POINT ptMinPosition WINE_PACKED; + POINT ptMaxPosition WINE_PACKED; + RECT rcNormalPosition WINE_PACKED; } WINDOWPLACEMENT, *LPWINDOWPLACEMENT; @@ -2545,7 +2545,7 @@ typedef struct #define DSS_MONO 0x0080 #define DSS_RIGHT 0x8000 -typedef struct WINE_PACKED +typedef struct { UINT CtlType; UINT CtlID; @@ -2554,8 +2554,8 @@ typedef struct WINE_PACKED UINT itemState; HWND hwndItem; HDC hDC; - RECT rcItem; - DWORD itemData; + RECT rcItem WINE_PACKED; + DWORD itemData WINE_PACKED; } DRAWITEMSTRUCT, *PDRAWITEMSTRUCT, *LPDRAWITEMSTRUCT; @@ -2836,15 +2836,15 @@ typedef struct /* DragObject stuff */ -typedef struct WINE_PACKED +typedef struct { HWND16 hWnd; HANDLE16 hScope; WORD wFlags; HANDLE16 hList; HANDLE16 hOfStruct; - POINT16 pt; - LONG l; + POINT16 pt WINE_PACKED; + LONG l WINE_PACKED; } DRAGINFO, *LPDRAGINFO; #define DRAGOBJ_PROGRAM 0x0001

3 2

r24425 - in trunk/loader: dmo/dmo.c dshow/DS_Filter.c
by voroshil 10 Sep '07

10 Sep '07

Author: voroshil Date: Mon Sep 10 20:27:45 2007 New Revision: 24425 Log: Fix for: dshow/DS_Filter.c: In function 'DS_Filter_CopySample': dshow/DS_Filter.c:103: warning: dereferencing type-punned pointer will break strict-aliasing rules dshow/DS_Filter.c:185: warning: dereferencing type-punned pointer will break strict-aliasing rules dshow/DS_Filter.c:191: warning: dereferencing type-punned pointer will break strict-aliasing rules dshow/DS_Filter.c:198: warning: dereferencing type-punned pointer will break strict-aliasing rules dshow/DS_Filter.c:220: warning: dereferencing type-punned pointer will break strict-aliasing rules dshow/DS_Filter.c:245: warning: dereferencing type-punned pointer will break strict-aliasing rules dmo/dmo.c: In function 'DMO_FilterCreate': dmo/dmo.c:73: warning: dereferencing type-punned pointer will break strict-aliasing rules dmo/dmo.c:79: warning: dereferencing type-punned pointer will break strict-aliasing rules dmo/dmo.c:86: warning: dereferencing type-punned pointer will break strict-aliasing rules dmo/dmo.c:90: warning: dereferencing type-punned pointer will break strict-aliasing rules dmo/dmo.c:93: warning: dereferencing type-punned pointer will break strict-aliasing rules Modified: trunk/loader/dmo/dmo.c trunk/loader/dshow/DS_Filter.c Modified: trunk/loader/dmo/dmo.c ============================================================================== --- trunk/loader/dmo/dmo.c (original) +++ trunk/loader/dmo/dmo.c Mon Sep 10 20:27:45 2007 @@ -70,27 +70,27 @@ DMO_Filter* DMO_FilterCreate(const char* break; } //trapbug(); - hr = func(id, &IID_IClassFactory, (void**)&factory); + 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); + 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); + 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); + 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); + r = object->vt->QueryInterface(object, &IID_IDMOVideoOutputOptimizations, (void*)&This->m_pOptim); if (r == 0 && This->m_pOptim) { unsigned long flags; Modified: trunk/loader/dshow/DS_Filter.c ============================================================================== --- trunk/loader/dshow/DS_Filter.c (original) +++ trunk/loader/dshow/DS_Filter.c Mon Sep 10 20:27:45 2007 @@ -96,7 +96,7 @@ void DS_Filter_Destroy(DS_Filter* This) } static HRESULT STDCALL DS_Filter_CopySample(void* pUserData,IMediaSample* pSample){ - char* pointer; + BYTE* pointer; int len; SampleProcUserData* pData=(SampleProcUserData*)pUserData; Debug printf("CopySample called(%p,%p)\n",pSample,pUserData); @@ -182,20 +182,20 @@ DS_Filter* DS_FilterCreate(const char* d em = "illegal or corrupt DirectShow DLL"; break; } - result = func(id, &IID_IClassFactory, (void**)&factory); + result = func(id, &IID_IClassFactory, (void*)&factory); if (result || !factory) { em = "no such class object"; break; } - result = factory->vt->CreateInstance(factory, 0, &IID_IUnknown, (void**)&object); + result = factory->vt->CreateInstance(factory, 0, &IID_IUnknown, (void*)&object); factory->vt->Release((IUnknown*)factory); if (result || !object) { em = "class factory failure"; break; } - result = object->vt->QueryInterface(object, &IID_IBaseFilter, (void**)&This->m_pFilter); + result = object->vt->QueryInterface(object, &IID_IBaseFilter, (void*)&This->m_pFilter); object->vt->Release((IUnknown*)object); if (result || !This->m_pFilter) { @@ -216,14 +216,14 @@ DS_Filter* DS_FilterCreate(const char* d for (i = 0; i < fetched; i++) { - int direction = -1; + PIN_DIRECTION direction = -1; array[i]->vt->QueryDirection(array[i], (PIN_DIRECTION*)&direction); - if (!This->m_pInputPin && direction == 0) + if (!This->m_pInputPin && direction == PINDIR_INPUT) { This->m_pInputPin = array[i]; This->m_pInputPin->vt->AddRef((IUnknown*)This->m_pInputPin); } - if (!This->m_pOutputPin && direction == 1) + if (!This->m_pOutputPin && direction == PINDIR_OUTPUT) { This->m_pOutputPin = array[i]; This->m_pOutputPin->vt->AddRef((IUnknown*)This->m_pOutputPin); @@ -242,7 +242,7 @@ DS_Filter* DS_FilterCreate(const char* d } result = This->m_pInputPin->vt->QueryInterface((IUnknown*)This->m_pInputPin, &IID_IMemInputPin, - (void**)&This->m_pImp); + (void*)&This->m_pImp); if (result) { em = "could not get IMemInputPin interface";

1 0

r24424 - in trunk/loader/wine: mmreg.h module.h pe_image.h winbase.h winuser.h
by voroshil 10 Sep '07

10 Sep '07

Author: voroshil Date: Mon Sep 10 20:07:25 2007 New Revision: 24424 Log: Fix for a lot of "'packed' attribute ignored for field of type 'BYTE'" warnings. Modified: trunk/loader/wine/mmreg.h trunk/loader/wine/module.h trunk/loader/wine/pe_image.h trunk/loader/wine/winbase.h trunk/loader/wine/winuser.h Modified: trunk/loader/wine/mmreg.h ============================================================================== --- trunk/loader/wine/mmreg.h (original) +++ trunk/loader/wine/mmreg.h Mon Sep 10 20:07:25 2007 @@ -90,19 +90,19 @@ typedef struct { #ifndef _MPEGLAYER3WAVEFORMAT_ #define _MPEGLAYER3WAVEFORMAT_ -typedef struct mpeglayer3waveformat_tag { - WORD wFormatTag WINE_PACKED; - WORD nChannels WINE_PACKED; - DWORD nSamplesPerSec WINE_PACKED; - DWORD nAvgBytesPerSec WINE_PACKED; - WORD nBlockAlign WINE_PACKED; - WORD wBitsPerSample WINE_PACKED; - WORD cbSize WINE_PACKED; - WORD wID WINE_PACKED; - DWORD fdwFlags WINE_PACKED; - WORD nBlockSize WINE_PACKED; - WORD nFramesPerBlock WINE_PACKED; - WORD nCodecDelay WINE_PACKED; +typedef struct WINE_PACKED mpeglayer3waveformat_tag { + WORD wFormatTag; + WORD nChannels; + DWORD nSamplesPerSec; + DWORD nAvgBytesPerSec; + WORD nBlockAlign; + WORD wBitsPerSample; + WORD cbSize; + WORD wID; + DWORD fdwFlags; + WORD nBlockSize; + WORD nFramesPerBlock; + WORD nCodecDelay; } MPEGLAYER3WAVEFORMAT; #endif /* !_MPEGLAYER3WAVEFORMAT_ */ Modified: trunk/loader/wine/module.h ============================================================================== --- trunk/loader/wine/module.h (original) +++ trunk/loader/wine/module.h Mon Sep 10 20:07:25 2007 @@ -11,11 +11,11 @@ #include "pe_image.h" -typedef struct { +typedef struct WINE_PACKED { BYTE type; BYTE flags; BYTE segnum; - WORD offs WINE_PACKED; + WORD offs; } ET_ENTRY; typedef struct { @@ -57,12 +57,12 @@ typedef struct } SELFLOADHEADER; /* Parameters for LoadModule() */ -typedef struct +typedef struct WINE_PACKED { HGLOBAL16 hEnvironment; /* Environment segment */ - SEGPTR cmdLine WINE_PACKED; /* Command-line */ - SEGPTR showCmd WINE_PACKED; /* Code for ShowWindow() */ - SEGPTR reserved WINE_PACKED; + SEGPTR cmdLine; /* Command-line */ + SEGPTR showCmd; /* Code for ShowWindow() */ + SEGPTR reserved; } LOADPARAMS16; typedef struct Modified: trunk/loader/wine/pe_image.h ============================================================================== --- trunk/loader/wine/pe_image.h (original) +++ trunk/loader/wine/pe_image.h Mon Sep 10 20:07:25 2007 @@ -54,19 +54,19 @@ extern PIMAGE_RESOURCE_DIRECTORY GetResD typedef DWORD CALLBACK (*DLLENTRYPROC)(HMODULE,DWORD,LPVOID); -typedef struct { - WORD popl WINE_PACKED; /* 0x8f 0x05 */ - DWORD addr_popped WINE_PACKED;/* ... */ - BYTE pushl1 WINE_PACKED; /* 0x68 */ - DWORD newret WINE_PACKED; /* ... */ - BYTE pushl2 WINE_PACKED; /* 0x68 */ - DWORD origfun WINE_PACKED; /* original function */ - BYTE ret1 WINE_PACKED; /* 0xc3 */ - WORD addesp WINE_PACKED; /* 0x83 0xc4 */ - BYTE nrofargs WINE_PACKED; /* nr of arguments to add esp, */ - BYTE pushl3 WINE_PACKED; /* 0x68 */ - DWORD oldret WINE_PACKED; /* Filled out from popl above */ - BYTE ret2 WINE_PACKED; /* 0xc3 */ +typedef struct WINE_PACKED { + WORD popl; /* 0x8f 0x05 */ + DWORD addr_popped; /* ... */ + BYTE pushl1; /* 0x68 */ + DWORD newret; /* ... */ + BYTE pushl2; /* 0x68 */ + DWORD origfun; /* original function */ + BYTE ret1; /* 0xc3 */ + WORD addesp; /* 0x83 0xc4 */ + BYTE nrofargs; /* nr of arguments to add esp, */ + BYTE pushl3; /* 0x68 */ + DWORD oldret; /* Filled out from popl above */ + BYTE ret2; /* 0xc3 */ } ELF_STDCALL_STUB; typedef struct { Modified: trunk/loader/wine/winbase.h ============================================================================== --- trunk/loader/wine/winbase.h (original) +++ trunk/loader/wine/winbase.h Mon Sep 10 20:07:25 2007 @@ -536,14 +536,14 @@ typedef struct tagMEMORYSTATUS /* Debugging support (DEBUG SYSTEM ONLY) */ -typedef struct +typedef struct WINE_PACKED { UINT16 flags; - DWORD dwOptions WINE_PACKED; - DWORD dwFilter WINE_PACKED; - CHAR achAllocModule[8] WINE_PACKED; - DWORD dwAllocBreak WINE_PACKED; - DWORD dwAllocCount WINE_PACKED; + DWORD dwOptions; + DWORD dwFilter; + CHAR achAllocModule[8]; + DWORD dwAllocBreak; + DWORD dwAllocCount; } WINDEBUGINFO, *LPWINDEBUGINFO; /* WINDEBUGINFO flags values */ Modified: trunk/loader/wine/winuser.h ============================================================================== --- trunk/loader/wine/winuser.h (original) +++ trunk/loader/wine/winuser.h Mon Sep 10 20:07:25 2007 @@ -172,14 +172,14 @@ typedef struct HWND hwnd; } CWPRETSTRUCT, *LPCWPRETSTRUCT; -typedef struct +typedef struct WINE_PACKED { UINT length; UINT flags; UINT showCmd; - POINT ptMinPosition WINE_PACKED; - POINT ptMaxPosition WINE_PACKED; - RECT rcNormalPosition WINE_PACKED; + POINT ptMinPosition; + POINT ptMaxPosition; + RECT rcNormalPosition; } WINDOWPLACEMENT, *LPWINDOWPLACEMENT; @@ -2545,7 +2545,7 @@ typedef struct #define DSS_MONO 0x0080 #define DSS_RIGHT 0x8000 -typedef struct +typedef struct WINE_PACKED { UINT CtlType; UINT CtlID; @@ -2554,8 +2554,8 @@ typedef struct UINT itemState; HWND hwndItem; HDC hDC; - RECT rcItem WINE_PACKED; - DWORD itemData WINE_PACKED; + RECT rcItem; + DWORD itemData; } DRAWITEMSTRUCT, *PDRAWITEMSTRUCT, *LPDRAWITEMSTRUCT; @@ -2836,15 +2836,15 @@ typedef struct /* DragObject stuff */ -typedef struct +typedef struct WINE_PACKED { HWND16 hWnd; HANDLE16 hScope; WORD wFlags; HANDLE16 hList; HANDLE16 hOfStruct; - POINT16 pt WINE_PACKED; - LONG l WINE_PACKED; + POINT16 pt; + LONG l; } DRAGINFO, *LPDRAGINFO; #define DRAGOBJ_PROGRAM 0x0001

1 0

r24423 - in trunk: DOCS/man/en/mplayer.1 help/help_mp-en.h stream/stream_tv.c stream/tv.c
by voroshil 10 Sep '07

10 Sep '07

Author: voroshil Date: Mon Sep 10 19:09:35 2007 New Revision: 24423 Log: Implementation of tv:// driver autodetection. If user did not specify driver directly, all available drivers will be probed (in order: v4l2,v4l1,bsdbt848,dummy). In most cases first probed driver will be successfully autodetected and used. Autodetection will be disabled if user specified driver directly (in command line or config). Modified: trunk/stream/stream_tv.c trunk/stream/tv.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 trunk/help/help_mp-en.h Modified: trunk/stream/stream_tv.c ============================================================================== --- trunk/stream/stream_tv.c (original) +++ trunk/stream/stream_tv.c Mon Sep 10 19:09:35 2007 @@ -40,7 +40,7 @@ tv_param_t stream_tv_defaults = { -1, //normid #endif NULL, //device - "dummy", //driver + NULL, //driver -1, //width -1, //height 0, //input, used in v4l and bttv Modified: trunk/stream/tv.c ============================================================================== --- trunk/stream/tv.c (original) +++ trunk/stream/tv.c Mon Sep 10 19:09:35 2007 @@ -52,17 +52,18 @@ extern tvi_info_t tvi_info_v4l2; extern tvi_info_t tvi_info_bsdbt848; #endif +/** List of drivers in autodetection order */ static const tvi_info_t* tvi_driver_list[]={ - &tvi_info_dummy, -#ifdef HAVE_TV_V4L1 - &tvi_info_v4l, -#endif #ifdef HAVE_TV_V4L2 &tvi_info_v4l2, #endif +#ifdef HAVE_TV_V4L1 + &tvi_info_v4l, +#endif #ifdef HAVE_TV_BSDBT848 &tvi_info_bsdbt848, #endif + &tvi_info_dummy, NULL }; @@ -560,7 +561,7 @@ static tvi_handle_t *tv_begin(tv_param_t { int i; tvi_handle_t* h; - if(!strcmp(tv_param->driver,"help")){ + if(tv_param->driver && !strcmp(tv_param->driver,"help")){ mp_msg(MSGT_TV,MSGL_INFO,MSGTR_TV_AvailableDrivers); for(i=0;tvi_driver_list[i];i++){ mp_msg(MSGT_TV,MSGL_INFO," %s\t%s",tvi_driver_list[i]->short_name,tvi_driver_list[i]->name); @@ -572,20 +573,29 @@ static tvi_handle_t *tv_begin(tv_param_t } for(i=0;tvi_driver_list[i];i++){ - if (!strcmp(tvi_driver_list[i]->short_name, tv_param->driver)){ + if (!tv_param->driver || !strcmp(tvi_driver_list[i]->short_name, tv_param->driver)){ h=tvi_driver_list[i]->tvi_init(tv_param); - if(!h) return NULL; + //Requested driver initialization failed + if (!h && tv_param->driver) + return NULL; + //Driver initialization failed during autodetection process. + if (!h) + continue; h->tv_param=tv_param; mp_msg(MSGT_TV, MSGL_INFO, MSGTR_TV_DriverInfo, tvi_driver_list[i]->short_name, tvi_driver_list[i]->name, tvi_driver_list[i]->author, tvi_driver_list[i]->comment?tvi_driver_list[i]->comment:""); + tv_param->driver=strdup(tvi_driver_list[i]->short_name); return h; } } - mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_NoSuchDriver, tv_param->driver); + if(tv_param->driver) + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_NoSuchDriver, tv_param->driver); + else + mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_DriverAutoDetectionFailed); return(NULL); }

1 0