1 files changed, 220 insertions, 228 deletions
diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
index a75457d82..e4d902bac 100644
--- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
+++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp
@@ -1,4 +1,4 @@
-/* 
+/*
  *  Copyright (C) 2003-2006 Gabest
  *  http://www.gabest.org
  *
@@ -6,12 +6,12 @@
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2, or (at your option)
  *  any later version.
- *   
+ *
  *  This Program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *  GNU General Public License for more details.
- *   
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with GNU Make; see the file COPYING.  If not, write to
  *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
@@ -33,19 +33,30 @@
 //
 bool f_need_set_aspect;
 
-CBaseVideoFilter::CBaseVideoFilter(TCHAR* pName, LPUNKNOWN lpunk, HRESULT* phr, REFCLSID clsid, long cBuffers) 
+CBaseVideoFilter::CBaseVideoFilter(TCHAR* pName, LPUNKNOWN lpunk, HRESULT* phr, REFCLSID clsid, long cBuffers)
 	: CTransformFilter(pName, lpunk, clsid)
 	, m_cBuffers(cBuffers)
 {
-	if(phr) *phr = S_OK;
+	if(phr) {
+		*phr = S_OK;
+	}
 
 	m_pInput = DNew CBaseVideoInputPin(NAME("CBaseVideoInputPin"), this, phr, L"Video");
-	if(!m_pInput) *phr = E_OUTOFMEMORY;
-	if(FAILED(*phr)) return;
+	if(!m_pInput) {
+		*phr = E_OUTOFMEMORY;
+	}
+	if(FAILED(*phr)) {
+		return;
+	}
 
 	m_pOutput = DNew CBaseVideoOutputPin(NAME("CBaseVideoOutputPin"), this, phr, L"Output");
-	if(!m_pOutput) *phr = E_OUTOFMEMORY;
-	if(FAILED(*phr))  {delete m_pInput, m_pInput = NULL; return;}
+	if(!m_pOutput) {
+		*phr = E_OUTOFMEMORY;
+	}
+	if(FAILED(*phr))  {
+		delete m_pInput, m_pInput = NULL;
+		return;
+	}
 
 	m_wout = m_win = m_w = 0;
 	m_hout = m_hin = m_h = 0;
@@ -73,10 +84,11 @@ int CBaseVideoFilter::GetPinCount()
 
 CBasePin* CBaseVideoFilter::GetPin(int n)
 {
-	switch(n)
-	{
-	case 0: return m_pInput;
-	case 1: return m_pOutput;
+	switch(n) {
+		case 0:
+			return m_pInput;
+		case 1:
+			return m_pOutput;
 	}
 	return NULL;
 }
@@ -92,20 +104,21 @@ HRESULT CBaseVideoFilter::Receive(IMediaSample* pIn)
 
 	HRESULT hr;
 
-    AM_SAMPLE2_PROPERTIES* const pProps = m_pInput->SampleProps();
-    if(pProps->dwStreamId != AM_STREAM_MEDIA)
+	AM_SAMPLE2_PROPERTIES* const pProps = m_pInput->SampleProps();
+	if(pProps->dwStreamId != AM_STREAM_MEDIA) {
 		return m_pOutput->Deliver(pIn);
+	}
 
 	AM_MEDIA_TYPE* pmt;
-	if(SUCCEEDED(pIn->GetMediaType(&pmt)) && pmt)
-	{
+	if(SUCCEEDED(pIn->GetMediaType(&pmt)) && pmt) {
 		CMediaType mt(*pmt);
 		m_pInput->SetMediaType(&mt);
 		DeleteMediaType(pmt);
 	}
 
-	if(FAILED(hr = Transform(pIn)))
+	if(FAILED(hr = Transform(pIn))) {
 		return hr;
+	}
 
 	return S_OK;
 }
@@ -116,15 +129,16 @@ HRESULT CBaseVideoFilter::GetDeliveryBuffer(int w, int h, IMediaSample** ppOut)
 
 	HRESULT hr;
 
-	if(FAILED(hr = ReconnectOutput(w, h)))
+	if(FAILED(hr = ReconnectOutput(w, h))) {
 		return hr;
+	}
 
-	if(FAILED(hr = m_pOutput->GetDeliveryBuffer(ppOut, NULL, NULL, 0)))
+	if(FAILED(hr = m_pOutput->GetDeliveryBuffer(ppOut, NULL, NULL, 0))) {
 		return hr;
+	}
 
 	AM_MEDIA_TYPE* pmt;
-	if(SUCCEEDED((*ppOut)->GetMediaType(&pmt)) && pmt)
-	{
+	if(SUCCEEDED((*ppOut)->GetMediaType(&pmt)) && pmt) {
 		CMediaType mt = *pmt;
 		m_pOutput->SetMediaType(&mt);
 		DeleteMediaType(pmt);
@@ -135,8 +149,9 @@ HRESULT CBaseVideoFilter::GetDeliveryBuffer(int w, int h, IMediaSample** ppOut)
 
 	// FIXME: hell knows why but without this the overlay mixer starts very skippy
 	// (don't enable this for other renderers, the old for example will go crazy if you do)
-	if(GetCLSID(m_pOutput->GetConnected()) == CLSID_OverlayMixer)
+	if(GetCLSID(m_pOutput->GetConnected()) == CLSID_OverlayMixer) {
 		(*ppOut)->SetDiscontinuity(TRUE);
+	}
 
 	return S_OK;
 }
@@ -146,12 +161,10 @@ HRESULT CBaseVideoFilter::ReconnectOutput(int w, int h, bool bSendSample, int re
 	CMediaType& mt = m_pOutput->CurrentMediaType();
 
 	bool m_update_aspect = false;
-	if(f_need_set_aspect)
-	{
+	if(f_need_set_aspect) {
 		int wout = 0, hout = 0, arxout = 0, aryout = 0;
 		ExtractDim(&mt, wout, hout, arxout, aryout);
-		if(arxout != m_arx || aryout != m_ary)
-		{
+		if(arxout != m_arx || aryout != m_ary) {
 			CString debug_s;
 			debug_s.Format(_T("\nCBaseVideoFilter::ReconnectOutput; wout = %d, hout = %d, current = %dx%d, set = %dx%d\n"), wout, hout, arxout, aryout, m_arx, m_ary);
 			TRACE(debug_s);
@@ -163,8 +176,7 @@ HRESULT CBaseVideoFilter::ReconnectOutput(int w, int h, bool bSendSample, int re
 	int h_org = m_h;
 
 	bool fForceReconnection = false;
-	if(w != m_w || h != m_h)
-	{
+	if(w != m_w || h != m_h) {
 		fForceReconnection = true;
 		m_w = w;
 		m_h = h;
@@ -172,52 +184,39 @@ HRESULT CBaseVideoFilter::ReconnectOutput(int w, int h, bool bSendSample, int re
 
 	HRESULT hr = S_OK;
 
-	if(m_update_aspect || fForceReconnection || m_w != m_wout || m_h != m_hout || m_arx != m_arxout || m_ary != m_aryout)
-	{
-		if(GetCLSID(m_pOutput->GetConnected()) == CLSID_VideoRenderer)
-		{
+	if(m_update_aspect || fForceReconnection || m_w != m_wout || m_h != m_hout || m_arx != m_arxout || m_ary != m_aryout) {
+		if(GetCLSID(m_pOutput->GetConnected()) == CLSID_VideoRenderer) {
 			NotifyEvent(EC_ERRORABORT, 0, 0);
 			return E_FAIL;
 		}
 
 		BITMAPINFOHEADER* bmi = NULL;
 
-		if(mt.formattype == FORMAT_VideoInfo)
-		{
+		if(mt.formattype == FORMAT_VideoInfo) {
 			VIDEOINFOHEADER* vih = (VIDEOINFOHEADER*)mt.Format();
-			if (realWidth != -1 && realHeight != -1)
-			{
+			if (realWidth != -1 && realHeight != -1) {
 				SetRect(&vih->rcSource, 0, 0, realWidth, realHeight);
 				SetRect(&vih->rcTarget, 0, 0, realWidth, realHeight);
-			}
-			else
-			{
+			} else {
 				SetRect(&vih->rcSource, 0, 0, m_w, m_h);
 				SetRect(&vih->rcTarget, 0, 0, m_w, m_h);
 			}
 			bmi = &vih->bmiHeader;
 			bmi->biXPelsPerMeter = m_w * m_ary;
 			bmi->biYPelsPerMeter = m_h * m_arx;
-		}
-		else if(mt.formattype == FORMAT_VideoInfo2)
-		{
+		} else if(mt.formattype == FORMAT_VideoInfo2) {
 			VIDEOINFOHEADER2* vih = (VIDEOINFOHEADER2*)mt.Format();
-			if (realWidth != -1 && realHeight != -1)
-			{
+			if (realWidth != -1 && realHeight != -1) {
 				SetRect(&vih->rcSource, 0, 0, realWidth, realHeight);
 				SetRect(&vih->rcTarget, 0, 0, realWidth, realHeight);
-			}
-			else
-			{
+			} else {
 				SetRect(&vih->rcSource, 0, 0, m_w, m_h);
 				SetRect(&vih->rcTarget, 0, 0, m_w, m_h);
 			}
 			bmi = &vih->bmiHeader;
 			vih->dwPictAspectRatioX = m_arx;
 			vih->dwPictAspectRatioY = m_ary;
-		}
-		else 
-		{
+		} else {
 			return E_FAIL;	//should never be here? prevent null pointer refs for bmi
 		}
 
@@ -229,27 +228,19 @@ HRESULT CBaseVideoFilter::ReconnectOutput(int w, int h, bool bSendSample, int re
 		ASSERT(SUCCEEDED(hr)); // should better not fail, after all "mt" is the current media type, just with a different resolution
 		HRESULT hr1 = 0, hr2 = 0;
 		CComPtr<IMediaSample> pOut;
-		if(SUCCEEDED(hr1 = m_pOutput->GetConnected()->ReceiveConnection(m_pOutput, &mt)))
-		{
-			if (bSendSample)
-			{
-				if (SUCCEEDED(hr2 = m_pOutput->GetDeliveryBuffer(&pOut, NULL, NULL, 0)))
-				{
+		if(SUCCEEDED(hr1 = m_pOutput->GetConnected()->ReceiveConnection(m_pOutput, &mt))) {
+			if (bSendSample) {
+				if (SUCCEEDED(hr2 = m_pOutput->GetDeliveryBuffer(&pOut, NULL, NULL, 0))) {
 					AM_MEDIA_TYPE* pmt;
-					if(SUCCEEDED(pOut->GetMediaType(&pmt)) && pmt)
-					{
+					if(SUCCEEDED(pOut->GetMediaType(&pmt)) && pmt) {
 						CMediaType mt = *pmt;
 						m_pOutput->SetMediaType(&mt);
 						DeleteMediaType(pmt);
-					}
-					else // stupid overlay mixer won't let us know the new pitch...
-					{
+					} else { // stupid overlay mixer won't let us know the new pitch...
 						long size = pOut->GetSize();
 						bmi->biWidth = size / bmi->biHeight * 8 / bmi->biBitCount;
 					}
-				}
-				else
-				{
+				} else {
 					m_w = w_org;
 					m_h = h_org;
 					return E_FAIL;
@@ -285,20 +276,19 @@ HRESULT CBaseVideoFilter::CopyBuffer(BYTE* pOut, BYTE** ppIn, int w, int h, int
 
 	int pitchOut = 0;
 
-	if(bihOut.biCompression == BI_RGB || bihOut.biCompression == BI_BITFIELDS)
-	{
+	if(bihOut.biCompression == BI_RGB || bihOut.biCompression == BI_BITFIELDS) {
 		pitchOut = bihOut.biWidth*bihOut.biBitCount>>3;
 
-		if(bihOut.biHeight > 0)
-		{
+		if(bihOut.biHeight > 0) {
 			pOut += pitchOut*(h-1);
 			pitchOut = -pitchOut;
-			if(h < 0) h = -h;
+			if(h < 0) {
+				h = -h;
+			}
 		}
 	}
 
-	if(h < 0)
-	{
+	if(h < 0) {
 		h = -h;
 		ppIn[0] += pitchIn*(h-1);
 		ppIn[1] += (pitchIn>>1)*((h>>1)-1);
@@ -306,79 +296,70 @@ HRESULT CBaseVideoFilter::CopyBuffer(BYTE* pOut, BYTE** ppIn, int w, int h, int
 		pitchIn = -pitchIn;
 	}
 
-	if(subtype == MEDIASUBTYPE_I420 || subtype == MEDIASUBTYPE_IYUV || subtype == MEDIASUBTYPE_YV12)
-	{
+	if(subtype == MEDIASUBTYPE_I420 || subtype == MEDIASUBTYPE_IYUV || subtype == MEDIASUBTYPE_YV12) {
 		BYTE* pIn = ppIn[0];
 		BYTE* pInU = ppIn[1];
 		BYTE* pInV = ppIn[2];
 
-		if(subtype == MEDIASUBTYPE_YV12) {BYTE* tmp = pInU; pInU = pInV; pInV = tmp;}
+		if(subtype == MEDIASUBTYPE_YV12) {
+			BYTE* tmp = pInU;
+			pInU = pInV;
+			pInV = tmp;
+		}
 
 		BYTE* pOutU = pOut + bihOut.biWidth*h;
 		BYTE* pOutV = pOut + bihOut.biWidth*h*5/4;
 
-		if(bihOut.biCompression == '21VY') {BYTE* tmp = pOutU; pOutU = pOutV; pOutV = tmp;}
+		if(bihOut.biCompression == '21VY') {
+			BYTE* tmp = pOutU;
+			pOutU = pOutV;
+			pOutV = tmp;
+		}
 
 		ASSERT(w <= abs(pitchIn));
 
-		if(bihOut.biCompression == '2YUY')
-		{
-			if (!fInterlaced)
+		if(bihOut.biCompression == '2YUY') {
+			if (!fInterlaced) {
 				BitBltFromI420ToYUY2(w, h, pOut, bihOut.biWidth*2, pIn, pInU, pInV, pitchIn);
-			else
+			} else {
 				BitBltFromI420ToYUY2Interlaced(w, h, pOut, bihOut.biWidth*2, pIn, pInU, pInV, pitchIn);
-		}
-		else if(bihOut.biCompression == '024I' || bihOut.biCompression == 'VUYI' || bihOut.biCompression == '21VY')
-		{
+			}
+		} else if(bihOut.biCompression == '024I' || bihOut.biCompression == 'VUYI' || bihOut.biCompression == '21VY') {
 			BitBltFromI420ToI420(w, h, pOut, pOutU, pOutV, bihOut.biWidth, pIn, pInU, pInV, pitchIn);
-		}
-		else if(bihOut.biCompression == BI_RGB || bihOut.biCompression == BI_BITFIELDS)
-		{
-			if(!BitBltFromI420ToRGB(w, h, pOut, pitchOut, bihOut.biBitCount, pIn, pInU, pInV, pitchIn))
-			{
-				for(DWORD y = 0; y < h; y++, pOut += pitchOut)
+		} else if(bihOut.biCompression == BI_RGB || bihOut.biCompression == BI_BITFIELDS) {
+			if(!BitBltFromI420ToRGB(w, h, pOut, pitchOut, bihOut.biBitCount, pIn, pInU, pInV, pitchIn)) {
+				for(DWORD y = 0; y < h; y++, pOut += pitchOut) {
 					memset(pOut, 0, pitchOut);
+				}
 			}
 		}
-	}
-	else if(subtype == MEDIASUBTYPE_YUY2)
-	{
-		if(bihOut.biCompression == '2YUY')
-		{
+	} else if(subtype == MEDIASUBTYPE_YUY2) {
+		if(bihOut.biCompression == '2YUY') {
 			BitBltFromYUY2ToYUY2(w, h, pOut, bihOut.biWidth*2, ppIn[0], pitchIn);
-		}
-		else if(bihOut.biCompression == BI_RGB || bihOut.biCompression == BI_BITFIELDS)
-		{
-			if(!BitBltFromYUY2ToRGB(w, h, pOut, pitchOut, bihOut.biBitCount, ppIn[0], pitchIn))
-			{
-				for(DWORD y = 0; y < h; y++, pOut += pitchOut)
+		} else if(bihOut.biCompression == BI_RGB || bihOut.biCompression == BI_BITFIELDS) {
+			if(!BitBltFromYUY2ToRGB(w, h, pOut, pitchOut, bihOut.biBitCount, ppIn[0], pitchIn)) {
+				for(DWORD y = 0; y < h; y++, pOut += pitchOut) {
 					memset(pOut, 0, pitchOut);
+				}
 			}
 		}
-	}
-	else if(subtype == MEDIASUBTYPE_ARGB32 || subtype == MEDIASUBTYPE_RGB32 || subtype == MEDIASUBTYPE_RGB24 || subtype == MEDIASUBTYPE_RGB565)
-	{
-		int sbpp = 
+	} else if(subtype == MEDIASUBTYPE_ARGB32 || subtype == MEDIASUBTYPE_RGB32 || subtype == MEDIASUBTYPE_RGB24 || subtype == MEDIASUBTYPE_RGB565) {
+		int sbpp =
 			subtype == MEDIASUBTYPE_ARGB32 || subtype == MEDIASUBTYPE_RGB32 ? 32 :
 			subtype == MEDIASUBTYPE_RGB24 ? 24 :
 			subtype == MEDIASUBTYPE_RGB565 ? 16 : 0;
 
-		if(bihOut.biCompression == '2YUY')
-		{
+		if(bihOut.biCompression == '2YUY') {
 			// TODO
 			// BitBltFromRGBToYUY2();
-		}
-		else if(bihOut.biCompression == BI_RGB || bihOut.biCompression == BI_BITFIELDS)
-		{
-			if(!BitBltFromRGBToRGB(w, h, pOut, pitchOut, bihOut.biBitCount, ppIn[0], pitchIn, sbpp))
-			{
-				for(DWORD y = 0; y < h; y++, pOut += pitchOut)
+		} else if(bihOut.biCompression == BI_RGB || bihOut.biCompression == BI_BITFIELDS) {
+			if(!BitBltFromRGBToRGB(w, h, pOut, pitchOut, bihOut.biBitCount, ppIn[0], pitchIn, sbpp)) {
+				for(DWORD y = 0; y < h; y++, pOut += pitchOut) {
 					memset(pOut, 0, pitchOut);
+				}
 			}
 		}
-	}
-	else
-	{
+	} else {
 		return VFW_E_TYPE_NOT_ACCEPTED;
 	}
 
@@ -390,63 +371,62 @@ HRESULT CBaseVideoFilter::CheckInputType(const CMediaType* mtIn)
 	BITMAPINFOHEADER bih;
 	ExtractBIH(mtIn, &bih);
 
-	return mtIn->majortype == MEDIATYPE_Video 
-		&& (mtIn->subtype == MEDIASUBTYPE_YV12 
-		 || mtIn->subtype == MEDIASUBTYPE_I420 
-		 || mtIn->subtype == MEDIASUBTYPE_IYUV
-		 || mtIn->subtype == MEDIASUBTYPE_YUY2
-		 || mtIn->subtype == MEDIASUBTYPE_ARGB32
-		 || mtIn->subtype == MEDIASUBTYPE_RGB32
-		 || mtIn->subtype == MEDIASUBTYPE_RGB24
- 		 || mtIn->subtype == MEDIASUBTYPE_RGB565)
-		&& (mtIn->formattype == FORMAT_VideoInfo 
-		 || mtIn->formattype == FORMAT_VideoInfo2)
-		&& bih.biHeight > 0
-		? S_OK
-		: VFW_E_TYPE_NOT_ACCEPTED;
+	return mtIn->majortype == MEDIATYPE_Video
+		   && (mtIn->subtype == MEDIASUBTYPE_YV12
+			   || mtIn->subtype == MEDIASUBTYPE_I420
+			   || mtIn->subtype == MEDIASUBTYPE_IYUV
+			   || mtIn->subtype == MEDIASUBTYPE_YUY2
+			   || mtIn->subtype == MEDIASUBTYPE_ARGB32
+			   || mtIn->subtype == MEDIASUBTYPE_RGB32
+			   || mtIn->subtype == MEDIASUBTYPE_RGB24
+			   || mtIn->subtype == MEDIASUBTYPE_RGB565)
+		   && (mtIn->formattype == FORMAT_VideoInfo
+			   || mtIn->formattype == FORMAT_VideoInfo2)
+		   && bih.biHeight > 0
+		   ? S_OK
+		   : VFW_E_TYPE_NOT_ACCEPTED;
 }
 
 HRESULT CBaseVideoFilter::CheckTransform(const CMediaType* mtIn, const CMediaType* mtOut)
 {
-	if(FAILED(CheckInputType(mtIn)) || mtOut->majortype != MEDIATYPE_Video)
+	if(FAILED(CheckInputType(mtIn)) || mtOut->majortype != MEDIATYPE_Video) {
 		return VFW_E_TYPE_NOT_ACCEPTED;
+	}
 
-	if(mtIn->majortype == MEDIATYPE_Video 
-	&& (mtIn->subtype == MEDIASUBTYPE_YV12 
-	 || mtIn->subtype == MEDIASUBTYPE_I420 
-	 || mtIn->subtype == MEDIASUBTYPE_IYUV))
-	{
+	if(mtIn->majortype == MEDIATYPE_Video
+			&& (mtIn->subtype == MEDIASUBTYPE_YV12
+				|| mtIn->subtype == MEDIASUBTYPE_I420
+				|| mtIn->subtype == MEDIASUBTYPE_IYUV)) {
 		if(mtOut->subtype != MEDIASUBTYPE_YV12
-		&& mtOut->subtype != MEDIASUBTYPE_I420
-		&& mtOut->subtype != MEDIASUBTYPE_IYUV
-		&& mtOut->subtype != MEDIASUBTYPE_YUY2
-		&& mtOut->subtype != MEDIASUBTYPE_ARGB32
-		&& mtOut->subtype != MEDIASUBTYPE_RGB32
-		&& mtOut->subtype != MEDIASUBTYPE_RGB24
-		&& mtOut->subtype != MEDIASUBTYPE_RGB565)
+				&& mtOut->subtype != MEDIASUBTYPE_I420
+				&& mtOut->subtype != MEDIASUBTYPE_IYUV
+				&& mtOut->subtype != MEDIASUBTYPE_YUY2
+				&& mtOut->subtype != MEDIASUBTYPE_ARGB32
+				&& mtOut->subtype != MEDIASUBTYPE_RGB32
+				&& mtOut->subtype != MEDIASUBTYPE_RGB24
+				&& mtOut->subtype != MEDIASUBTYPE_RGB565) {
 			return VFW_E_TYPE_NOT_ACCEPTED;
-	}
-	else if(mtIn->majortype == MEDIATYPE_Video 
-	&& (mtIn->subtype == MEDIASUBTYPE_YUY2))
-	{
+		}
+	} else if(mtIn->majortype == MEDIATYPE_Video
+			  && (mtIn->subtype == MEDIASUBTYPE_YUY2)) {
 		if(mtOut->subtype != MEDIASUBTYPE_YUY2
-		&& mtOut->subtype != MEDIASUBTYPE_ARGB32
-		&& mtOut->subtype != MEDIASUBTYPE_RGB32
-		&& mtOut->subtype != MEDIASUBTYPE_RGB24
-		&& mtOut->subtype != MEDIASUBTYPE_RGB565)
+				&& mtOut->subtype != MEDIASUBTYPE_ARGB32
+				&& mtOut->subtype != MEDIASUBTYPE_RGB32
+				&& mtOut->subtype != MEDIASUBTYPE_RGB24
+				&& mtOut->subtype != MEDIASUBTYPE_RGB565) {
 			return VFW_E_TYPE_NOT_ACCEPTED;
-	}
-	else if(mtIn->majortype == MEDIATYPE_Video 
-	&& (mtIn->subtype == MEDIASUBTYPE_ARGB32
-	|| mtIn->subtype == MEDIASUBTYPE_RGB32
-	|| mtIn->subtype == MEDIASUBTYPE_RGB24
-	|| mtIn->subtype == MEDIASUBTYPE_RGB565))
-	{
+		}
+	} else if(mtIn->majortype == MEDIATYPE_Video
+			  && (mtIn->subtype == MEDIASUBTYPE_ARGB32
+				  || mtIn->subtype == MEDIASUBTYPE_RGB32
+				  || mtIn->subtype == MEDIASUBTYPE_RGB24
+				  || mtIn->subtype == MEDIASUBTYPE_RGB565)) {
 		if(mtOut->subtype != MEDIASUBTYPE_ARGB32
-		&& mtOut->subtype != MEDIASUBTYPE_RGB32
-		&& mtOut->subtype != MEDIASUBTYPE_RGB24
-		&& mtOut->subtype != MEDIASUBTYPE_RGB565)
+				&& mtOut->subtype != MEDIASUBTYPE_RGB32
+				&& mtOut->subtype != MEDIASUBTYPE_RGB24
+				&& mtOut->subtype != MEDIASUBTYPE_RGB565) {
 			return VFW_E_TYPE_NOT_ACCEPTED;
+		}
 	}
 
 	return S_OK;
@@ -456,15 +436,17 @@ HRESULT CBaseVideoFilter::CheckOutputType(const CMediaType& mtOut)
 {
 	int wout = 0, hout = 0, arxout = 0, aryout = 0;
 	return ExtractDim(&mtOut, wout, hout, arxout, aryout)
-		&& m_h == abs((int)hout)
-		&& mtOut.subtype != MEDIASUBTYPE_ARGB32
-		? S_OK
-		: VFW_E_TYPE_NOT_ACCEPTED;
+		   && m_h == abs((int)hout)
+		   && mtOut.subtype != MEDIASUBTYPE_ARGB32
+		   ? S_OK
+		   : VFW_E_TYPE_NOT_ACCEPTED;
 }
 
 HRESULT CBaseVideoFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PROPERTIES* pProperties)
 {
-	if(m_pInput->IsConnected() == FALSE) return E_UNEXPECTED;
+	if(m_pInput->IsConnected() == FALSE) {
+		return E_UNEXPECTED;
+	}
 
 	BITMAPINFOHEADER bih;
 	ExtractBIH(&m_pOutput->CurrentMediaType(), &bih);
@@ -479,17 +461,17 @@ HRESULT CBaseVideoFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_
 
 	HRESULT hr;
 	ALLOCATOR_PROPERTIES Actual;
-    if(FAILED(hr = pAllocator->SetProperties(pProperties, &Actual))) 
+	if(FAILED(hr = pAllocator->SetProperties(pProperties, &Actual))) {
 		return hr;
+	}
 
-    return pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
-		? E_FAIL
-		: NOERROR;
+	return pProperties->cBuffers > Actual.cBuffers || pProperties->cbBuffer > Actual.cbBuffer
+		   ? E_FAIL
+		   : NOERROR;
 }
 
 
-VIDEO_OUTPUT_FORMATS DefaultFormats[] =
-{
+VIDEO_OUTPUT_FORMATS DefaultFormats[] = {
 	{&MEDIASUBTYPE_YV12, 3, 12, '21VY'},
 	{&MEDIASUBTYPE_I420, 3, 12, '024I'},
 	{&MEDIASUBTYPE_IYUV, 3, 12, 'VUYI'},
@@ -518,7 +500,9 @@ HRESULT CBaseVideoFilter::GetMediaType(int iPosition, CMediaType* pmt)
 	VIDEO_OUTPUT_FORMATS*	fmts;
 	int						nFormatCount;
 
-    if(m_pInput->IsConnected() == FALSE) return E_UNEXPECTED;
+	if(m_pInput->IsConnected() == FALSE) {
+		return E_UNEXPECTED;
+	}
 
 
 	// this will make sure we won't connect to the old renderer in dvd mode
@@ -527,16 +511,22 @@ HRESULT CBaseVideoFilter::GetMediaType(int iPosition, CMediaType* pmt)
 	bool fFoundDVDNavigator = false;
 	CComPtr<IBaseFilter> pBF = this;
 	CComPtr<IPin> pPin = m_pInput;
-	for(; !fFoundDVDNavigator && (pBF = GetUpStreamFilter(pBF, pPin)); pPin = GetFirstPin(pBF))
-        fFoundDVDNavigator = GetCLSID(pBF) == CLSID_DVDNavigator;
+	for(; !fFoundDVDNavigator && (pBF = GetUpStreamFilter(pBF, pPin)); pPin = GetFirstPin(pBF)) {
+		fFoundDVDNavigator = GetCLSID(pBF) == CLSID_DVDNavigator;
+	}
 
-	if(fFoundDVDNavigator || m_pInput->CurrentMediaType().formattype == FORMAT_VideoInfo2)
+	if(fFoundDVDNavigator || m_pInput->CurrentMediaType().formattype == FORMAT_VideoInfo2) {
 		iPosition = iPosition*2;
+	}
 
 	//
 	GetOutputFormats (nFormatCount, &fmts);
-	if(iPosition < 0) return E_INVALIDARG;
-	if(iPosition >= 2*nFormatCount) return VFW_S_NO_MORE_ITEMS;
+	if(iPosition < 0) {
+		return E_INVALIDARG;
+	}
+	if(iPosition >= 2*nFormatCount) {
+		return VFW_S_NO_MORE_ITEMS;
+	}
 
 	pmt->majortype = MEDIATYPE_Video;
 	pmt->subtype = *fmts[iPosition/2].subtype;
@@ -556,24 +546,23 @@ HRESULT CBaseVideoFilter::GetMediaType(int iPosition, CMediaType* pmt)
 	bihOut.biCompression = fmts[iPosition/2].biCompression;
 	bihOut.biSizeImage = w*h*bihOut.biBitCount>>3;
 
-	if(iPosition&1)
-	{
+	if(iPosition&1) {
 		pmt->formattype = FORMAT_VideoInfo;
 		VIDEOINFOHEADER* vih = (VIDEOINFOHEADER*)pmt->AllocFormatBuffer(sizeof(VIDEOINFOHEADER));
 		memset(vih, 0, sizeof(VIDEOINFOHEADER));
 		vih->bmiHeader = bihOut;
 		vih->bmiHeader.biXPelsPerMeter = vih->bmiHeader.biWidth * ary;
 		vih->bmiHeader.biYPelsPerMeter = vih->bmiHeader.biHeight * arx;
-	}
-	else
-	{
+	} else {
 		pmt->formattype = FORMAT_VideoInfo2;
 		VIDEOINFOHEADER2* vih = (VIDEOINFOHEADER2*)pmt->AllocFormatBuffer(sizeof(VIDEOINFOHEADER2));
 		memset(vih, 0, sizeof(VIDEOINFOHEADER2));
 		vih->bmiHeader = bihOut;
 		vih->dwPictAspectRatioX = arx;
 		vih->dwPictAspectRatioY = ary;
-		if(IsVideoInterlaced()) vih->dwInterlaceFlags = AMINTERLACE_IsInterlaced | AMINTERLACE_DisplayModeBobOrWeave;
+		if(IsVideoInterlaced()) {
+			vih->dwInterlaceFlags = AMINTERLACE_IsInterlaced | AMINTERLACE_DisplayModeBobOrWeave;
+		}
 	}
 
 	CMediaType& mt = m_pInput->CurrentMediaType();
@@ -590,29 +579,27 @@ HRESULT CBaseVideoFilter::GetMediaType(int iPosition, CMediaType* pmt)
 	VIDEOINFOHEADER* vih      = (VIDEOINFOHEADER*)pmt->Format();
 	VIDEOINFOHEADER* vihInput = (VIDEOINFOHEADER*)pmtInput.Format();
 
-	if (vih && vihInput && (vihInput->rcSource.right != 0) && (vihInput->rcSource.bottom != 0))
-	{
+	if (vih && vihInput && (vihInput->rcSource.right != 0) && (vihInput->rcSource.bottom != 0)) {
 		vih->rcSource = vihInput->rcSource;
 		vih->rcTarget = vihInput->rcTarget;
-	}
-	else
-	{
+	} else {
 		vih->rcSource.right  = vih->rcTarget.right  = m_win;
 		vih->rcSource.bottom = vih->rcTarget.bottom = m_hin;
 	}
 
-	if (RealWidth != -1 && vih->rcSource.right > RealWidth)
+	if (RealWidth != -1 && vih->rcSource.right > RealWidth) {
 		vih->rcSource.right = RealWidth;
-	if (RealHeight != -1 && vih->rcSource.bottom > RealHeight)
+	}
+	if (RealHeight != -1 && vih->rcSource.bottom > RealHeight) {
 		vih->rcSource.bottom = RealHeight;
+	}
 
 	return S_OK;
 }
 
 HRESULT CBaseVideoFilter::SetMediaType(PIN_DIRECTION dir, const CMediaType* pmt)
 {
-	if(dir == PINDIR_INPUT)
-	{
+	if(dir == PINDIR_INPUT) {
 		m_w = m_h = m_arx = m_ary = 0;
 		ExtractDim(pmt, m_w, m_h, m_arx, m_ary);
 		m_win = m_w;
@@ -629,14 +616,13 @@ HRESULT CBaseVideoFilter::SetMediaType(PIN_DIRECTION dir, const CMediaType* pmt)
 			a = b % tmp;
 			b = tmp;
 		}
-		if(b) m_arx /= b, m_ary /= b;
-	}
-	else if(dir == PINDIR_OUTPUT)
-	{
+		if(b) {
+			m_arx /= b, m_ary /= b;
+		}
+	} else if(dir == PINDIR_OUTPUT) {
 		int wout = 0, hout = 0, arxout = 0, aryout = 0;
 		ExtractDim(pmt, wout, hout, arxout, aryout);
-		if(m_w == wout && m_h == hout && m_arx == arxout && m_ary == aryout)
-		{
+		if(m_w == wout && m_h == hout && m_arx == arxout && m_ary == aryout) {
 			m_wout = wout;
 			m_hout = hout;
 			m_arxout = arxout;
@@ -650,11 +636,13 @@ HRESULT CBaseVideoFilter::SetMediaType(PIN_DIRECTION dir, const CMediaType* pmt)
 //
 // CBaseVideoInputAllocator
 //
-	
+
 CBaseVideoInputAllocator::CBaseVideoInputAllocator(HRESULT* phr)
 	: CMemAllocator(NAME("CBaseVideoInputAllocator"), NULL, phr)
 {
-	if(phr) *phr = S_OK;
+	if(phr) {
+		*phr = S_OK;
+	}
 }
 
 void CBaseVideoInputAllocator::SetMediaType(const CMediaType& mt)
@@ -664,13 +652,13 @@ void CBaseVideoInputAllocator::SetMediaType(const CMediaType& mt)
 
 STDMETHODIMP CBaseVideoInputAllocator::GetBuffer(IMediaSample** ppBuffer, REFERENCE_TIME* pStartTime, REFERENCE_TIME* pEndTime, DWORD dwFlags)
 {
-	if(!m_bCommitted)
-        return VFW_E_NOT_COMMITTED;
+	if(!m_bCommitted) {
+		return VFW_E_NOT_COMMITTED;
+	}
 
 	HRESULT hr = __super::GetBuffer(ppBuffer, pStartTime, pEndTime, dwFlags);
 
-	if(SUCCEEDED(hr) && m_mt.majortype != GUID_NULL)
-	{
+	if(SUCCEEDED(hr) && m_mt.majortype != GUID_NULL) {
 		(*ppBuffer)->SetMediaType(&m_mt);
 		m_mt.majortype = GUID_NULL;
 	}
@@ -682,7 +670,7 @@ STDMETHODIMP CBaseVideoInputAllocator::GetBuffer(IMediaSample** ppBuffer, REFERE
 // CBaseVideoInputPin
 //
 
-CBaseVideoInputPin::CBaseVideoInputPin(TCHAR* pObjectName, CBaseVideoFilter* pFilter, HRESULT* phr, LPCWSTR pName) 
+CBaseVideoInputPin::CBaseVideoInputPin(TCHAR* pObjectName, CBaseVideoFilter* pFilter, HRESULT* phr, LPCWSTR pName)
 	: CTransformInputPin(pObjectName, pFilter, phr, pName)
 	, m_pAllocator(NULL)
 {
@@ -695,54 +683,57 @@ CBaseVideoInputPin::~CBaseVideoInputPin()
 
 STDMETHODIMP CBaseVideoInputPin::GetAllocator(IMemAllocator** ppAllocator)
 {
-    CheckPointer(ppAllocator, E_POINTER);
+	CheckPointer(ppAllocator, E_POINTER);
 
-    if(m_pAllocator == NULL)
-	{
+	if(m_pAllocator == NULL) {
 		HRESULT hr = S_OK;
-        m_pAllocator = DNew CBaseVideoInputAllocator(&hr);
-        m_pAllocator->AddRef();
-    }
+		m_pAllocator = DNew CBaseVideoInputAllocator(&hr);
+		m_pAllocator->AddRef();
+	}
 
-    (*ppAllocator = m_pAllocator)->AddRef();
+	(*ppAllocator = m_pAllocator)->AddRef();
 
-    return S_OK;
-} 
+	return S_OK;
+}
 
 STDMETHODIMP CBaseVideoInputPin::ReceiveConnection(IPin* pConnector, const AM_MEDIA_TYPE* pmt)
 {
 	CAutoLock cObjectLock(m_pLock);
 
-	if(m_Connected)
-	{
+	if(m_Connected) {
 		CMediaType mt(*pmt);
 
-		if(FAILED(CheckMediaType(&mt)))
+		if(FAILED(CheckMediaType(&mt))) {
 			return VFW_E_TYPE_NOT_ACCEPTED;
+		}
 
 		ALLOCATOR_PROPERTIES props, actual;
 
 		CComPtr<IMemAllocator> pMemAllocator;
 		if(FAILED(GetAllocator(&pMemAllocator))
-		|| FAILED(pMemAllocator->Decommit())
-		|| FAILED(pMemAllocator->GetProperties(&props)))
+				|| FAILED(pMemAllocator->Decommit())
+				|| FAILED(pMemAllocator->GetProperties(&props))) {
 			return E_FAIL;
+		}
 
 		BITMAPINFOHEADER bih;
-		if(ExtractBIH(pmt, &bih) && bih.biSizeImage)
+		if(ExtractBIH(pmt, &bih) && bih.biSizeImage) {
 			props.cbBuffer = bih.biSizeImage;
+		}
 
 		if(FAILED(pMemAllocator->SetProperties(&props, &actual))
-		|| FAILED(pMemAllocator->Commit())
-		|| props.cbBuffer != actual.cbBuffer)
+				|| FAILED(pMemAllocator->Commit())
+				|| props.cbBuffer != actual.cbBuffer) {
 			return E_FAIL;
+		}
 
-		if(m_pAllocator) 
+		if(m_pAllocator) {
 			m_pAllocator->SetMediaType(mt);
+		}
 
 		return SetMediaType(&mt) == S_OK
-			? S_OK
-			: VFW_E_TYPE_NOT_ACCEPTED;
+			   ? S_OK
+			   : VFW_E_TYPE_NOT_ACCEPTED;
 	}
 
 	return __super::ReceiveConnection(pConnector, pmt);
@@ -759,10 +750,11 @@ CBaseVideoOutputPin::CBaseVideoOutputPin(TCHAR* pObjectName, CBaseVideoFilter* p
 
 HRESULT CBaseVideoOutputPin::CheckMediaType(const CMediaType* mtOut)
 {
-	if(IsConnected())
-	{
+	if(IsConnected()) {
 		HRESULT hr = (static_cast<CBaseVideoFilter*>(m_pFilter))->CheckOutputType(*mtOut);
-		if(FAILED(hr)) return hr;
+		if(FAILED(hr)) {
+			return hr;
+		}
 	}
 
 	return __super::CheckMediaType(mtOut);