diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-05-27 13:08:33 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-05-27 13:08:33 +0400 |
| commit | f829a8f5b1237ea931aa4eb1965110084a990149 (patch) | |
| tree | f46ac1ecf4fb8983eecf768ef2e580154fc21c6e | |
| parent | a12d0819f8acd45a99431577831a3aa5f81284b2 (diff) | |
use a space after if, for, while
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4907 10f7b99b-c216-0410-bff0-8a66a9350fd8
48 files changed, 238 insertions, 238 deletions
diff --git a/src/DSUtil/DSUtil.h b/src/DSUtil/DSUtil.h index 03f5227de..e89eb0db4 100644 --- a/src/DSUtil/DSUtil.h +++ b/src/DSUtil/DSUtil.h @@ -154,49 +154,49 @@ public: #define BeginEnumFilters(pFilterGraph, pEnumFilters, pBaseFilter) \
{CComPtr<IEnumFilters> pEnumFilters; \
- if(pFilterGraph && SUCCEEDED(pFilterGraph->EnumFilters(&pEnumFilters))) \
+ if (pFilterGraph && SUCCEEDED(pFilterGraph->EnumFilters(&pEnumFilters))) \
{ \
- for(CComPtr<IBaseFilter> pBaseFilter; S_OK == pEnumFilters->Next(1, &pBaseFilter, 0); pBaseFilter = NULL) \
+ for (CComPtr<IBaseFilter> pBaseFilter; S_OK == pEnumFilters->Next(1, &pBaseFilter, 0); pBaseFilter = NULL) \
{ \
#define EndEnumFilters }}}
#define BeginEnumCachedFilters(pGraphConfig, pEnumFilters, pBaseFilter) \
{CComPtr<IEnumFilters> pEnumFilters; \
- if(pGraphConfig && SUCCEEDED(pGraphConfig->EnumCacheFilter(&pEnumFilters))) \
+ if (pGraphConfig && SUCCEEDED(pGraphConfig->EnumCacheFilter(&pEnumFilters))) \
{ \
- for(CComPtr<IBaseFilter> pBaseFilter; S_OK == pEnumFilters->Next(1, &pBaseFilter, 0); pBaseFilter = NULL) \
+ for (CComPtr<IBaseFilter> pBaseFilter; S_OK == pEnumFilters->Next(1, &pBaseFilter, 0); pBaseFilter = NULL) \
{ \
#define EndEnumCachedFilters }}}
#define BeginEnumPins(pBaseFilter, pEnumPins, pPin) \
{CComPtr<IEnumPins> pEnumPins; \
- if(pBaseFilter && SUCCEEDED(pBaseFilter->EnumPins(&pEnumPins))) \
+ if (pBaseFilter && SUCCEEDED(pBaseFilter->EnumPins(&pEnumPins))) \
{ \
- for(CComPtr<IPin> pPin; S_OK == pEnumPins->Next(1, &pPin, 0); pPin = NULL) \
+ for (CComPtr<IPin> pPin; S_OK == pEnumPins->Next(1, &pPin, 0); pPin = NULL) \
{ \
#define EndEnumPins }}}
#define BeginEnumMediaTypes(pPin, pEnumMediaTypes, pMediaType) \
{CComPtr<IEnumMediaTypes> pEnumMediaTypes; \
- if(pPin && SUCCEEDED(pPin->EnumMediaTypes(&pEnumMediaTypes))) \
+ if (pPin && SUCCEEDED(pPin->EnumMediaTypes(&pEnumMediaTypes))) \
{ \
AM_MEDIA_TYPE* pMediaType = NULL; \
- for(; S_OK == pEnumMediaTypes->Next(1, &pMediaType, NULL); DeleteMediaType(pMediaType), pMediaType = NULL) \
+ for (; S_OK == pEnumMediaTypes->Next(1, &pMediaType, NULL); DeleteMediaType(pMediaType), pMediaType = NULL) \
{ \
-#define EndEnumMediaTypes(pMediaType) } if(pMediaType) DeleteMediaType(pMediaType); }}
+#define EndEnumMediaTypes(pMediaType) } if (pMediaType) DeleteMediaType(pMediaType); }}
#define BeginEnumSysDev(clsid, pMoniker) \
{CComPtr<ICreateDevEnum> pDevEnum4$##clsid; \
pDevEnum4$##clsid.CoCreateInstance(CLSID_SystemDeviceEnum); \
CComPtr<IEnumMoniker> pClassEnum4$##clsid; \
- if(SUCCEEDED(pDevEnum4$##clsid->CreateClassEnumerator(clsid, &pClassEnum4$##clsid, 0)) \
+ if (SUCCEEDED(pDevEnum4$##clsid->CreateClassEnumerator(clsid, &pClassEnum4$##clsid, 0)) \
&& pClassEnum4$##clsid) \
{ \
- for(CComPtr<IMoniker> pMoniker; pClassEnum4$##clsid->Next(1, &pMoniker, 0) == S_OK; pMoniker = NULL) \
+ for (CComPtr<IMoniker> pMoniker; pClassEnum4$##clsid->Next(1, &pMoniker, 0) == S_OK; pMoniker = NULL) \
{ \
#define EndEnumSysDev }}}
@@ -225,9 +225,9 @@ static CUnknown* WINAPI CreateInstance(LPUNKNOWN lpunk, HRESULT* phr) return punk;
}
-#define SAFE_DELETE(p) { if(p) { delete (p); (p)=NULL; } }
-#define SAFE_DELETE_ARRAY(p) { if(p) { delete[] (p); (p)=NULL; } }
-#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }
+#define SAFE_DELETE(p) { if (p) { delete (p); (p)=NULL; } }
+#define SAFE_DELETE_ARRAY(p) { if (p) { delete[] (p); (p)=NULL; } }
+#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p)=NULL; } }
inline int LNKO(int a, int b)
{
diff --git a/src/DSUtil/MediaTypeEx.cpp b/src/DSUtil/MediaTypeEx.cpp index 1c2a57e1d..e34a425f6 100644 --- a/src/DSUtil/MediaTypeEx.cpp +++ b/src/DSUtil/MediaTypeEx.cpp @@ -266,7 +266,7 @@ CString CMediaTypeEx::GetVideoCodecName(const GUID& subtype, DWORD biCompression if (subtype == MEDIASUBTYPE_DiracVideo) {
str = _T("Dirac Video");
}
- // else if(subtype == ) str = _T("");
+ // else if (subtype == ) str = _T("");
else if (biCompression < 256) {
str.Format(_T("%d"), biCompression);
} else {
diff --git a/src/DSUtil/text.cpp b/src/DSUtil/text.cpp index b8128073b..5bded09c2 100644 --- a/src/DSUtil/text.cpp +++ b/src/DSUtil/text.cpp @@ -29,20 +29,20 @@ CString Explode(CString str, CAtlList<CString>& sl, TCHAR sep, int limit) {
sl.RemoveAll();
- if(limit == 1) {sl.AddTail(str); return _T("");}
+ if (limit == 1) {sl.AddTail(str); return _T("");}
- if(!str.IsEmpty() && str[str.GetLength()-1] != sep)
+ if (!str.IsEmpty() && str[str.GetLength()-1] != sep)
str += sep;
- for(ptrdiff_t i = 0, j = 0; (j = str.Find(sep, i)) >= 0; i = j+1)
+ for (ptrdiff_t i = 0, j = 0; (j = str.Find(sep, i)) >= 0; i = j+1)
{
CString tmp = str.Mid(i, j-i);
tmp.TrimLeft(sep); tmp.TrimRight(sep);
tmp.TrimLeft(); tmp.TrimRight();
sl.AddTail(tmp);
- if(limit > 0 && sl.GetCount() == limit-1)
+ if (limit > 0 && sl.GetCount() == limit-1)
{
- if(j+1 < str.GetLength())
+ if (j+1 < str.GetLength())
{
CString tmp = str.Mid(j+1);
tmp.TrimLeft(sep); tmp.TrimRight(sep);
@@ -53,7 +53,7 @@ CString Explode(CString str, CAtlList<CString>& sl, TCHAR sep, int limit) }
}
- if(sl.IsEmpty())
+ if (sl.IsEmpty())
{
str.TrimLeft(sep); str.TrimRight(sep);
str.TrimLeft(); str.TrimRight();
@@ -67,13 +67,13 @@ CString ExplodeMin(CString str, CAtlList<CString>& sl, TCHAR sep, int limit) {
Explode(str, sl, sep, limit);
POSITION pos = sl.GetHeadPosition();
- while(pos)
+ while (pos)
{
POSITION tmp = pos;
- if(sl.GetNext(pos).IsEmpty())
+ if (sl.GetNext(pos).IsEmpty())
sl.RemoveAt(tmp);
}
- if(sl.IsEmpty()) sl.AddTail(CString()); // eh
+ if (sl.IsEmpty()) sl.AddTail(CString()); // eh
return sl.GetHead();
}
@@ -82,10 +82,10 @@ CString Implode(CAtlList<CString>& sl, TCHAR sep) {
CString ret;
POSITION pos = sl.GetHeadPosition();
- while(pos)
+ while (pos)
{
ret += sl.GetNext(pos);
- if(pos) ret += sep;
+ if (pos) ret += sep;
}
return(ret);
}
diff --git a/src/DSUtil/vd.cpp b/src/DSUtil/vd.cpp index d13d746e1..61158a1da 100644 --- a/src/DSUtil/vd.cpp +++ b/src/DSUtil/vd.cpp @@ -167,14 +167,14 @@ bool BitBltFromI420ToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* bool BitBltFromI420ToYUY2(int w, int h, BYTE* dst, int dstpitch, BYTE* srcy, BYTE* srcu, BYTE* srcv, int srcpitch)
{
- if(srcpitch == 0) srcpitch = w;
+ if (srcpitch == 0) srcpitch = w;
#ifndef _WIN64
- if((g_cpuid.m_flags & CCpuID::sse2)
+ if ((g_cpuid.m_flags & CCpuID::sse2)
&& !((DWORD_PTR)srcy&15) && !((DWORD_PTR)srcu&15) && !((DWORD_PTR)srcv&15) && !(srcpitch&31)
&& !((DWORD_PTR)dst&15) && !(dstpitch&15))
{
- if(w<=0 || h<=0 || (w&1) || (h&1))
+ if (w<=0 || h<=0 || (w&1) || (h&1))
return false;
yv12_yuy2_sse2(srcy, srcu, srcv, srcpitch/2, w/2, h, dst, dstpitch);
@@ -264,7 +264,7 @@ bool BitBltFromRGBToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* s bool BitBltFromYUY2ToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* src, int srcpitch)
{
- if(srcpitch == 0) srcpitch = w;
+ if (srcpitch == 0) srcpitch = w;
VDPixmap srcbm = {0};
@@ -302,7 +302,7 @@ bool BitBltFromYUY2ToRGB(int w, int h, BYTE* dst, int dstpitch, int dbpp, BYTE* static void yuvtoyuy2row_c(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width)
{
WORD* dstw = (WORD*)dst;
- for(; width > 1; width -= 2)
+ for (; width > 1; width -= 2)
{
*dstw++ = (*srcu++<<8)|*srcy++;
*dstw++ = (*srcv++<<8)|*srcy++;
@@ -312,7 +312,7 @@ static void yuvtoyuy2row_c(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD static void yuvtoyuy2row_avg_c(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width, DWORD pitchuv)
{
WORD* dstw = (WORD*)dst;
- for(; width > 1; width -= 2, srcu++, srcv++)
+ for (; width > 1; width -= 2, srcu++, srcv++)
{
*dstw++ = (((srcu[0]+srcu[pitchuv])>>1)<<8)|*srcy++;
*dstw++ = (((srcv[0]+srcv[pitchuv])>>1)<<8)|*srcy++;
@@ -321,16 +321,16 @@ static void yuvtoyuy2row_avg_c(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DW bool BitBltFromI420ToYUY2Interlaced(int w, int h, BYTE* dst, int dstpitch, BYTE* srcy, BYTE* srcu, BYTE* srcv, int srcpitch)
{
- if(w<=0 || h<=0 || (w&1) || (h&1))
+ if (w<=0 || h<=0 || (w&1) || (h&1))
return false;
- if(srcpitch == 0) srcpitch = w;
+ if (srcpitch == 0) srcpitch = w;
void (*yuvtoyuy2row)(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width) = NULL;
void (*yuvtoyuy2row_avg)(BYTE* dst, BYTE* srcy, BYTE* srcu, BYTE* srcv, DWORD width, DWORD pitchuv) = NULL;
#ifndef _WIN64
- if((g_cpuid.m_flags & CCpuID::sse2)
+ if ((g_cpuid.m_flags & CCpuID::sse2)
&& !((DWORD_PTR)srcy&15) && !((DWORD_PTR)srcu&15) && !((DWORD_PTR)srcv&15) && !(srcpitch&31)
&& !((DWORD_PTR)dst&15) && !(dstpitch&15))
{
@@ -338,7 +338,7 @@ bool BitBltFromI420ToYUY2Interlaced(int w, int h, BYTE* dst, int dstpitch, BYTE* return true;
}
- if((g_cpuid.m_flags & CCpuID::mmx) && !(w&7))
+ if ((g_cpuid.m_flags & CCpuID::mmx) && !(w&7))
{
yuvtoyuy2row = yuvtoyuy2row_MMX;
yuvtoyuy2row_avg = yuvtoyuy2row_avg_MMX;
@@ -350,7 +350,7 @@ bool BitBltFromI420ToYUY2Interlaced(int w, int h, BYTE* dst, int dstpitch, BYTE* yuvtoyuy2row_avg = yuvtoyuy2row_avg_c;
}
- if(!yuvtoyuy2row)
+ if (!yuvtoyuy2row)
return false;
int halfsrcpitch = srcpitch/2;
@@ -364,13 +364,13 @@ bool BitBltFromI420ToYUY2Interlaced(int w, int h, BYTE* dst, int dstpitch, BYTE* srcu += halfsrcpitch;
srcv += halfsrcpitch;
}
- while((h -= 2) > 2);
+ while ((h -= 2) > 2);
yuvtoyuy2row(dst, srcy, srcu, srcv, w);
yuvtoyuy2row(dst + dstpitch, srcy + srcpitch, srcu, srcv, w);
#ifndef _WIN64
- if(g_cpuid.m_flags & CCpuID::mmx)
+ if (g_cpuid.m_flags & CCpuID::mmx)
__asm emms
#endif
diff --git a/src/DeCSS/DeCSSInputPin.cpp b/src/DeCSS/DeCSSInputPin.cpp index 156509666..3dddc1e00 100644 --- a/src/DeCSS/DeCSSInputPin.cpp +++ b/src/DeCSS/DeCSSInputPin.cpp @@ -65,15 +65,15 @@ STDMETHODIMP CDeCSSInputPin::Receive(IMediaSample* pSample) long len = pSample->GetActualDataLength();
BYTE* p = NULL;
- if(SUCCEEDED(pSample->GetPointer(&p)) && len > 0) {
- if(m_mt.majortype == MEDIATYPE_DVD_ENCRYPTED_PACK && len == 2048 && (p[0x14]&0x30)) {
+ if (SUCCEEDED(pSample->GetPointer(&p)) && len > 0) {
+ if (m_mt.majortype == MEDIATYPE_DVD_ENCRYPTED_PACK && len == 2048 && (p[0x14]&0x30)) {
CSSdescramble(p, m_TitleKey);
p[0x14] &= ~0x30;
- if(CComQIPtr<IMediaSample2> pMS2 = pSample) {
+ if (CComQIPtr<IMediaSample2> pMS2 = pSample) {
AM_SAMPLE2_PROPERTIES props;
memset(&props, 0, sizeof(props));
- if(SUCCEEDED(pMS2->GetProperties(sizeof(props), (BYTE*)&props))
+ if (SUCCEEDED(pMS2->GetProperties(sizeof(props), (BYTE*)&props))
&& (props.dwTypeSpecificFlags & AM_UseNewCSSKey)) {
props.dwTypeSpecificFlags &= ~AM_UseNewCSSKey;
pMS2->SetProperties(sizeof(props), (BYTE*)&props);
@@ -92,19 +92,19 @@ void CDeCSSInputPin::StripPacket(BYTE*& p, long& len) {
GUID majortype = m_mt.majortype;
- if(majortype == MEDIATYPE_MPEG2_PACK || majortype == MEDIATYPE_DVD_ENCRYPTED_PACK)
- if(len > 0 && *(DWORD*)p == 0xba010000) { // MEDIATYPE_*_PACK
+ if (majortype == MEDIATYPE_MPEG2_PACK || majortype == MEDIATYPE_DVD_ENCRYPTED_PACK)
+ if (len > 0 && *(DWORD*)p == 0xba010000) { // MEDIATYPE_*_PACK
len -= 14;
p += 14;
- if(int stuffing = (p[-1]&7)) {
+ if (int stuffing = (p[-1]&7)) {
len -= stuffing;
p += stuffing;
}
majortype = MEDIATYPE_MPEG2_PES;
}
- if(majortype == MEDIATYPE_MPEG2_PES)
- if(len > 0 && *(DWORD*)p == 0xbb010000) {
+ if (majortype == MEDIATYPE_MPEG2_PES)
+ if (len > 0 && *(DWORD*)p == 0xbb010000) {
len -= 4;
p += 4;
int hdrlen = ((p[0]<<8)|p[1]) + 2;
@@ -112,8 +112,8 @@ void CDeCSSInputPin::StripPacket(BYTE*& p, long& len) p += hdrlen;
}
- if(majortype == MEDIATYPE_MPEG2_PES)
- if(len > 0
+ if (majortype == MEDIATYPE_MPEG2_PES)
+ if (len > 0
&& ((*(DWORD*)p&0xf0ffffff) == 0xe0010000
|| (*(DWORD*)p&0xe0ffffff) == 0xc0010000
|| (*(DWORD*)p&0xbdffffff) == 0xbd010000)) { // PES
@@ -126,28 +126,28 @@ void CDeCSSInputPin::StripPacket(BYTE*& p, long& len) p += 2;
BYTE* p0 = p;
- for(int i = 0; i < 16 && *p == 0xff; i++, len--, p++) {
+ for (int i = 0; i < 16 && *p == 0xff; i++, len--, p++) {
;
}
- if((*p&0xc0) == 0x80) { // mpeg2
+ if ((*p&0xc0) == 0x80) { // mpeg2
len -= 2;
p += 2;
len -= *p+1;
p += *p+1;
} else { // mpeg1
- if((*p&0xc0) == 0x40) {
+ if ((*p&0xc0) == 0x40) {
len -= 2;
p += 2;
}
- if((*p&0x30) == 0x30 || (*p&0x30) == 0x20) {
+ if ((*p&0x30) == 0x30 || (*p&0x30) == 0x20) {
bool pts = !!(*p&0x20), dts = !!(*p&0x10);
- if(pts) {
+ if (pts) {
len -= 5;
}
p += 5;
- if(dts) {
+ if (dts) {
ASSERT((*p&0xf0) == 0x10);
len -= 5;
p += 5;
@@ -158,26 +158,26 @@ void CDeCSSInputPin::StripPacket(BYTE*& p, long& len) }
}
- if(ps1) {
+ if (ps1) {
len--;
p++;
- if(m_mt.subtype == MEDIASUBTYPE_DVD_LPCM_AUDIO) {
+ if (m_mt.subtype == MEDIASUBTYPE_DVD_LPCM_AUDIO) {
len -= 6;
p += 6;
- } else if(m_mt.subtype == MEDIASUBTYPE_DOLBY_AC3 || m_mt.subtype == MEDIASUBTYPE_WAVE_DOLBY_AC3
+ } else if (m_mt.subtype == MEDIASUBTYPE_DOLBY_AC3 || m_mt.subtype == MEDIASUBTYPE_WAVE_DOLBY_AC3
|| m_mt.subtype == MEDIASUBTYPE_DTS || m_mt.subtype == MEDIASUBTYPE_WAVE_DTS) {
len -= 3;
p += 3;
}
}
- if(expected > 0) {
+ if (expected > 0) {
expected -= (p - p0);
len = min(expected, len);
}
}
- if(len < 0) {
+ if (len < 0) {
ASSERT(0);
len = 0;
}
@@ -187,7 +187,7 @@ void CDeCSSInputPin::StripPacket(BYTE*& p, long& len) STDMETHODIMP CDeCSSInputPin::Set(REFGUID PropSet, ULONG Id, LPVOID pInstanceData, ULONG InstanceLength, LPVOID pPropertyData, ULONG DataLength)
{
- if(PropSet != AM_KSPROPSETID_CopyProt) {
+ if (PropSet != AM_KSPROPSETID_CopyProt) {
return E_NOTIMPL;
}
@@ -196,7 +196,7 @@ STDMETHODIMP CDeCSSInputPin::Set(REFGUID PropSet, ULONG Id, LPVOID pInstanceData break;
case AM_PROPERTY_DVDCOPY_CHLG_KEY: { // 3. auth: receive drive nonce word, also store and encrypt the buskey made up of the two nonce words
AM_DVDCOPY_CHLGKEY* pChlgKey = (AM_DVDCOPY_CHLGKEY*)pPropertyData;
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
m_Challenge[i] = pChlgKey->ChlgKey[9-i];
}
@@ -210,10 +210,10 @@ STDMETHODIMP CDeCSSInputPin::Set(REFGUID PropSet, ULONG Id, LPVOID pInstanceData bool fSuccess = false;
- for(int j = 0; j < g_nPlayerKeys; j++) {
- for(int k = 1; k < 409; k++) {
+ for (int j = 0; j < g_nPlayerKeys; j++) {
+ for (int k = 1; k < 409; k++) {
BYTE DiscKey[6];
- for(int i = 0; i < 5; i++) {
+ for (int i = 0; i < 5; i++) {
DiscKey[i] = pDiscKey->DiscKey[k*5+i] ^ m_KeyCheck[4-i];
}
DiscKey[5] = 0;
@@ -221,14 +221,14 @@ STDMETHODIMP CDeCSSInputPin::Set(REFGUID PropSet, ULONG Id, LPVOID pInstanceData CSSdisckey(DiscKey, g_PlayerKeys[j]);
BYTE Hash[6];
- for(int i = 0; i < 5; i++) {
+ for (int i = 0; i < 5; i++) {
Hash[i] = pDiscKey->DiscKey[i] ^ m_KeyCheck[4-i];
}
Hash[5] = 0;
CSSdisckey(Hash, DiscKey);
- if(!memcmp(Hash, DiscKey, 6)) {
+ if (!memcmp(Hash, DiscKey, 6)) {
memcpy(m_DiscKey, DiscKey, 6);
j = g_nPlayerKeys;
fSuccess = true;
@@ -237,23 +237,23 @@ STDMETHODIMP CDeCSSInputPin::Set(REFGUID PropSet, ULONG Id, LPVOID pInstanceData }
}
- if(!fSuccess) {
+ if (!fSuccess) {
return E_FAIL;
}
}
break;
case AM_PROPERTY_DVDCOPY_DVD_KEY1: { // 2. auth: receive our drive-encrypted nonce word and decrypt it for verification
AM_DVDCOPY_BUSKEY* pKey1 = (AM_DVDCOPY_BUSKEY*)pPropertyData;
- for(int i = 0; i < 5; i++) {
+ for (int i = 0; i < 5; i++) {
m_Key[i] = pKey1->BusKey[4-i];
}
m_varient = -1;
- for(int i = 31; i >= 0; i--) {
+ for (int i = 31; i >= 0; i--) {
CSSkey1(i, m_Challenge, m_KeyCheck);
- if(memcmp(m_KeyCheck, &m_Key[0], 5) == 0) {
+ if (memcmp(m_KeyCheck, &m_Key[0], 5) == 0) {
m_varient = i;
}
}
@@ -265,7 +265,7 @@ STDMETHODIMP CDeCSSInputPin::Set(REFGUID PropSet, ULONG Id, LPVOID pInstanceData break;
case AM_PROPERTY_DVDCOPY_TITLE_KEY: { // 6. receive the title key and decrypt it with the disc key
AM_DVDCOPY_TITLEKEY* pTitleKey = (AM_DVDCOPY_TITLEKEY*)pPropertyData;
- for(int i = 0; i < 5; i++) {
+ for (int i = 0; i < 5; i++) {
m_TitleKey[i] = pTitleKey->TitleKey[i] ^ m_KeyCheck[4-i];
}
m_TitleKey[5] = 0;
@@ -281,14 +281,14 @@ STDMETHODIMP CDeCSSInputPin::Set(REFGUID PropSet, ULONG Id, LPVOID pInstanceData STDMETHODIMP CDeCSSInputPin::Get(REFGUID PropSet, ULONG Id, LPVOID pInstanceData, ULONG InstanceLength, LPVOID pPropertyData, ULONG DataLength, ULONG* pBytesReturned)
{
- if(PropSet != AM_KSPROPSETID_CopyProt) {
+ if (PropSet != AM_KSPROPSETID_CopyProt) {
return E_NOTIMPL;
}
switch(Id) {
case AM_PROPERTY_DVDCOPY_CHLG_KEY: { // 1. auth: send our nonce word
AM_DVDCOPY_CHLGKEY* pChlgKey = (AM_DVDCOPY_CHLGKEY*)pPropertyData;
- for(int i = 0; i < 10; i++) {
+ for (int i = 0; i < 10; i++) {
pChlgKey->ChlgKey[i] = 9 - (m_Challenge[i] = i);
}
*pBytesReturned = sizeof(AM_DVDCOPY_CHLGKEY);
@@ -296,7 +296,7 @@ STDMETHODIMP CDeCSSInputPin::Get(REFGUID PropSet, ULONG Id, LPVOID pInstanceData break;
case AM_PROPERTY_DVDCOPY_DEC_KEY2: { // 4. auth: send back the encrypted drive nonce word to finish the authentication
AM_DVDCOPY_BUSKEY* pKey2 = (AM_DVDCOPY_BUSKEY*)pPropertyData;
- for(int i = 0; i < 5; i++) {
+ for (int i = 0; i < 5; i++) {
pKey2->BusKey[4-i] = m_Key[5+i];
}
*pBytesReturned = sizeof(AM_DVDCOPY_BUSKEY);
@@ -324,7 +324,7 @@ STDMETHODIMP CDeCSSInputPin::Get(REFGUID PropSet, ULONG Id, LPVOID pInstanceData STDMETHODIMP CDeCSSInputPin::QuerySupported(REFGUID PropSet, ULONG Id, ULONG* pTypeSupport)
{
- if(PropSet != AM_KSPROPSETID_CopyProt) {
+ if (PropSet != AM_KSPROPSETID_CopyProt) {
return E_NOTIMPL;
}
diff --git a/src/SubPic/DX7SubPic.cpp b/src/SubPic/DX7SubPic.cpp index f0989dc98..62772cc63 100644 --- a/src/SubPic/DX7SubPic.cpp +++ b/src/SubPic/DX7SubPic.cpp @@ -163,7 +163,7 @@ STDMETHODIMP CDX7SubPic::AlphaBlt(RECT* pSrc, RECT* pDst, SubPicDesc* pTarget) {(float)dst.right, (float)dst.bottom, 0.5f, 2.0f, (float)src.right / w, (float)src.bottom / h},
};
/*
- for(ptrdiff_t i = 0; i < _countof(pVertices); i++)
+ for (ptrdiff_t i = 0; i < _countof(pVertices); i++)
{
pVertices[i].x -= 0.5;
pVertices[i].y -= 0.5;
@@ -191,7 +191,7 @@ STDMETHODIMP CDX7SubPic::AlphaBlt(RECT* pSrc, RECT* pDst, SubPicDesc* pTarget) D3DDEVICEDESC7 d3ddevdesc;
m_pD3DDev->GetCaps(&d3ddevdesc);
- if(d3ddevdesc.dpcTriCaps.dwAlphaCmpCaps & D3DPCMPCAPS_LESS)
+ if (d3ddevdesc.dpcTriCaps.dwAlphaCmpCaps & D3DPCMPCAPS_LESS)
{
m_pD3DDev->SetRenderState(D3DRENDERSTATE_ALPHAREF, (DWORD)0x000000FE);
m_pD3DDev->SetRenderState(D3DRENDERSTATE_ALPHATESTENABLE, TRUE);
diff --git a/src/SubPic/DX9SubPic.cpp b/src/SubPic/DX9SubPic.cpp index e2f101c30..a651554c6 100644 --- a/src/SubPic/DX9SubPic.cpp +++ b/src/SubPic/DX9SubPic.cpp @@ -161,7 +161,7 @@ STDMETHODIMP CDX9SubPic::ClearDirtyRect(DWORD color) /*
DWORD* ptr = (DWORD*)bm.bits;
DWORD* end = ptr + bm.h*bm.wBytes/4;
- while(ptr < end) *ptr++ = color;
+ while (ptr < end) *ptr++ = color;
*/
Unlock(NULL);
}
@@ -311,7 +311,7 @@ STDMETHODIMP CDX9SubPic::AlphaBlt(RECT* pSrc, RECT* pDst, SubPicDesc* pTarget) D3DCAPS9 d3dcaps9;
hr = pD3DDev->GetDeviceCaps(&d3dcaps9);
- if(d3dcaps9.AlphaCmpCaps & D3DPCMPCAPS_LESS)
+ if (d3dcaps9.AlphaCmpCaps & D3DPCMPCAPS_LESS)
{
hr = pD3DDev->SetRenderState(D3DRS_ALPHAREF, (DWORD)0x000000FE);
hr = pD3DDev->SetRenderState(D3DRS_ALPHATESTENABLE, TRUE);
diff --git a/src/SubPic/SubPicAllocatorPresenterImpl.cpp b/src/SubPic/SubPicAllocatorPresenterImpl.cpp index 694d4c1c1..92d8bba47 100644 --- a/src/SubPic/SubPicAllocatorPresenterImpl.cpp +++ b/src/SubPic/SubPicAllocatorPresenterImpl.cpp @@ -71,7 +71,7 @@ void CSubPicAllocatorPresenterImpl::AlphaBltSubPic(CSize size, SubPicDesc* pTarg /* SubPicDesc spd;
pSubPic->GetDesc(spd);
- if(spd.w > 0 && spd.h > 0)
+ if (spd.w > 0 && spd.h > 0)
{
CRect r;
pSubPic->GetDirtyRect(r);
@@ -134,7 +134,7 @@ STDMETHODIMP_(void) CSubPicAllocatorPresenterImpl::SetPosition(RECT w, RECT v) STDMETHODIMP_(void) CSubPicAllocatorPresenterImpl::SetTime(REFERENCE_TIME rtNow)
{
/*
- if(m_rtNow <= rtNow && rtNow <= m_rtNow + 1000000)
+ if (m_rtNow <= rtNow && rtNow <= m_rtNow + 1000000)
return;
*/
m_rtNow = rtNow - m_rtSubtitleDelay;
diff --git a/src/SubPic/SubPicQueueImpl.cpp b/src/SubPic/SubPicQueueImpl.cpp index 2ad11e0d4..49e738bd1 100644 --- a/src/SubPic/SubPicQueueImpl.cpp +++ b/src/SubPic/SubPicQueueImpl.cpp @@ -65,7 +65,7 @@ STDMETHODIMP CSubPicQueueImpl::SetSubPicProvider(ISubPicProvider* pSubPicProvide {
CAutoLock cAutoLock(&m_csSubPicProvider);
- // if(m_pSubPicProvider != pSubPicProvider)
+ // if (m_pSubPicProvider != pSubPicProvider)
{
m_pSubPicProvider = pSubPicProvider;
@@ -543,9 +543,9 @@ DWORD CSubPicQueue::ThreadProc() }
/*
- while(GetCount() && GetTail()->GetStop() > rtInvalidate)
+ while (GetCount() && GetTail()->GetStop() > rtInvalidate)
{
- if(GetTail()->GetStart() < rtInvalidate) GetTail()->SetStop(rtInvalidate);
+ if (GetTail()->GetStart() < rtInvalidate) GetTail()->SetStop(rtInvalidate);
else
{
RemoveTail();
diff --git a/src/Subtitles/DVBSub.cpp b/src/Subtitles/DVBSub.cpp index 929267a43..5007a8953 100644 --- a/src/Subtitles/DVBSub.cpp +++ b/src/Subtitles/DVBSub.cpp @@ -142,7 +142,7 @@ HRESULT CDVBSub::AddToBuffer(BYTE* pData, int nSize) return S_FALSE;
}
-#define MARKER if(gb.BitRead(1) != 1) {ASSERT(0); return(E_FAIL);}
+#define MARKER if (gb.BitRead(1) != 1) {ASSERT(0); return(E_FAIL);}
HRESULT CDVBSub::ParseSample(IMediaSample* pSample)
{
@@ -216,7 +216,7 @@ HRESULT CDVBSub::ParseSample(IMediaSample* pSample) }
//FILE* hFile = fopen ("D:\\Sources\\mpc-hc\\A garder\\TestSubRip\\dvbsub.dat", "ab");
- //if(hFile != NULL)
+ //if (hFile != NULL)
//{
// //BYTE Buff[5] = {48};
diff --git a/src/Subtitles/STS.cpp b/src/Subtitles/STS.cpp index d5036117f..fea809f37 100644 --- a/src/Subtitles/STS.cpp +++ b/src/Subtitles/STS.cpp @@ -1070,13 +1070,13 @@ static CStringW SMI2SSA(CStringW str, int CharSet) arg.Remove('#');
arg.TrimLeft(); arg.TrimRight(L" >");
- if(arg.GetLength() > 0)
+ if (arg.GetLength() > 0)
{
DWORD color;
CString key = WToT(arg);
void* val;
- if(g_colors.Lookup(key, val)) color = (DWORD)val;
+ if (g_colors.Lookup(key, val)) color = (DWORD)val;
else color = wcstol(arg, NULL, 16);
arg.Format(L"%02x%02x%02x", color&0xff, (color>>8)&0xff, (color>>16)&0xff);
@@ -1640,7 +1640,7 @@ static bool OpenXombieSub(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet entry.MakeLower();
- /*if(entry == L"version") {
+ /*if (entry == L"version") {
double version = GetFloat(buff);
} else*/ if (entry == L"screenhorizontal") {
try {
@@ -2574,13 +2574,13 @@ void CSimpleTextSubtitle::CreateSegments() OnChanged();
/*
- for(i = 0, j = m_segments.GetCount(); i < j; i++)
+ for (i = 0, j = m_segments.GetCount(); i < j; i++)
{
STSSegment& stss = m_segments[i];
TRACE(_T("%d - %d"), stss.start, stss.end);
- for(ptrdiff_t k = 0, l = stss.subs.GetCount(); k < l; k++)
+ for (ptrdiff_t k = 0, l = stss.subs.GetCount(); k < l; k++)
{
TRACE(_T(", %d"), stss.subs[k]);
}
diff --git a/src/Subtitles/USFSubtitles.cpp b/src/Subtitles/USFSubtitles.cpp index 4b6d6849f..18df99504 100644 --- a/src/Subtitles/USFSubtitles.cpp +++ b/src/Subtitles/USFSubtitles.cpp @@ -34,17 +34,17 @@ #define BeginEnumAttribs(pNode, pChild) \
{CComPtr<IXMLDOMNamedNodeMap> pAttribs; \
- if(SUCCEEDED(pNode->get_attributes(&pAttribs)) && pAttribs != NULL) \
+ if (SUCCEEDED(pNode->get_attributes(&pAttribs)) && pAttribs != NULL) \
{ \
CComPtr<IXMLDOMNode> pChild; \
- for(pAttribs->nextNode(&pChild); pChild; pChild = NULL, pAttribs->nextNode(&pChild)) \
+ for (pAttribs->nextNode(&pChild); pChild; pChild = NULL, pAttribs->nextNode(&pChild)) \
{ \
#define EndEnumAttribs }}}
#define BeginEnumChildren(pNode, pChild) \
{CComPtr<IXMLDOMNode> pChild, pNext; \
- for(pNode->get_firstChild(&pChild); pChild; pNext = NULL, pChild->get_nextSibling(&pNext), pChild = pNext) \
+ for (pNode->get_firstChild(&pChild); pChild; pNext = NULL, pChild->get_nextSibling(&pNext), pChild = pNext) \
{ \
#define EndEnumChildren }}
diff --git a/src/Subtitles/VobSubFileRipper.cpp b/src/Subtitles/VobSubFileRipper.cpp index 6072c35b6..8bb8e0efc 100644 --- a/src/Subtitles/VobSubFileRipper.cpp +++ b/src/Subtitles/VobSubFileRipper.cpp @@ -392,19 +392,19 @@ bool CVobSubFileRipper::LoadVob(CString fn) fn = fn.Left(fn.ReverseFind('.')+1);
fn.TrimRight(_T(".0123456789"));
- for(ptrdiff_t i = 0; i < 100; i++)
+ for (ptrdiff_t i = 0; i < 100; i++)
{
CString vob;
vob.Format(_T("%s%d.vob"), fn, i);
CFileStatus status;
- if(!(CFileGetStatus(vob, status) && status.m_size))
+ if (!(CFileGetStatus(vob, status) && status.m_size))
{
- if(i > 0) break;
+ if (i > 0) break;
else continue;
}
- if(status.m_size&0x7ff)
+ if (status.m_size&0x7ff)
{
Log(LOG_ERROR, _T("Length of %s is not n*2048!"), vob);
m_vobs.RemoveAll();
@@ -413,7 +413,7 @@ bool CVobSubFileRipper::LoadVob(CString fn) CString str = _T("Found ") + vob;
- if(i == 0)
+ if (i == 0)
{
str += _T(" (skipping, if not a menu vob rename it)");
}
@@ -425,7 +425,7 @@ bool CVobSubFileRipper::LoadVob(CString fn) Log(LOG_INFO, str);
}
- if(m_vobs.GetCount() <= 0)
+ if (m_vobs.GetCount() <= 0)
{
Log(LOG_ERROR, _T("Nothing found! (%s*.vob)"), fn);
return false;
diff --git a/src/Subtitles/VobSubImage.cpp b/src/Subtitles/VobSubImage.cpp index ae31c8ed8..1f26293d9 100644 --- a/src/Subtitles/VobSubImage.cpp +++ b/src/Subtitles/VobSubImage.cpp @@ -1175,9 +1175,9 @@ bool CVobSubImage::Polygonize(CAtlArray<BYTE>& pathTypes, CAtlArray<CPoint>& pat }
} else {
/*
- for(ptrdiff_t i = 1, len = o.pa.GetSize(); i < len; i++)
+ for (ptrdiff_t i = 1, len = o.pa.GetSize(); i < len; i++)
{
- if(int dir = o.da[i-1])
+ if (int dir = o.da[i-1])
{
CPoint dir2 = o.pa[i] - o.pa[i-1];
dir2.x /= 2; dir2.y /= 2;
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaFile.cpp b/src/filters/muxer/MatroskaMuxer/MatroskaFile.cpp index 898848bc7..78e84e40c 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaFile.cpp +++ b/src/filters/muxer/MatroskaMuxer/MatroskaFile.cpp @@ -381,7 +381,7 @@ MatroskaWriter::QWORD Segment::Size(bool fWithHeader) return 0x00FFFFFFFFFFFFFFi64;
/*
MatroskaWriter::QWORD len = 0;
- if(fWithHeader) len += HeaderSize(len);
+ if (fWithHeader) len += HeaderSize(len);
return len;
*/
}
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp index b4c9f3133..e296da6b0 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp @@ -434,21 +434,21 @@ DWORD CMatroskaMuxerFilter::ThreadProc() CNode<Track> Tracks;
CAutoPtr<Track> pT(DNew Track());
POSITION pos = m_pInputs.GetHeadPosition();
- for(int i = 1; pos; i++)
+ for (int i = 1; pos; i++)
{
CMatroskaMuxerInputPin* pPin = m_pInputs.GetNext(pos);
- if(!pPin->IsConnected()) continue;
+ if (!pPin->IsConnected()) continue;
CAutoPtr<TrackEntry> pTE(DNew TrackEntry());
*pTE = *pPin->GetTrackEntry();
- if(TrackNumber == 0 && pTE->TrackType == TrackEntry::TypeVideo)
+ if (TrackNumber == 0 && pTE->TrackType == TrackEntry::TypeVideo)
TrackNumber = pTE->TrackNumber;
pT->TrackEntries.AddTail(pTE);
}
Tracks.AddTail(pT);
Tracks.Write(pStream);
- if(TrackNumber == 0) TrackNumber = 1;
+ if (TrackNumber == 0) TrackNumber = 1;
*/
bool fTracksWritten = false;
@@ -882,7 +882,7 @@ HRESULT CMatroskaMuxerInputPin::CompleteConnect(IPin* pPin) hr = S_OK;
}
/*
- else if(m_mt.formattype == FORMAT_MPEGVideo)
+ else if (m_mt.formattype == FORMAT_MPEGVideo)
{
m_pTE->CodecID.Set("V_DSHOW/MPEG1VIDEO"); // V_MPEG1
@@ -893,12 +893,12 @@ HRESULT CMatroskaMuxerInputPin::CompleteConnect(IPin* pPin) m_pTE->DescType = TrackEntry::DescVideo;
m_pTE->v.PixelWidth.Set(pm1vi->hdr.bmiHeader.biWidth);
m_pTE->v.PixelHeight.Set(abs(pm1vi->hdr.bmiHeader.biHeight));
- if(pm1vi->hdr.AvgTimePerFrame > 0)
+ if (pm1vi->hdr.AvgTimePerFrame > 0)
m_pTE->v.FramePerSec.Set((float)(10000000.0 / pm1vi->hdr.AvgTimePerFrame));
hr = S_OK;
}
- else if(m_mt.formattype == FORMAT_MPEG2_VIDEO)
+ else if (m_mt.formattype == FORMAT_MPEG2_VIDEO)
{
m_pTE->CodecID.Set("V_DSHOW/MPEG2VIDEO"); // V_MPEG2
@@ -909,7 +909,7 @@ HRESULT CMatroskaMuxerInputPin::CompleteConnect(IPin* pPin) m_pTE->DescType = TrackEntry::DescVideo;
m_pTE->v.PixelWidth.Set(pm2vi->hdr.bmiHeader.biWidth);
m_pTE->v.PixelHeight.Set(abs(pm2vi->hdr.bmiHeader.biHeight));
- if(pm2vi->hdr.AvgTimePerFrame > 0)
+ if (pm2vi->hdr.AvgTimePerFrame > 0)
m_pTE->v.FramePerSec.Set((float)(10000000.0 / pm2vi->hdr.AvgTimePerFrame));
hr = S_OK;
@@ -1283,7 +1283,7 @@ STDMETHODIMP CMatroskaMuxerInputPin::Receive(IMediaSample* pSample) CAutoPtr<BlockGroup> b(DNew BlockGroup());
/*
// TODO: test this with a longer capture (pcm, mp3)
- if(S_OK == pSample->IsSyncPoint() && rtStart < m_rtLastStart)
+ if (S_OK == pSample->IsSyncPoint() && rtStart < m_rtLastStart)
{
TRACE(_T("!!! timestamp went backwards, dropping this frame !!! rtStart (%I64) < m_rtLastStart (%I64)"), rtStart, m_rtLastStart);
return S_OK;
diff --git a/src/filters/parser/AviSplitter/AviFile.cpp b/src/filters/parser/AviSplitter/AviFile.cpp index fa5c451bd..3685d1be2 100644 --- a/src/filters/parser/AviSplitter/AviFile.cpp +++ b/src/filters/parser/AviSplitter/AviFile.cpp @@ -285,7 +285,7 @@ HRESULT CAviFile::Parse(DWORD parentid, __int64 end) }
break;
case FCC('vprp'):
- //if(S_OK != Read(m_vprp)) return E_FAIL;
+ //if (S_OK != Read(m_vprp)) return E_FAIL;
break;
case FCC('idx1'):
ASSERT(m_idx1 == NULL);
@@ -477,7 +477,7 @@ bool CAviFile::IsInterleaved(bool fKeepInfo) return true;
}
/*
- if(m_avih.dwFlags&AVIF_ISINTERLEAVED) // not reliable, nandub can write f*cked up files and still sets it
+ if (m_avih.dwFlags&AVIF_ISINTERLEAVED) // not reliable, nandub can write f*cked up files and still sets it
return true;
*/
for (DWORD i = 0; i < m_avih.dwStreams; ++i) {
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index 433b6e9c7..9796727c3 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -1087,7 +1087,7 @@ bool CBaseSplitterFilter::IsAnyPinDrying() int count = pPin->QueueCount();
int size = pPin->QueueSize();
if (!pPin->IsDiscontinuous() && (count < MINPACKETS || size < MINPACKETSIZE)) {
- // if(m_priority != THREAD_PRIORITY_ABOVE_NORMAL && (count < MINPACKETS/3 || size < MINPACKETSIZE/3))
+ // if (m_priority != THREAD_PRIORITY_ABOVE_NORMAL && (count < MINPACKETS/3 || size < MINPACKETSIZE/3))
if (m_priority != THREAD_PRIORITY_BELOW_NORMAL && (count < MINPACKETS/3 || size < MINPACKETSIZE/3)) {
// SetThreadPriority(m_hThread, m_priority = THREAD_PRIORITY_ABOVE_NORMAL);
POSITION pos = m_pOutputs.GetHeadPosition();
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp index e79f950aa..ed7d4c7f9 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp @@ -63,7 +63,7 @@ bool CBaseSplitterFileEx::NextMpegStartCode(BYTE& code, __int64 len) //
-#define MARKER if(BitRead(1) != 1) {ASSERT(0); return false;}
+#define MARKER if (BitRead(1) != 1) {ASSERT(0); return false;}
bool CBaseSplitterFileEx::Read(pshdr& h)
{
@@ -1357,7 +1357,7 @@ bool CBaseSplitterFileEx::Read(pvahdr& h, bool fSync) if (!Read(h2, b)) {
return false;
}
- // Maybe bug, code before: if(h.fpts = h2.fpts) h.pts = h2.pts;
+ // Maybe bug, code before: if (h.fpts = h2.fpts) h.pts = h2.pts;
h.fpts = h2.fpts;
if (h.fpts) {
h.pts = h2.pts;
@@ -1805,60 +1805,60 @@ bool CBaseSplitterFileEx::Read(avchdr& h, spsppsindex index) h.views = (unsigned int) gb.UExpGolombRead()+1;
/*
- for(unsigned int i = 0; i < h.views; i++) {
+ for (unsigned int i = 0; i < h.views; i++) {
gb.UExpGolombRead(); // view_id
}
- for(unsigned int i = 1; i < h.views; i++) {
- for(int j = 0; j < gb.UExpGolombRead(); j++) { // num_anchor_refs_l0
+ for (unsigned int i = 1; i < h.views; i++) {
+ for (int j = 0; j < gb.UExpGolombRead(); j++) { // num_anchor_refs_l0
gb.UExpGolombRead(); // anchor_refs_l0
}
- for(int j = 0; j < gb.UExpGolombRead(); j++) { // num_anchor_refs_l1
+ for (int j = 0; j < gb.UExpGolombRead(); j++) { // num_anchor_refs_l1
gb.UExpGolombRead(); // anchor_refs_l1
}
}
- for(unsigned int i = 1; i < h.views; i++) {
- for(int j = 0; j < gb.UExpGolombRead(); j++) { // num_non_anchor_refs_l0
+ for (unsigned int i = 1; i < h.views; i++) {
+ for (int j = 0; j < gb.UExpGolombRead(); j++) { // num_non_anchor_refs_l0
gb.UExpGolombRead(); // non_anchor_refs_l0
}
- for(int j = 0; j < gb.UExpGolombRead(); j++) { // num_non_anchor_refs_l1
+ for (int j = 0; j < gb.UExpGolombRead(); j++) { // num_non_anchor_refs_l1
gb.UExpGolombRead(); // non_anchor_refs_l1
}
}
- for(unsigned int i = 0; i <= gb.UExpGolombRead(); i++) { // num_level_values_signalled_minus1
+ for (unsigned int i = 0; i <= gb.UExpGolombRead(); i++) { // num_level_values_signalled_minus1
gb.BitRead(8); // level_idc
- for(int j = 0; j <= gb.UExpGolombRead(); j++) { // num_applicable_ops_minus1
+ for (int j = 0; j <= gb.UExpGolombRead(); j++) { // num_applicable_ops_minus1
gb.BitRead(3); // applicable_op_temporal_id
- for(int k = 0; k <= gb.UExpGolombRead(); k++) { // applicable_op_num_target_views_minus1
+ for (int k = 0; k <= gb.UExpGolombRead(); k++) { // applicable_op_num_target_views_minus1
gb.UExpGolombRead(); // applicable_op_traget_view_id
}
gb.UExpGolombRead(); // applicable_op_num_views_minus1
}
}
- if(gb.BitRead(1)) { // mvc_vui_parameters_present_flag
+ if (gb.BitRead(1)) { // mvc_vui_parameters_present_flag
// mvc_vui_parameters_extension
- for(unsigned int i = 0; i <= gb.UExpGolombRead(); i++) { // vui_mvc_num_ops_minus1
+ for (unsigned int i = 0; i <= gb.UExpGolombRead(); i++) { // vui_mvc_num_ops_minus1
gb.BitRead(3);
- for(unsigned int j = 0; j <= gb.UExpGolombRead(); j++) { // vui_mvc_num_target_output_views_minus1
+ for (unsigned int j = 0; j <= gb.UExpGolombRead(); j++) { // vui_mvc_num_target_output_views_minus1
gb.UExpGolombRead(); // vui_mvc_view_id
}
- if(gb.BitRead(1)) { // vui_mvc_timing_info_present_flag
+ if (gb.BitRead(1)) { // vui_mvc_timing_info_present_flag
gb.BitRead(32); // vui_mvc_num_units_in_tick
gb.BitRead(32); // vui_mvc_time_scale
gb.BitRead(1); // vui_mvc_fixed_frame_rate_flag
}
bool nalflag = gb.BitRead(1); // vui_mvc_nal_hrd_parameters_present_flag
- if(nalflag) {
+ if (nalflag) {
HrdParameters(gb);
}
bool vclflag = gb.BitRead(1); // vui_mvc_vcl_hrd_parameters_present_flag
- if(vclflag) {
+ if (vclflag) {
HrdParameters(gb);
}
- if(nalflag || vclflag) {
+ if (nalflag || vclflag) {
gb.BitRead(1); // vui_mvc_low_delay_hrd_flag
}
gb.BitRead(1); // vui_mvc_pic_struct_present_flag
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp index 0ed7cfbad..7f23f45ea 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp @@ -36,7 +36,7 @@ using namespace MatroskaReader; CheckPointer(pMN0, E_POINTER); \
\
CAutoPtr<CMatroskaNode> pMN = pMN0->Child(); \
- if(!pMN) return S_FALSE; \
+ if (!pMN) return S_FALSE; \
\
do \
{ \
@@ -46,7 +46,7 @@ using namespace MatroskaReader; #define EndChunk \
} \
} \
- while(pMN->Next()); \
+ while (pMN->Next()); \
\
return S_OK; \
@@ -1286,38 +1286,38 @@ HRESULT CLength::Parse(CMatroskaNode* pMN) HRESULT CSignedLength::Parse(CMatroskaNode* pMN)
{
// HRESULT hr = __super::Parse(pMN);
-// if(FAILED(hr)) return hr;
+// if (FAILED(hr)) return hr;
m_val = 0;
BYTE b = 0;
HRESULT hr = pMN->Read(b);
- if(FAILED(hr)) return hr;
+ if (FAILED(hr)) return hr;
int nMoreBytes = 0;
- if((b&0x80) == 0x80) {m_val = b&0x7f; nMoreBytes = 0;}
- else if((b&0xc0) == 0x40) {m_val = b&0x3f; nMoreBytes = 1;}
- else if((b&0xe0) == 0x20) {m_val = b&0x1f; nMoreBytes = 2;}
- else if((b&0xf0) == 0x10) {m_val = b&0x0f; nMoreBytes = 3;}
- else if((b&0xf8) == 0x08) {m_val = b&0x07; nMoreBytes = 4;}
- else if((b&0xfc) == 0x04) {m_val = b&0x03; nMoreBytes = 5;}
- else if((b&0xfe) == 0x02) {m_val = b&0x01; nMoreBytes = 6;}
- else if((b&0xff) == 0x01) {m_val = b&0x00; nMoreBytes = 7;}
+ if ((b&0x80) == 0x80) {m_val = b&0x7f; nMoreBytes = 0;}
+ else if ((b&0xc0) == 0x40) {m_val = b&0x3f; nMoreBytes = 1;}
+ else if ((b&0xe0) == 0x20) {m_val = b&0x1f; nMoreBytes = 2;}
+ else if ((b&0xf0) == 0x10) {m_val = b&0x0f; nMoreBytes = 3;}
+ else if ((b&0xf8) == 0x08) {m_val = b&0x07; nMoreBytes = 4;}
+ else if ((b&0xfc) == 0x04) {m_val = b&0x03; nMoreBytes = 5;}
+ else if ((b&0xfe) == 0x02) {m_val = b&0x01; nMoreBytes = 6;}
+ else if ((b&0xff) == 0x01) {m_val = b&0x00; nMoreBytes = 7;}
else return E_FAIL;
//int nMoreBytesTmp = nMoreBytes;
MatroskaReader::QWORD UnknownSize = (1i64<<(7*(nMoreBytes+1)))-1;
- while(nMoreBytes-- > 0)
+ while (nMoreBytes-- > 0)
{
m_val <<= 8;
hr = pMN->Read(*(BYTE*)&m_val);
- if(FAILED(hr)) return hr;
+ if (FAILED(hr)) return hr;
}
- if(m_val == UnknownSize)
+ if (m_val == UnknownSize)
{
m_val = pMN->GetLength() - pMN->GetPos();
TRACE(_T("CLength: Unspecified chunk size at %I64d (corrected to %I64d)\n"), pMN->GetPos(), m_val);
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp index e3f59ec32..c0e02efdc 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp @@ -881,13 +881,13 @@ avcsuccess: /*
#ifdef _DEBUG
- for(int i = 1, j = GetChapterCount(CHAPTER_ROOT_ID); i <= j; i++)
+ for (int i = 1, j = GetChapterCount(CHAPTER_ROOT_ID); i <= j; i++)
{
UINT id = GetChapterId(CHAPTER_ROOT_ID, i);
struct ChapterElement ce;
BOOL b = GetChapterInfo(id, &ce);
BSTR bstr = GetChapterStringInfo(id, "eng", "");
- if(bstr) ::SysFreeString(bstr);
+ if (bstr) ::SysFreeString(bstr);
}
#endif
*/
@@ -1167,7 +1167,7 @@ void CMatroskaSplitterFilter::DemuxSeek(REFERENCE_TIME rt) bool fFoundKeyFrame = false;
/*
- if(pCueTrackPositions->CueBlockNumber > 0)
+ if (pCueTrackPositions->CueBlockNumber > 0)
{
// TODO: CueBlockNumber only tells the block num of the track and not for all mixed in the cluster
m_nLastBlock = (int)pCueTrackPositions->CueBlockNumber;
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp index 74c0ca814..fad7fefb1 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp @@ -1628,7 +1628,7 @@ HRESULT CMpegSplitterOutputPin::DeliverEndFlush() return __super::DeliverEndFlush();
}
-#define MOVE_TO_H264_START_CODE(b, e) while(b <= e-4 && !((*(DWORD *)b == 0x01000000) || ((*(DWORD *)b & 0x00FFFFFF) == 0x00010000))) b++; if((b <= e-4) && *(DWORD *)b == 0x01000000) b++;
+#define MOVE_TO_H264_START_CODE(b, e) while (b <= e-4 && !((*(DWORD *)b == 0x01000000) || ((*(DWORD *)b & 0x00FFFFFF) == 0x00010000))) b++; if ((b <= e-4) && *(DWORD *)b == 0x01000000) b++;
HRESULT CMpegSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p)
{
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.h b/src/filters/parser/MpegSplitter/MpegSplitter.h index 8fff51f6b..db1cd2e6f 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.h +++ b/src/filters/parser/MpegSplitter/MpegSplitter.h @@ -34,20 +34,20 @@ #define PauseGraph \
CComQIPtr<IMediaControl> _pMC(m_pGraph); \
OAFilterState _fs = -1; \
- if(_pMC) _pMC->GetState(1000, &_fs); \
- if(_fs == State_Running) \
+ if (_pMC) _pMC->GetState(1000, &_fs); \
+ if (_fs == State_Running) \
_pMC->Pause(); \
\
HRESULT _hr = E_FAIL; \
CComQIPtr<IMediaSeeking> _pMS((IUnknown*)(INonDelegatingUnknown*)m_pGraph); \
LONGLONG _rtNow = 0; \
- if(_pMS) _hr = _pMS->GetCurrentPosition(&_rtNow); \
+ if (_pMS) _hr = _pMS->GetCurrentPosition(&_rtNow); \
#define ResumeGraph \
- if(SUCCEEDED(_hr) && _pMS && _fs != State_Stopped) \
+ if (SUCCEEDED(_hr) && _pMS && _fs != State_Stopped) \
_hr = _pMS->SetPositions(&_rtNow, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); \
\
- if(_fs == State_Running && _pMS) \
+ if (_fs == State_Running && _pMS) \
_pMC->Run(); \
class __declspec(uuid("DC257063-045F-4BE2-BD5B-E12279C464F0"))
diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp index 58271dbfa..d56e555ef 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.cpp +++ b/src/filters/parser/OggSplitter/OggSplitter.cpp @@ -729,7 +729,7 @@ HRESULT COggSplitterOutputPin::UnpackPage(OggPage& page) p->TrackNumber = page.m_hdr.bitstream_serial_number;
if (S_OK == UnpackPacket(p, pData + i, j-i)) {
- //if(p->TrackNumber == 1)
+ //if (p->TrackNumber == 1)
//TRACE(_T("[%d]: %d, %I64d -> %I64d (skip=%d, disc=%d, sync=%d)\n"),
// (int)p->TrackNumber, p->GetCount(), p->rtStart, p->rtStop,
// (int)m_fSkip, (int)p->bDiscontinuity, (int)p->bSyncPoint);
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp index 1ce925aec..201717431 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp @@ -650,7 +650,7 @@ void CRealMediaSplitterFilter::DemuxSeek(REFERENCE_TIME rt) // search the closest keyframe to the seek time (commented out 'cause rm seems to index all of its keyframes...)
/*
- if(m_seekpos)
+ if (m_seekpos)
{
DataChunk* pdc = m_pFile->m_dcs.GetAt(m_seekpos);
@@ -659,21 +659,21 @@ void CRealMediaSplitterFilter::DemuxSeek(REFERENCE_TIME rt) REFERENCE_TIME seektime = -1;
UINT32 seekstream = -1;
- for(UINT32 i = m_seekpacket; i < pdc->nPackets; i++)
+ for (UINT32 i = m_seekpacket; i < pdc->nPackets; i++)
{
UINT64 filepos = m_pFile->GetPos();
MediaPacketHeader mph;
- if(S_OK != m_pFile->Read(mph, false))
+ if (S_OK != m_pFile->Read(mph, false))
break;
- if(seekstream == -1) seekstream = mph.stream;
- if(seekstream != mph.stream) continue;
+ if (seekstream == -1) seekstream = mph.stream;
+ if (seekstream != mph.stream) continue;
- if(seektime == 10000i64*mph.tStart) continue;
- if(rt < 10000i64*mph.tStart) break;
+ if (seektime == 10000i64*mph.tStart) continue;
+ if (rt < 10000i64*mph.tStart) break;
- if((mph.flags&MediaPacketHeader::PN_KEYFRAME_FLAG))
+ if ((mph.flags&MediaPacketHeader::PN_KEYFRAME_FLAG))
{
m_seekpacket = i;
m_seekfilepos = filepos;
@@ -2243,7 +2243,7 @@ HRESULT CRealAudioDecoder::Receive(IMediaSample* pIn) REFERENCE_TIME rtStart, rtStop;
pIn->GetTime(&rtStart, &rtStop);
/*
- if(pIn->IsPreroll() == S_OK || rtStart < 0)
+ if (pIn->IsPreroll() == S_OK || rtStart < 0)
return S_OK;
*/
diff --git a/src/filters/reader/UDPReader/UDPReader.cpp b/src/filters/reader/UDPReader/UDPReader.cpp index 7bbcc4dc6..b8aceda1f 100644 --- a/src/filters/reader/UDPReader/UDPReader.cpp +++ b/src/filters/reader/UDPReader/UDPReader.cpp @@ -196,7 +196,7 @@ bool CUDPStream::Load(const WCHAR* fnw) }
CStringW protocol = sl.RemoveHead();
- // if(protocol != L"udp") return false;
+ // if (protocol != L"udp") return false;
m_ip = CString(sl.RemoveHead()).TrimLeft('/');
diff --git a/src/filters/renderer/VideoRenderers/D3DFont.cpp b/src/filters/renderer/VideoRenderers/D3DFont.cpp index d7cc5c222..cb58b2e69 100644 --- a/src/filters/renderer/VideoRenderers/D3DFont.cpp +++ b/src/filters/renderer/VideoRenderers/D3DFont.cpp @@ -30,9 +30,9 @@ //-----------------------------------------------------------------------------
// Miscellaneous helper functions
//-----------------------------------------------------------------------------
-#define SAFE_DELETE(p) { if(p) { delete (p); (p)=NULL; } }
-#define SAFE_DELETE_ARRAY(p) { if(p) { delete[] (p); (p)=NULL; } }
-#define SAFE_RELEASE(p) { if(p) { (p)->Release(); (p)=NULL; } }
+#define SAFE_DELETE(p) { if (p) { delete (p); (p)=NULL; } }
+#define SAFE_DELETE_ARRAY(p) { if (p) { delete[] (p); (p)=NULL; } }
+#define SAFE_RELEASE(p) { if (p) { (p)->Release(); (p)=NULL; } }
//-----------------------------------------------------------------------------
// Custom vertex types for rendering text
diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp index 25cd6b9c0..4c4003a4b 100644 --- a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp @@ -1760,7 +1760,7 @@ STDMETHODIMP_(bool) CDX9AllocatorPresenter::Paint(bool fAll) fResetDevice = true;
}
- //if(hr == S_PRESENT_MODE_CHANGED)
+ //if (hr == S_PRESENT_MODE_CHANGED)
//{
// TRACE("Reset Device: D3D Device mode changed\n");
// fResetDevice = true;
diff --git a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp index d7ba3318c..6f9abbd24 100644 --- a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp +++ b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp @@ -800,12 +800,12 @@ HRESULT CDX9RenderingEngine::TextureResizeBicubic2pass(IDirect3DTexture9* pTextu HRESULT hr;
// rotated?
- if(dst[0].z != dst[1].z || dst[2].z != dst[3].z || dst[0].z != dst[3].z
+ if (dst[0].z != dst[1].z || dst[2].z != dst[3].z || dst[0].z != dst[3].z
|| dst[0].y != dst[1].y || dst[0].x != dst[2].x || dst[2].y != dst[3].y || dst[1].x != dst[3].x)
return TextureResizeBicubic1pass(pTexture, dst, srcRect);
D3DSURFACE_DESC desc;
- if(!pTexture || FAILED(pTexture->GetLevelDesc(0, &desc)))
+ if (!pTexture || FAILED(pTexture->GetLevelDesc(0, &desc)))
return E_FAIL;
float Tex0_Width = desc.Width;
@@ -823,7 +823,7 @@ HRESULT CDX9RenderingEngine::TextureResizeBicubic2pass(IDirect3DTexture9* pTextu CRect dst1(0, 0, (int)(dst[3].x - dst[0].x), (int)h);
- if(!m_pTemporaryScreenSpaceTextures[0] || FAILED(m_pTemporaryScreenSpaceTextures[0]->GetLevelDesc(0, &desc)))
+ if (!m_pTemporaryScreenSpaceTextures[0] || FAILED(m_pTemporaryScreenSpaceTextures[0]->GetLevelDesc(0, &desc)))
return TextureResizeBicubic1pass(pTexture, dst, srcRect);
float Tex1_Width = desc.Width;
@@ -856,8 +856,8 @@ HRESULT CDX9RenderingEngine::TextureResizeBicubic2pass(IDirect3DTexture9* pTextu // ASSERT(dst1.Height() == desc.Height);
- if(dst1.Width() > (int)desc.Width || dst1.Height() > (int)desc.Height)
- // if(dst1.Width() != desc.Width || dst1.Height() != desc.Height)
+ if (dst1.Width() > (int)desc.Width || dst1.Height() > (int)desc.Height)
+ // if (dst1.Width() != desc.Width || dst1.Height() != desc.Height)
return TextureResizeBicubic1pass(pTexture, dst, srcRect);
MYD3DVERTEX<1> vx[] =
@@ -1617,7 +1617,7 @@ HRESULT CDX9RenderingEngine::AlphaBlt(RECT* pSrc, RECT* pDst, IDirect3DTexture9* D3DCAPS9 d3dcaps9;
hr = m_pD3DDev->GetDeviceCaps(&d3dcaps9);
- if(d3dcaps9.AlphaCmpCaps & D3DPCMPCAPS_LESS)
+ if (d3dcaps9.AlphaCmpCaps & D3DPCMPCAPS_LESS)
{
hr = m_pD3DDev->SetRenderState(D3DRS_ALPHAREF, (DWORD)0x000000FE);
hr = m_pD3DDev->SetRenderState(D3DRS_ALPHATESTENABLE, TRUE);
diff --git a/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp index d16e0844b..4be94e482 100644 --- a/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/DXRAllocatorPresenter.cpp @@ -61,15 +61,15 @@ CDXRAllocatorPresenter::~CDXRAllocatorPresenter() STDMETHODIMP CDXRAllocatorPresenter::NonDelegatingQueryInterface(REFIID riid, void** ppv)
{
/*
- if(riid == __uuidof(IVideoWindow))
+ if (riid == __uuidof(IVideoWindow))
return GetInterface((IVideoWindow*)this, ppv);
- if(riid == __uuidof(IBasicVideo))
+ if (riid == __uuidof(IBasicVideo))
return GetInterface((IBasicVideo*)this, ppv);
- if(riid == __uuidof(IBasicVideo2))
+ if (riid == __uuidof(IBasicVideo2))
return GetInterface((IBasicVideo2*)this, ppv);
*/
/*
- if(riid == __uuidof(IVMRWindowlessControl))
+ if (riid == __uuidof(IVMRWindowlessControl))
return GetInterface((IVMRWindowlessControl*)this, ppv);
*/
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp index 86a34ea3e..b89d5b8db 100644 --- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp @@ -46,7 +46,7 @@ static const GUID GUID_SURFACE_INDEX = { 0x30c8e9f6, 0x415, 0x4b81, { 0xa3, 0x15 // === Helper functions
-#define CheckHR(exp) {if(FAILED(hr = exp)) return hr;}
+#define CheckHR(exp) {if (FAILED(hr = exp)) return hr;}
MFOffset MakeOffset(float v)
{
diff --git a/src/filters/renderer/VideoRenderers/IPinHook.cpp b/src/filters/renderer/VideoRenderers/IPinHook.cpp index 64b2f9fa9..aeb7b10ab 100644 --- a/src/filters/renderer/VideoRenderers/IPinHook.cpp +++ b/src/filters/renderer/VideoRenderers/IPinHook.cpp @@ -791,11 +791,11 @@ static HRESULT STDMETHODCALLTYPE GetCompBufferInfoMine(IAMVideoAcceleratorC * Th LOG(_T("hr = %08x"), hr);
- //if(pdwNumTypesCompBuffers)
+ //if (pdwNumTypesCompBuffers)
//{
// LOG(_T("[out] *pdwNumTypesCompBuffers = %d"), *pdwNumTypesCompBuffers);
- // if(pamvaUncompDataInfo)
+ // if (pamvaUncompDataInfo)
// {
// LOGUDI(_T("[out] pamvaUncompDataInfo"), pamvaUncompDataInfo, *pdwNumTypesCompBuffers);
// }
diff --git a/src/filters/renderer/VideoRenderers/OuterVMR.cpp b/src/filters/renderer/VideoRenderers/OuterVMR.cpp index 4c7c3b0c1..a5f5738cb 100644 --- a/src/filters/renderer/VideoRenderers/OuterVMR.cpp +++ b/src/filters/renderer/VideoRenderers/OuterVMR.cpp @@ -83,7 +83,7 @@ STDMETHODIMP COuterVMR9::GetSourcePosition(long* pLeft, long* pTop, long* pWidth return GetVideoSize(pWidth, pHeight);
}
/*
- if(CComQIPtr<IVMRWindowlessControl9> pWC9 = m_pVMR)
+ if (CComQIPtr<IVMRWindowlessControl9> pWC9 = m_pVMR)
{
CRect s, d;
HRESULT hr = pWC9->GetVideoPosition(&s, &d);
diff --git a/src/filters/renderer/VideoRenderers/OuterVMR.h b/src/filters/renderer/VideoRenderers/OuterVMR.h index 37cf3f262..8b71014d4 100644 --- a/src/filters/renderer/VideoRenderers/OuterVMR.h +++ b/src/filters/renderer/VideoRenderers/OuterVMR.h @@ -71,7 +71,7 @@ namespace DSObjects if (riid == __uuidof(IVMRffdshow9)) { // Support ffdshow queueing. We show ffdshow that this is patched Media Player Classic.
return GetInterface((IVMRffdshow9*)this, ppv);
}
- /* if(riid == __uuidof(IVMRWindowlessControl))
+ /* if (riid == __uuidof(IVMRWindowlessControl))
return GetInterface((IVMRWindowlessControl*)this, ppv);
*/
}
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp index 671713c39..69c18dd2a 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp @@ -1283,12 +1283,12 @@ HRESULT CBaseAP::TextureResizeBicubic2pass(IDirect3DTexture9* pTexture, Vector d /*HRESULT hr;
// rotated?
- if(dst[0].z != dst[1].z || dst[2].z != dst[3].z || dst[0].z != dst[3].z
+ if (dst[0].z != dst[1].z || dst[2].z != dst[3].z || dst[0].z != dst[3].z
|| dst[0].y != dst[1].y || dst[0].x != dst[2].x || dst[2].y != dst[3].y || dst[1].x != dst[3].x)
return TextureResizeBicubic1pass(pTexture, dst, SrcRect);
D3DSURFACE_DESC desc;
- if(!pTexture || FAILED(pTexture->GetLevelDesc(0, &desc)))
+ if (!pTexture || FAILED(pTexture->GetLevelDesc(0, &desc)))
return E_FAIL;
float Tex0_Width = desc.Width;
@@ -1301,7 +1301,7 @@ HRESULT CBaseAP::TextureResizeBicubic2pass(IDirect3DTexture9* pTexture, Vector d CRect dst1(0, 0, (int)(dst[3].x - dst[0].x), (int)h);
- if(!m_pScreenSizeTemporaryTexture[0] || FAILED(m_pScreenSizeTemporaryTexture[0]->GetLevelDesc(0, &desc)))
+ if (!m_pScreenSizeTemporaryTexture[0] || FAILED(m_pScreenSizeTemporaryTexture[0]->GetLevelDesc(0, &desc)))
return TextureResizeBicubic1pass(pTexture, dst, SrcRect);
float Tex1_Width = desc.Width;
@@ -1317,7 +1317,7 @@ HRESULT CBaseAP::TextureResizeBicubic2pass(IDirect3DTexture9* pTexture, Vector d float ty0_2 = 0;
float ty1_2 = h;
- if(dst1.Width() > (int)desc.Width || dst1.Height() > (int)desc.Height)
+ if (dst1.Width() > (int)desc.Width || dst1.Height() > (int)desc.Height)
return TextureResizeBicubic1pass(pTexture, dst, SrcRect);
MYD3DVERTEX<1> vx[] =
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.h b/src/filters/renderer/VideoRenderers/SyncRenderer.h index 65b64d431..337defcd9 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.h +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.h @@ -69,7 +69,7 @@ extern bool g_bExternalSubtitleTime; #define MAX_FIFO_SIZE 1024
-#define CheckHR(exp) {if(FAILED(hr = exp)) return hr;}
+#define CheckHR(exp) {if (FAILED(hr = exp)) return hr;}
// Guid to tag IMFSample with DirectX surface index
static const GUID GUID_SURFACE_INDEX = { 0x30c8e9f6, 0x415, 0x4b81, { 0xa3, 0x15, 0x1, 0xa, 0xc6, 0xa9, 0xda, 0x19 } };
diff --git a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp index 407f0a212..de77b1524 100644 --- a/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/madVRAllocatorPresenter.cpp @@ -70,15 +70,15 @@ CmadVRAllocatorPresenter::~CmadVRAllocatorPresenter() STDMETHODIMP CmadVRAllocatorPresenter::NonDelegatingQueryInterface(REFIID riid, void** ppv)
{
/*
- if(riid == __uuidof(IVideoWindow))
+ if (riid == __uuidof(IVideoWindow))
return GetInterface((IVideoWindow*)this, ppv);
- if(riid == __uuidof(IBasicVideo))
+ if (riid == __uuidof(IBasicVideo))
return GetInterface((IBasicVideo*)this, ppv);
- if(riid == __uuidof(IBasicVideo2))
+ if (riid == __uuidof(IBasicVideo2))
return GetInterface((IBasicVideo2*)this, ppv);
*/
/*
- if(riid == __uuidof(IVMRWindowlessControl))
+ if (riid == __uuidof(IVMRWindowlessControl))
return GetInterface((IVMRWindowlessControl*)this, ppv);
*/
diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp index 6b5471387..f2be74206 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp @@ -119,7 +119,7 @@ public: return FALSE;
}
/*
- if(!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
+ if (!AfxWinInit(::GetModuleHandle(NULL), NULL, ::GetCommandLine(), 0))
{
AfxMessageBox(_T("AfxWinInit failed!"));
return FALSE;
diff --git a/src/filters/source/SubtitleSource/SubtitleSource.cpp b/src/filters/source/SubtitleSource/SubtitleSource.cpp index 130e445fd..cc636362a 100644 --- a/src/filters/source/SubtitleSource/SubtitleSource.cpp +++ b/src/filters/source/SubtitleSource/SubtitleSource.cpp @@ -329,21 +329,21 @@ HRESULT CSubtitleStream::ChangeStart() OnThreadCreate();
/*
- if(m_mt.majortype == MEDIATYPE_Video && m_mt.subtype == MEDIASUBTYPE_ARGB32)
+ if (m_mt.majortype == MEDIATYPE_Video && m_mt.subtype == MEDIASUBTYPE_ARGB32)
{
m_nPosition = (int)(m_rtStart/10000)*1/1000;
}
- else if(m_mt.majortype == MEDIATYPE_Video && m_mt.subtype == MEDIASUBTYPE_RGB32)
+ else if (m_mt.majortype == MEDIATYPE_Video && m_mt.subtype == MEDIASUBTYPE_RGB32)
{
int m_nSegments = 0;
- if(!m_rts.SearchSubs((int)(m_rtStart/10000), 25, &m_nPosition, &m_nSegments))
+ if (!m_rts.SearchSubs((int)(m_rtStart/10000), 25, &m_nPosition, &m_nSegments))
m_nPosition = m_nSegments;
}
else
{
m_nPosition = m_rts.SearchSub((int)(m_rtStart/10000), 25);
- if(m_nPosition < 0) m_nPosition = 0;
- else if(m_rts[m_nPosition].end <= (int)(m_rtStart/10000)) m_nPosition++;
+ if (m_nPosition < 0) m_nPosition = 0;
+ else if (m_rts[m_nPosition].end <= (int)(m_rtStart/10000)) m_nPosition++;
}
*/
}
@@ -358,7 +358,7 @@ HRESULT CSubtitleStream::ChangeStop() /*
{
CAutoLock lock(CSourceSeeking::m_pLock);
- if(m_rtPosition < m_rtStop)
+ if (m_rtPosition < m_rtStop)
return S_OK;
}
*/
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp index 713d9c3d6..5bfcc754d 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp @@ -85,27 +85,27 @@ HRESULT GetPeer(CStreamSwitcherFilter* pFilter, T** ppT) #define CallPeerSeeking(call) \
CComPtr<IMediaSeeking> pMS; \
- if(FAILED(GetPeer(m_pFilter, &pMS))) return E_NOTIMPL; \
+ if (FAILED(GetPeer(m_pFilter, &pMS))) return E_NOTIMPL; \
return pMS->##call; \
#define CallPeer(call) \
CComPtr<IMediaPosition> pMP; \
- if(FAILED(GetPeer(m_pFilter, &pMP))) return E_NOTIMPL; \
+ if (FAILED(GetPeer(m_pFilter, &pMP))) return E_NOTIMPL; \
return pMP->##call; \
#define CallPeerSeekingAll(call) \
HRESULT hr = E_NOTIMPL; \
POSITION pos = m_pFilter->m_pInputs.GetHeadPosition(); \
- while(pos) \
+ while (pos) \
{ \
CBasePin* pPin = m_pFilter->m_pInputs.GetNext(pos); \
CComPtr<IPin> pConnected; \
- if(FAILED(pPin->ConnectedTo(&pConnected))) \
+ if (FAILED(pPin->ConnectedTo(&pConnected))) \
continue; \
- if(CComQIPtr<IMediaSeeking> pMS = pConnected) \
+ if (CComQIPtr<IMediaSeeking> pMS = pConnected) \
{ \
HRESULT hr2 = pMS->call; \
- if(pPin == m_pFilter->GetInputPin()) \
+ if (pPin == m_pFilter->GetInputPin()) \
hr = hr2; \
} \
} \
@@ -114,16 +114,16 @@ HRESULT GetPeer(CStreamSwitcherFilter* pFilter, T** ppT) #define CallPeerAll(call) \
HRESULT hr = E_NOTIMPL; \
POSITION pos = m_pFilter->m_pInputs.GetHeadPosition(); \
- while(pos) \
+ while (pos) \
{ \
CBasePin* pPin = m_pFilter->m_pInputs.GetNext(pos); \
CComPtr<IPin> pConnected; \
- if(FAILED(pPin->ConnectedTo(&pConnected))) \
+ if (FAILED(pPin->ConnectedTo(&pConnected))) \
continue; \
- if(CComQIPtr<IMediaPosition> pMP = pConnected) \
+ if (CComQIPtr<IMediaPosition> pMP = pConnected) \
{ \
HRESULT hr2 = pMP->call; \
- if(pPin == m_pFilter->GetInputPin()) \
+ if (pPin == m_pFilter->GetInputPin()) \
hr = hr2; \
} \
} \
@@ -848,7 +848,7 @@ STDMETHODIMP CStreamSwitcherInputPin::Receive(IMediaSample* pSample) m_SampleProps.dwSampleFlags |= AM_SAMPLE_TYPECHANGED/*|AM_SAMPLE_DATADISCONTINUITY|AM_SAMPLE_TIMEDISCONTINUITY*/;
/*
- if(CComQIPtr<IPinConnection> pPC = pOut->CurrentPinConnection())
+ if (CComQIPtr<IPinConnection> pPC = pOut->CurrentPinConnection())
{
HANDLE hEOS = CreateEvent(NULL, FALSE, FALSE, NULL);
hr = pPC->NotifyEndOfStream(hEOS);
@@ -907,7 +907,7 @@ STDMETHODIMP CStreamSwitcherInputPin::Receive(IMediaSample* pSample) hr = pOut->Deliver(pOutSample);
m_bSampleSkipped = FALSE;
/*
- if(FAILED(hr))
+ if (FAILED(hr))
{
ASSERT(0);
}
@@ -977,7 +977,7 @@ STDMETHODIMP CStreamSwitcherOutputPin::NonDelegatingQueryInterface(REFIID riid, return m_pStreamSwitcherPassThru->QueryInterface(riid, ppv);
}
/*
- else if(riid == IID_IStreamBuilder)
+ else if (riid == IID_IStreamBuilder)
{
return GetInterface((IStreamBuilder*)this, ppv);
}
@@ -1097,8 +1097,8 @@ HRESULT CStreamSwitcherOutputPin::GetMediaType(int iPosition, CMediaType* pmt) CopyMediaType(pmt, tmp);
DeleteMediaType(tmp);
/*
- if(iPosition < 0) return E_INVALIDARG;
- if(iPosition > 0) return VFW_S_NO_MORE_ITEMS;
+ if (iPosition < 0) return E_INVALIDARG;
+ if (iPosition > 0) return VFW_S_NO_MORE_ITEMS;
CopyMediaType(pmt, &pIn->CurrentMediaType());
*/
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.h b/src/filters/switcher/AudioSwitcher/StreamSwitcher.h index 7dc918741..21e126152 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.h +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.h @@ -29,20 +29,20 @@ #define PauseGraph \
CComQIPtr<IMediaControl> _pMC(m_pGraph); \
OAFilterState _fs = -1; \
- if(_pMC) _pMC->GetState(1000, &_fs); \
- if(_fs == State_Running) \
+ if (_pMC) _pMC->GetState(1000, &_fs); \
+ if (_fs == State_Running) \
_pMC->Pause(); \
\
HRESULT _hr = E_FAIL; \
CComQIPtr<IMediaSeeking> _pMS((IUnknown*)(INonDelegatingUnknown*)m_pGraph); \
LONGLONG _rtNow = 0; \
- if(_pMS) _hr = _pMS->GetCurrentPosition(&_rtNow); \
+ if (_pMS) _hr = _pMS->GetCurrentPosition(&_rtNow); \
#define ResumeGraph \
- if(SUCCEEDED(_hr) && _pMS && _fs != State_Stopped) \
+ if (SUCCEEDED(_hr) && _pMS && _fs != State_Stopped) \
_hr = _pMS->SetPositions(&_rtNow, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); \
\
- if(_fs == State_Running && _pMS) \
+ if (_fs == State_Running && _pMS) \
_pMC->Run(); \
class CStreamSwitcherFilter;
diff --git a/src/filters/transform/BufferFilter/BufferFilter.cpp b/src/filters/transform/BufferFilter/BufferFilter.cpp index db94ed476..ec2526e5b 100644 --- a/src/filters/transform/BufferFilter/BufferFilter.cpp +++ b/src/filters/transform/BufferFilter/BufferFilter.cpp @@ -352,7 +352,7 @@ HRESULT CBufferFilterOutputPin::Deliver(IMediaSample* pMediaSample) }
#define CallQueue(call) \
- if(!m_pOutputQueue) return NOERROR; \
+ if (!m_pOutputQueue) return NOERROR; \
m_pOutputQueue->##call; \
return NOERROR; \
diff --git a/src/filters/transform/MPCVideoDec/CpuId.cpp b/src/filters/transform/MPCVideoDec/CpuId.cpp index 90ace59de..7f58bd94b 100644 --- a/src/filters/transform/MPCVideoDec/CpuId.cpp +++ b/src/filters/transform/MPCVideoDec/CpuId.cpp @@ -108,7 +108,7 @@ CCpuId::CCpuId(void) //if (nBuff[2] & CPUID_EST) strcat(szFeatures, "EST ");
}
- //if(nBuff[3] & CPUID_HTT)
+ //if (nBuff[3] & CPUID_HTT)
// strcat(szFeatures, "HTT ");
}
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index 6eee0f2fd..449424798 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -1426,7 +1426,7 @@ static void decodeps2adpcm(ps2_state_t& s, int channel, BYTE* pin, double* pout) ASSERT(0);
return;
}
- // if(unk == 7) {ASSERT(0); return;} // ???
+ // if (unk == 7) {ASSERT(0); return;} // ???
static double s_tbl[] = {
0.0, 0.0, 0.9375, 0.0, 1.796875, -0.8125, 1.53125, -0.859375, 1.90625, -0.9375,
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp index 42d7f5076..974463017 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp @@ -204,8 +204,8 @@ CMpeg2DecFilter::CMpeg2DecFilter(LPUNKNOWN lpunk, HRESULT* phr) }
// m_pOutput = DNew CMpeg2DecOutputPin(this, phr, L"Output");
- // if(!m_pOutput) *phr = E_OUTOFMEMORY;
- // if(FAILED(*phr)) return;
+ // if (!m_pOutput) *phr = E_OUTOFMEMORY;
+ // if (FAILED(*phr)) return;
m_pSubpicInput = DNew CSubpicInputPin(this, phr);
if (!m_pSubpicInput) {
@@ -1371,7 +1371,7 @@ STDMETHODIMP CMpeg2DecInputPin::Set(REFGUID PropSet, ULONG Id, LPVOID pInstanceD return E_PROP_ID_UNSUPPORTED;
}
/*
- if(PropSet == AM_KSPROPSETID_DVD_RateChange)
+ if (PropSet == AM_KSPROPSETID_DVD_RateChange)
switch(Id)
{
case AM_RATE_ChangeRate:
@@ -1423,7 +1423,7 @@ STDMETHODIMP CMpeg2DecInputPin::Get(REFGUID PropSet, ULONG Id, LPVOID pInstanceD return E_PROP_ID_UNSUPPORTED;
}
/*
- if(PropSet == AM_KSPROPSETID_DVD_RateChange)
+ if (PropSet == AM_KSPROPSETID_DVD_RateChange)
switch(Id)
{
case AM_RATE_FullDataRateMax:
@@ -1483,7 +1483,7 @@ STDMETHODIMP CMpeg2DecInputPin::QuerySupported(REFGUID PropSet, ULONG Id, ULONG* return E_PROP_ID_UNSUPPORTED;
}
/*
- if(PropSet == AM_KSPROPSETID_DVD_RateChange)
+ if (PropSet == AM_KSPROPSETID_DVD_RateChange)
switch(Id)
{
case AM_RATE_ChangeRate:
@@ -1557,7 +1557,7 @@ HRESULT CMpeg2DecOutputPin::Deliver(IMediaSample* pMediaSample) }
#define CallQueue(call) \
- if(!m_pOutputQueue) return NOERROR; \
+ if (!m_pOutputQueue) return NOERROR; \
m_pOutputQueue->##call; \
return NOERROR; \
diff --git a/src/filters/transform/VSFilter/plugins.cpp b/src/filters/transform/VSFilter/plugins.cpp index 2cc49ced7..ca2464c80 100644 --- a/src/filters/transform/VSFilter/plugins.cpp +++ b/src/filters/transform/VSFilter/plugins.cpp @@ -151,7 +151,7 @@ namespace Plugin handles.Add(h);
}
}
- } else { // if(WAIT_ABANDONED_0 == i || WAIT_FAILED == i)
+ } else { // if (WAIT_ABANDONED_0 == i || WAIT_FAILED == i)
break;
}
}
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index f76c03a04..8d05743c9 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -3094,7 +3094,7 @@ void CMainFrame::OnInitMenu(CMenu* pMenu) if (itemID == ID_FAVORITES) {
SetupFavoritesSubMenu();
pSubMenu = &m_favorites;
- }/*else if(itemID == ID_RECENT_FILES) {
+ }/*else if (itemID == ID_RECENT_FILES) {
SetupRecentFilesSubMenu();
pSubMenu = &m_recentfiles;
}*/
diff --git a/src/mpc-hc/mplayerc.cpp b/src/mpc-hc/mplayerc.cpp index c57bee906..eab69b046 100644 --- a/src/mpc-hc/mplayerc.cpp +++ b/src/mpc-hc/mplayerc.cpp @@ -1949,7 +1949,7 @@ void CMPlayerCApp::UpdateColorControlRange(bool isEVR) m_ColorControl[0].DefaultValue = (int)floor(m_VMR9ColorControl[0].DefaultValue+0.5);
m_ColorControl[0].StepSize = max(1,(int)(m_VMR9ColorControl[0].StepSize+0.5));
// Contrast
- //if(m_VMR9ColorControl[1].MinValue == 0.0999908447265625) m_VMR9ColorControl[1].MinValue = 0.11; //fix nvidia bug
+ //if (m_VMR9ColorControl[1].MinValue == 0.0999908447265625) m_VMR9ColorControl[1].MinValue = 0.11; //fix nvidia bug
if (*(int*)&m_VMR9ColorControl[1].MinValue == 1036830720) m_VMR9ColorControl[1].MinValue = 0.11f; //fix nvidia bug
m_ColorControl[1].MinValue = (int)floor(m_VMR9ColorControl[1].MinValue*100+0.5) - 100;
m_ColorControl[1].MaxValue = (int)floor(m_VMR9ColorControl[1].MaxValue*100+0.5) - 100;
|