whitespace cleanup

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2285 10f7b99b-c216-0410-bff0-8a66a9350fd8

5 files changed, 100 insertions, 100 deletions

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
index 7d85b990e..771fbc212 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
+++ b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
@@ -119,12 +119,12 @@ void CDXVADecoder::Flush()
 	TRACE ("CDXVADecoder::Flush\n");

 	for (int i=0; i<m_nPicEntryNumber; i++)

 	{

-		m_pPictureStore[i].bRefPicture	= false;

-		m_pPictureStore[i].bInUse		= false;

-		m_pPictureStore[i].bDisplayed	= false;

-		m_pPictureStore[i].pSample		= NULL;

-		m_pPictureStore[i].nCodecSpecific = -1;

-		m_pPictureStore[i].dwDisplayCount = 0;

+		m_pPictureStore[i].bRefPicture		= false;

+		m_pPictureStore[i].bInUse			= false;

+		m_pPictureStore[i].bDisplayed		= false;

+		m_pPictureStore[i].pSample			= NULL;

+		m_pPictureStore[i].nCodecSpecific	= -1;

+		m_pPictureStore[i].dwDisplayCount	= 0;

 	}

 

 	m_nWaitingPics	= 0;

@@ -151,21 +151,21 @@ HRESULT CDXVADecoder::ConfigureDXVA1()
 		hr = m_pAMVideoAccelerator->Execute (ConfigRequested.dwFunction, &ConfigRequested, sizeof(DXVA_ConfigPictureDecode), &m_DXVA1Config, sizeof(DXVA_ConfigPictureDecode), 0, NULL);

 

 		// Copy to DXVA2 structure (simplify code based on accelerator config)

-		m_DXVA2Config.guidConfigBitstreamEncryption	= m_DXVA1Config.guidConfigBitstreamEncryption;

-		m_DXVA2Config.guidConfigMBcontrolEncryption	= m_DXVA1Config.guidConfigMBcontrolEncryption;

-		m_DXVA2Config.guidConfigResidDiffEncryption	= m_DXVA1Config.guidConfigResidDiffEncryption;

-		m_DXVA2Config.ConfigBitstreamRaw			= m_DXVA1Config.bConfigBitstreamRaw;

-		m_DXVA2Config.ConfigMBcontrolRasterOrder	= m_DXVA1Config.bConfigMBcontrolRasterOrder;

-		m_DXVA2Config.ConfigResidDiffHost			= m_DXVA1Config.bConfigResidDiffHost;

-		m_DXVA2Config.ConfigSpatialResid8			= m_DXVA1Config.bConfigSpatialResid8;

-		m_DXVA2Config.ConfigResid8Subtraction		= m_DXVA1Config.bConfigResid8Subtraction;

-		m_DXVA2Config.ConfigSpatialHost8or9Clipping	= m_DXVA1Config.bConfigSpatialHost8or9Clipping;

-		m_DXVA2Config.ConfigSpatialResidInterleaved	= m_DXVA1Config.bConfigSpatialResidInterleaved;

-		m_DXVA2Config.ConfigIntraResidUnsigned		= m_DXVA1Config.bConfigIntraResidUnsigned;

-		m_DXVA2Config.ConfigResidDiffAccelerator	= m_DXVA1Config.bConfigResidDiffAccelerator;

-		m_DXVA2Config.ConfigHostInverseScan			= m_DXVA1Config.bConfigHostInverseScan;

-		m_DXVA2Config.ConfigSpecificIDCT			= m_DXVA1Config.bConfigSpecificIDCT;

-		m_DXVA2Config.Config4GroupedCoefs			= m_DXVA1Config.bConfig4GroupedCoefs;

+		m_DXVA2Config.guidConfigBitstreamEncryption		= m_DXVA1Config.guidConfigBitstreamEncryption;

+		m_DXVA2Config.guidConfigMBcontrolEncryption		= m_DXVA1Config.guidConfigMBcontrolEncryption;

+		m_DXVA2Config.guidConfigResidDiffEncryption		= m_DXVA1Config.guidConfigResidDiffEncryption;

+		m_DXVA2Config.ConfigBitstreamRaw				= m_DXVA1Config.bConfigBitstreamRaw;

+		m_DXVA2Config.ConfigMBcontrolRasterOrder		= m_DXVA1Config.bConfigMBcontrolRasterOrder;

+		m_DXVA2Config.ConfigResidDiffHost				= m_DXVA1Config.bConfigResidDiffHost;

+		m_DXVA2Config.ConfigSpatialResid8				= m_DXVA1Config.bConfigSpatialResid8;

+		m_DXVA2Config.ConfigResid8Subtraction			= m_DXVA1Config.bConfigResid8Subtraction;

+		m_DXVA2Config.ConfigSpatialHost8or9Clipping		= m_DXVA1Config.bConfigSpatialHost8or9Clipping;

+		m_DXVA2Config.ConfigSpatialResidInterleaved		= m_DXVA1Config.bConfigSpatialResidInterleaved;

+		m_DXVA2Config.ConfigIntraResidUnsigned			= m_DXVA1Config.bConfigIntraResidUnsigned;

+		m_DXVA2Config.ConfigResidDiffAccelerator		= m_DXVA1Config.bConfigResidDiffAccelerator;

+		m_DXVA2Config.ConfigHostInverseScan				= m_DXVA1Config.bConfigHostInverseScan;

+		m_DXVA2Config.ConfigSpecificIDCT				= m_DXVA1Config.bConfigSpecificIDCT;

+		m_DXVA2Config.Config4GroupedCoefs				= m_DXVA1Config.bConfig4GroupedCoefs;

 

 		if (SUCCEEDED (hr))

 		{

@@ -761,4 +761,4 @@ BYTE CDXVADecoder::GetConfigIntraResidUnsigned()
 		return m_DXVA2Config.ConfigIntraResidUnsigned;

 	}

 	return 0;

-}
\ No newline at end of file
+}

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoder.h b/src/filters/transform/MPCVideoDec/DXVADecoder.h
index c06f3bbd6..0ca1e6911 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoder.h
+++ b/src/filters/transform/MPCVideoDec/DXVADecoder.h
@@ -71,8 +71,8 @@ typedef struct
 } PICTURE_STORE;

 

 

-#define MAX_COM_BUFFER				6		// Max uncompressed buffer for an Execute command (DXVA1)

-#define COMP_BUFFER_COUNT			18

+#define MAX_COM_BUFFER			6				// Max uncompressed buffer for an Execute command (DXVA1)

+#define COMP_BUFFER_COUNT		18

 #define NO_REF_FRAME			0xFFFF

 

 class CMPCVideoDecFilter;

@@ -82,10 +82,10 @@ class CDXVADecoder
 public :

 	// === Public functions

 	virtual					~CDXVADecoder();

-	DXVAMode				GetMode()		const {

+	DXVAMode				GetMode()	const {

 		return m_nMode;

 	};

-	DXVA_ENGINE				GetEngine()		const {

+	DXVA_ENGINE				GetEngine()	const {

 		return m_nEngine;

 	};

 	void					AllocExecuteParams (int nSize);

@@ -166,4 +166,4 @@ private :
 	void					Init(CMPCVideoDecFilter* pFilter, DXVAMode nMode, int nPicEntryNumber);

 	void					FreePictureSlot (int nSurfaceIndex);

 	void					SetTypeSpecificFlags(PICTURE_STORE* pPicture, IMediaSample* pMS);

-};
\ No newline at end of file
+};

diff --git a/src/filters/transform/MPCVideoDec/H264QuantizationMatrix.h b/src/filters/transform/MPCVideoDec/H264QuantizationMatrix.h
index 3cdf547b1..b05941919 100644
--- a/src/filters/transform/MPCVideoDec/H264QuantizationMatrix.h
+++ b/src/filters/transform/MPCVideoDec/H264QuantizationMatrix.h
@@ -322,4 +322,4 @@ const DXVA_Qmatrix_H264		g_QMatrixH264[] =
 			}

 		}

 	}

-};
\ No newline at end of file
+};

diff --git a/src/filters/transform/MPCVideoDec/ffImgfmt.cpp b/src/filters/transform/MPCVideoDec/ffImgfmt.cpp
index 7718cd9a4..026a08fc9 100644
--- a/src/filters/transform/MPCVideoDec/ffImgfmt.cpp
+++ b/src/filters/transform/MPCVideoDec/ffImgfmt.cpp
@@ -974,75 +974,75 @@ bool TcspInfos::TsortFc::operator ()(const TcspInfo* &csp1,const TcspInfo* &csp2
  int rank2;csp_bestMatch(csp,csp2->id,&rank2);

  return rank1>rank2;

 }

-//void TcspInfos::sort(int csp)

-//{

-// std::sort(begin(),end(),TsortFc(csp&FF_CSPS_MASK));

-//}

+/*void TcspInfos::sort(int csp)

+{

+ std::sort(begin(),end(),TsortFc(csp&FF_CSPS_MASK));

+}

 

-//int getBMPcolorspace(const BITMAPINFOHEADER *hdr,const TcspInfos &forcedCsps)

-//{

-// int csp;

-// switch(hdr->biCompression)

-//  {

-//   case BI_RGB:

-//    switch (hdr->biBitCount)

-//     {

-//      case  8:csp=FF_CSP_PAL8|FF_CSP_FLAGS_VFLIP;break;

-//      case 15:csp=FF_CSP_RGB15|FF_CSP_FLAGS_VFLIP;break;

-//      case 16:csp=FF_CSP_RGB16|FF_CSP_FLAGS_VFLIP;break;

-//      case 24:csp=FF_CSP_RGB24|FF_CSP_FLAGS_VFLIP;break;

-//      case 32:csp=FF_CSP_RGB32|FF_CSP_FLAGS_VFLIP;break;

-//      default:return FF_CSP_NULL;

-//     }

-//    break;

-//   case FOURCC_I420:

-//   case FOURCC_IYUV:

-//    csp=FF_CSP_420P|FF_CSP_FLAGS_YUV_ADJ|FF_CSP_FLAGS_YUV_ORDER;

-//    break;

-//   case FOURCC_YV12:

-//    csp=FF_CSP_420P|FF_CSP_FLAGS_YUV_ADJ;

-//    break;

-//   case FOURCC_YUYV:

-//   case FOURCC_YUY2:

-//   case FOURCC_V422:

-//    csp=FF_CSP_YUY2;

-//    break;

-//   case FOURCC_YVYU:

-//    csp=FF_CSP_YVYU;

-//    break;

-//   case FOURCC_UYVY:

-//    csp=FF_CSP_UYVY;

-//    break;

-//   case FOURCC_VYUY:

-//    csp=FF_CSP_VYUY;

-//    break;

-//   case FOURCC_Y800:

-//    csp=FF_CSP_Y800;

-//    break;

-//   case FOURCC_444P:

-//   case FOURCC_YV24:

-//    csp=FF_CSP_444P;

-//    break;

-//   case FOURCC_422P:

-//    csp=FF_CSP_422P;

-//    break;

-//   case FOURCC_YV16:

-//    csp=FF_CSP_422P|FF_CSP_FLAGS_YUV_ADJ;

-//    break;

-//   case FOURCC_411P:

-//   case FOURCC_Y41B:

-//    csp=FF_CSP_411P;

-//    break;

-//   case FOURCC_410P:

-//    csp=FF_CSP_410P;

-//    break;

-//   default:

-//    return FF_CSP_NULL;

-//  }

-// bool ok;

-// if (!forcedCsps.empty())

-//  ok=std::find(forcedCsps.begin(),forcedCsps.end(),csp_getInfo(csp))!=forcedCsps.end();

-// else

-//  ok=true;

-// return ok?csp:FF_CSP_NULL;

-//}

+int getBMPcolorspace(const BITMAPINFOHEADER *hdr,const TcspInfos &forcedCsps)

+{

+ int csp;

+ switch(hdr->biCompression)

+  {

+   case BI_RGB:

+    switch (hdr->biBitCount)

+     {

+      case  8:csp=FF_CSP_PAL8|FF_CSP_FLAGS_VFLIP;break;

+      case 15:csp=FF_CSP_RGB15|FF_CSP_FLAGS_VFLIP;break;

+      case 16:csp=FF_CSP_RGB16|FF_CSP_FLAGS_VFLIP;break;

+      case 24:csp=FF_CSP_RGB24|FF_CSP_FLAGS_VFLIP;break;

+      case 32:csp=FF_CSP_RGB32|FF_CSP_FLAGS_VFLIP;break;

+      default:return FF_CSP_NULL;

+     }

+    break;

+   case FOURCC_I420:

+   case FOURCC_IYUV:

+    csp=FF_CSP_420P|FF_CSP_FLAGS_YUV_ADJ|FF_CSP_FLAGS_YUV_ORDER;

+    break;

+   case FOURCC_YV12:

+    csp=FF_CSP_420P|FF_CSP_FLAGS_YUV_ADJ;

+    break;

+   case FOURCC_YUYV:

+   case FOURCC_YUY2:

+   case FOURCC_V422:

+    csp=FF_CSP_YUY2;

+    break;

+   case FOURCC_YVYU:

+    csp=FF_CSP_YVYU;

+    break;

+   case FOURCC_UYVY:

+    csp=FF_CSP_UYVY;

+    break;

+   case FOURCC_VYUY:

+    csp=FF_CSP_VYUY;

+    break;

+   case FOURCC_Y800:

+    csp=FF_CSP_Y800;

+    break;

+   case FOURCC_444P:

+   case FOURCC_YV24:

+    csp=FF_CSP_444P;

+    break;

+   case FOURCC_422P:

+    csp=FF_CSP_422P;

+    break;

+   case FOURCC_YV16:

+    csp=FF_CSP_422P|FF_CSP_FLAGS_YUV_ADJ;

+    break;

+   case FOURCC_411P:

+   case FOURCC_Y41B:

+    csp=FF_CSP_411P;

+    break;

+   case FOURCC_410P:

+    csp=FF_CSP_410P;

+    break;

+   default:

+    return FF_CSP_NULL;

+  }

+ bool ok;

+ if (!forcedCsps.empty())

+  ok=std::find(forcedCsps.begin(),forcedCsps.end(),csp_getInfo(csp))!=forcedCsps.end();

+ else

+  ok=true;

+ return ok?csp:FF_CSP_NULL;

+} */

diff --git a/src/filters/transform/MPCVideoDec/stdafx.cpp b/src/filters/transform/MPCVideoDec/stdafx.cpp
index d106f9b6e..1734bc03d 100644
--- a/src/filters/transform/MPCVideoDec/stdafx.cpp
+++ b/src/filters/transform/MPCVideoDec/stdafx.cpp
@@ -45,4 +45,4 @@ void LOG(LPCTSTR fmt, ...)
 	va_end(args);

 }

 

-#endif
\ No newline at end of file
+#endif