summaryrefslogtreecommitdiffstats
path: root/loader/dshow
diff options
context:
space:
mode:
Diffstat (limited to 'loader/dshow')
-rw-r--r--loader/dshow/DS_AudioDecoder.c2
-rw-r--r--loader/dshow/DS_AudioDecoder.h2
-rw-r--r--loader/dshow/DS_Filter.h4
-rw-r--r--loader/dshow/DS_VideoDecoder.c6
-rw-r--r--loader/dshow/DS_VideoDecoder.h2
-rw-r--r--loader/dshow/allocator.c6
-rw-r--r--loader/dshow/allocator.h6
-rw-r--r--loader/dshow/cmediasample.c12
-rw-r--r--loader/dshow/cmediasample.h6
-rw-r--r--loader/dshow/inputpin.h8
-rw-r--r--loader/dshow/interfaces.h46
-rw-r--r--loader/dshow/libwin32.h12
-rw-r--r--loader/dshow/mediatype.h2
-rw-r--r--loader/dshow/outputpin.c2
-rw-r--r--loader/dshow/outputpin.h6
15 files changed, 61 insertions, 61 deletions
diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c
index b739d68711..73e7abcecb 100644
--- a/loader/dshow/DS_AudioDecoder.c
+++ b/loader/dshow/DS_AudioDecoder.c
@@ -10,7 +10,7 @@
#include "DS_Filter.h"
-struct _DS_AudioDecoder
+struct DS_AudioDecoder
{
WAVEFORMATEX in_fmt;
AM_MEDIA_TYPE m_sOurType, m_sDestType;
diff --git a/loader/dshow/DS_AudioDecoder.h b/loader/dshow/DS_AudioDecoder.h
index 47fd384a04..6b3196ff76 100644
--- a/loader/dshow/DS_AudioDecoder.h
+++ b/loader/dshow/DS_AudioDecoder.h
@@ -1,7 +1,7 @@
#ifndef AVIFILE_DS_AUDIODECODER_H
#define AVIFILE_DS_AUDIODECODER_H
-typedef struct _DS_AudioDecoder DS_AudioDecoder;
+typedef struct DS_AudioDecoder DS_AudioDecoder;
//DS_AudioDecoder * DS_AudioDecoder_Create(const CodecInfo * info, const WAVEFORMATEX* wf);
DS_AudioDecoder * DS_AudioDecoder_Open(char* dllname, GUID* guid, WAVEFORMATEX* wf);
diff --git a/loader/dshow/DS_Filter.h b/loader/dshow/DS_Filter.h
index 6fb643dc67..69f9918424 100644
--- a/loader/dshow/DS_Filter.h
+++ b/loader/dshow/DS_Filter.h
@@ -18,8 +18,8 @@ typedef struct {
and then set up m_pAll.
**/
-typedef struct _DS_Filter DS_Filter;
-struct _DS_Filter
+typedef struct DS_Filter DS_Filter;
+struct DS_Filter
{
int m_iHandle;
IBaseFilter* m_pFilter;
diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c
index 60170e6385..0b83419f98 100644
--- a/loader/dshow/DS_VideoDecoder.c
+++ b/loader/dshow/DS_VideoDecoder.c
@@ -11,7 +11,7 @@
#include "libwin32.h"
#include "DS_Filter.h"
-struct _DS_VideoDecoder
+struct DS_VideoDecoder
{
IVideoDecoder iv;
@@ -54,9 +54,9 @@ static SampleProcUserData sampleProcData;
int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this)
{return this->m_Caps;}
-typedef struct _ct ct;
+typedef struct ct ct;
-struct _ct {
+struct ct {
unsigned int bits;
fourcc_t fcc;
const GUID *subtype;
diff --git a/loader/dshow/DS_VideoDecoder.h b/loader/dshow/DS_VideoDecoder.h
index 388f075126..b68c808836 100644
--- a/loader/dshow/DS_VideoDecoder.h
+++ b/loader/dshow/DS_VideoDecoder.h
@@ -1,7 +1,7 @@
#ifndef AVIFILE_DS_VIDEODECODER_H
#define AVIFILE_DS_VIDEODECODER_H
-typedef struct _DS_VideoDecoder DS_VideoDecoder;
+typedef struct DS_VideoDecoder DS_VideoDecoder;
int DS_VideoDecoder_GetCapabilities(DS_VideoDecoder *this);
diff --git a/loader/dshow/allocator.c b/loader/dshow/allocator.c
index 7eef9ada0f..e68c5e5a2d 100644
--- a/loader/dshow/allocator.c
+++ b/loader/dshow/allocator.c
@@ -13,10 +13,10 @@
static int AllocatorKeeper = 0;
-struct _avm_list_t
+struct avm_list_t
{
- struct _avm_list_t* next;
- struct _avm_list_t* prev;
+ struct avm_list_t* next;
+ struct avm_list_t* prev;
void* member;
};
diff --git a/loader/dshow/allocator.h b/loader/dshow/allocator.h
index ef1efd7370..0efa3d886f 100644
--- a/loader/dshow/allocator.h
+++ b/loader/dshow/allocator.h
@@ -4,10 +4,10 @@
#include "interfaces.h"
#include "cmediasample.h"
-typedef struct _avm_list_t avm_list_t;
-typedef struct _MemAllocator MemAllocator;
+typedef struct avm_list_t avm_list_t;
+typedef struct MemAllocator MemAllocator;
-struct _MemAllocator
+struct MemAllocator
{
IMemAllocator_vt* vt;
DECLARE_IUNKNOWN();
diff --git a/loader/dshow/cmediasample.c b/loader/dshow/cmediasample.c
index f4234bf3d5..53fd8124cd 100644
--- a/loader/dshow/cmediasample.c
+++ b/loader/dshow/cmediasample.c
@@ -504,12 +504,12 @@ static void CMediaSample_ResetPointer(CMediaSample* This)
* \brief CMediaSample constructor
*
* \param[in] allocator IMemallocator interface of allocator to use
- * \param[in] _size size of internal buffer
+ * \param[in] size size of internal buffer
*
* \return pointer to CMediaSample object of NULL if error occured
*
*/
-CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size)
+CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size)
{
CMediaSample* This = (CMediaSample*) malloc(sizeof(CMediaSample));
if (!This)
@@ -522,11 +522,11 @@ CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size)
// anyway this is fixes the problem somehow with some reserves
//
// using different trick for now - in DS_Audio modify sample size
- //if (_size < 0x1000)
- // _size = (_size + 0xfff) & ~0xfff;
+ //if (size < 0x1000)
+ // size = (size + 0xfff) & ~0xfff;
This->vt = (IMediaSample_vt*) malloc(sizeof(IMediaSample_vt));
- This->own_block = (char*) malloc((size_t)_size + SAFETY_ACEL);
+ This->own_block = (char*) malloc((size_t)size + SAFETY_ACEL);
This->media_type.pbFormat = 0;
This->media_type.pUnk = 0;
@@ -557,7 +557,7 @@ CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size)
This->vt->SetMediaTime = CMediaSample_SetMediaTime;
This->all = allocator;
- This->size = _size;
+ This->size = size;
This->refcount = 0; // increased by MemAllocator
This->actual_size = 0;
This->isPreroll = 0;
diff --git a/loader/dshow/cmediasample.h b/loader/dshow/cmediasample.h
index 3d6e1218ca..e16fd613db 100644
--- a/loader/dshow/cmediasample.h
+++ b/loader/dshow/cmediasample.h
@@ -4,8 +4,8 @@
#include "interfaces.h"
#include "guids.h"
-typedef struct _CMediaSample CMediaSample;
-struct _CMediaSample
+typedef struct CMediaSample CMediaSample;
+struct CMediaSample
{
IMediaSample_vt* vt;
DECLARE_IUNKNOWN();
@@ -25,7 +25,7 @@ struct _CMediaSample
void ( *ResetPointer) (CMediaSample* This); // FIXME replace with Set & 0
};
-CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size);
+CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int size);
// called from allocator
void CMediaSample_Destroy(CMediaSample* This);
diff --git a/loader/dshow/inputpin.h b/loader/dshow/inputpin.h
index a8ccdcccf9..b36b2f0739 100644
--- a/loader/dshow/inputpin.h
+++ b/loader/dshow/inputpin.h
@@ -3,8 +3,8 @@
#include "interfaces.h"
-typedef struct _CBaseFilter2 CBaseFilter2;
-struct _CBaseFilter2
+typedef struct CBaseFilter2 CBaseFilter2;
+struct CBaseFilter2
{
IBaseFilter_vt* vt;
DECLARE_IUNKNOWN();
@@ -17,8 +17,8 @@ struct _CBaseFilter2
CBaseFilter2* CBaseFilter2Create(void);
-typedef struct _CBaseFilter CBaseFilter;
-struct _CBaseFilter
+typedef struct CBaseFilter CBaseFilter;
+struct CBaseFilter
{
IBaseFilter_vt* vt;
DECLARE_IUNKNOWN(); // has to match CBaseFilter2 - INHERITANCE!!
diff --git a/loader/dshow/interfaces.h b/loader/dshow/interfaces.h
index 92a7718cd0..ffa5753370 100644
--- a/loader/dshow/interfaces.h
+++ b/loader/dshow/interfaces.h
@@ -12,10 +12,10 @@
/* Sh*t. MSVC++ and g++ use different methods of storing vtables. */
-typedef struct _IReferenceClock IReferenceClock;
-typedef struct _IFilterGraph IFilterGraph;
+typedef struct IReferenceClock IReferenceClock;
+typedef struct IFilterGraph IFilterGraph;
-typedef struct _IBaseFilter IBaseFilter;
+typedef struct IBaseFilter IBaseFilter;
typedef enum
{
@@ -23,14 +23,14 @@ typedef enum
PINDIR_OUTPUT
} PIN_DIRECTION;
-typedef struct _PinInfo
+typedef struct PinInfo
{
IBaseFilter* pFilter;
PIN_DIRECTION dir;
unsigned short achName[128];
} PIN_INFO;
-typedef struct _AllocatorProperties
+typedef struct AllocatorProperties
{
long cBuffers;
long cbBuffer;
@@ -38,7 +38,7 @@ typedef struct _AllocatorProperties
long cbPrefix;
} ALLOCATOR_PROPERTIES;
-typedef struct _IEnumMediaTypes IEnumMediaTypes;
+typedef struct IEnumMediaTypes IEnumMediaTypes;
typedef struct IEnumMediaTypes_vt
{
INHERIT_IUNKNOWN();
@@ -53,11 +53,11 @@ typedef struct IEnumMediaTypes_vt
HRESULT STDCALL ( *Clone )(IEnumMediaTypes* This,
/* [out] */ IEnumMediaTypes** ppEnum);
} IEnumMediaTypes_vt;
-struct _IEnumMediaTypes { IEnumMediaTypes_vt* vt; };
+struct IEnumMediaTypes { IEnumMediaTypes_vt* vt; };
-typedef struct _IPin IPin;
+typedef struct IPin IPin;
typedef struct IPin_vt
{
INHERIT_IUNKNOWN();
@@ -91,10 +91,10 @@ typedef struct IPin_vt
/* [in] */ REFERENCE_TIME tStop,
/* [in] */ double dRate);
} IPin_vt;
-struct _IPin { IPin_vt *vt; };
+struct IPin { IPin_vt *vt; };
-typedef struct _IEnumPins IEnumPins;
+typedef struct IEnumPins IEnumPins;
typedef struct IEnumPins_vt
{
INHERIT_IUNKNOWN();
@@ -113,10 +113,10 @@ typedef struct IEnumPins_vt
HRESULT STDCALL ( *Clone )(IEnumPins* This,
/* [out] */ IEnumPins** ppEnum);
} IEnumPins_vt;
-struct _IEnumPins { struct IEnumPins_vt* vt; };
+struct IEnumPins { struct IEnumPins_vt* vt; };
-typedef struct _IMediaSample IMediaSample;
+typedef struct IMediaSample IMediaSample;
typedef struct IMediaSample_vt
{
INHERIT_IUNKNOWN();
@@ -174,11 +174,11 @@ typedef struct IMediaSample_vt
/* [in] */ long long* pTimeStart,
/* [in] */ long long* pTimeEnd);
} IMediaSample_vt;
-struct _IMediaSample { struct IMediaSample_vt* vt; };
+struct IMediaSample { struct IMediaSample_vt* vt; };
-//typedef struct _IBaseFilter IBaseFilter;
+//typedef struct IBaseFilter IBaseFilter;
typedef struct IBaseFilter_vt
{
INHERIT_IUNKNOWN();
@@ -211,11 +211,11 @@ typedef struct IBaseFilter_vt
HRESULT STDCALL ( *QueryVendorInfo )(IBaseFilter* This,
/* [string][out] */ unsigned short** pVendorInfo);
} IBaseFilter_vt;
-struct _IBaseFilter { struct IBaseFilter_vt* vt; };
+struct IBaseFilter { struct IBaseFilter_vt* vt; };
-typedef struct _IMemAllocator IMemAllocator;
+typedef struct IMemAllocator IMemAllocator;
typedef struct IMemAllocator_vt
{
INHERIT_IUNKNOWN();
@@ -241,11 +241,11 @@ typedef struct IMemAllocator_vt
HRESULT STDCALL ( *ReleaseBuffer )(IMemAllocator* This,
/* [in] */ IMediaSample* pBuffer);
} IMemAllocator_vt;
-struct _IMemAllocator { IMemAllocator_vt* vt; };
+struct IMemAllocator { IMemAllocator_vt* vt; };
-typedef struct _IMemInputPin IMemInputPin;
+typedef struct IMemInputPin IMemInputPin;
typedef struct IMemInputPin_vt
{
INHERIT_IUNKNOWN();
@@ -265,10 +265,10 @@ typedef struct IMemInputPin_vt
/* [out] */ long *nSamplesProcessed);
HRESULT STDCALL ( *ReceiveCanBlock )(IMemInputPin * This);
} IMemInputPin_vt;
-struct _IMemInputPin { IMemInputPin_vt* vt; };
+struct IMemInputPin { IMemInputPin_vt* vt; };
-typedef struct _IHidden IHidden;
+typedef struct IHidden IHidden;
typedef struct IHidden_vt
{
INHERIT_IUNKNOWN();
@@ -285,10 +285,10 @@ typedef struct IHidden_vt
HRESULT STDCALL ( *SetSmth5 )(IHidden* This, int v1, int v2);
HRESULT STDCALL ( *GetSmth6 )(IHidden* This, int* pv);
} IHidden_vt;
-struct _IHidden { struct IHidden_vt* vt; };
+struct IHidden { struct IHidden_vt* vt; };
-typedef struct _IHidden2 IHidden2;
+typedef struct IHidden2 IHidden2;
typedef struct IHidden2_vt
{
INHERIT_IUNKNOWN();
@@ -302,7 +302,7 @@ typedef struct IHidden2_vt
HRESULT STDCALL ( *unk7 )(void);
HRESULT STDCALL ( *unk8 )(void);
} IHidden2_vt;
-struct _IHidden2 { struct IHidden2_vt* vt; };
+struct IHidden2 { struct IHidden2_vt* vt; };
// fixme
diff --git a/loader/dshow/libwin32.h b/loader/dshow/libwin32.h
index fa7d601abd..762c8e86b5 100644
--- a/loader/dshow/libwin32.h
+++ b/loader/dshow/libwin32.h
@@ -14,21 +14,21 @@
typedef uint32_t fourcc_t;
/*
-typedef struct _FatalError
+typedef struct FatalError
{
FatalError();
void PrintAll() {}
}FatalError;
*/
-typedef struct _CodecInfo
+typedef struct CodecInfo
{
char* dll;
GUID* guid;
}CodecInfo;
-typedef struct _CImage // public your_libvo_mem
+typedef struct CImage // public your_libvo_mem
{
char* ptr;
@@ -53,7 +53,7 @@ struct BitmapInfo : public BITMAPINFOHEADER
};
#endif
-typedef struct _IAudioDecoder
+typedef struct IAudioDecoder
{
WAVEFORMATEX in_fmt;
CodecInfo record;
@@ -96,7 +96,7 @@ struct IAudioEncoder
START,
};
-typedef struct _BitmapInfo
+typedef struct BitmapInfo
{
long biSize;
long biWidth;
@@ -112,7 +112,7 @@ typedef struct _BitmapInfo
int colors[3];
} BitmapInfo;
-typedef struct _IVideoDecoder
+typedef struct IVideoDecoder
{
int VBUFSIZE;
int QMARKHI;
diff --git a/loader/dshow/mediatype.h b/loader/dshow/mediatype.h
index 91b52d92ab..9e3734545c 100644
--- a/loader/dshow/mediatype.h
+++ b/loader/dshow/mediatype.h
@@ -7,7 +7,7 @@
#define DS_MEDIATYPE_H
#include "guids.h"
-typedef struct __attribute__((__packed__)) _MediaType
+typedef struct __attribute__((__packed__)) MediaType
{
GUID majortype; //0x0
GUID subtype; //0x10
diff --git a/loader/dshow/outputpin.c b/loader/dshow/outputpin.c
index f979dd5a6f..dd715ef02d 100644
--- a/loader/dshow/outputpin.c
+++ b/loader/dshow/outputpin.c
@@ -33,7 +33,7 @@ typedef struct CEnumMediaTypes
/**
IMemOutput interface implementation
*/
-struct _COutputMemPin
+struct COutputMemPin
{
IMemInputPin_vt* vt;
DECLARE_IUNKNOWN();
diff --git a/loader/dshow/outputpin.h b/loader/dshow/outputpin.h
index aa60ca049b..03c5134f8b 100644
--- a/loader/dshow/outputpin.h
+++ b/loader/dshow/outputpin.h
@@ -5,8 +5,8 @@
#include "allocator.h"
-typedef struct _COutputMemPin COutputMemPin;
-typedef struct _COutputPin COutputPin;
+typedef struct COutputMemPin COutputMemPin;
+typedef struct COutputPin COutputPin;
/**
Callback routine for copying samples from pin into filter
@@ -15,7 +15,7 @@ typedef struct _COutputPin COutputPin;
*/
typedef HRESULT STDCALL (*SAMPLEPROC)(void* pUserData,IMediaSample*sample);
-struct _COutputPin
+struct COutputPin
{
IPin_vt* vt;
DECLARE_IUNKNOWN();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 18:49:11 +0000