Replace memset with ZeroMemory.

The ZeroMemory macro makes clear what it does compared to `memset(foo, 0, bar)`.

7 files changed, 26 insertions, 26 deletions

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
index 4265075d2..dda150c79 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
+++ b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp
@@ -83,15 +83,15 @@ void CDXVADecoder::Init(CMPCVideoDecFilter* pFilter, DXVAMode nMode, int nPicEnt
     m_dwNumBuffersInfo  = 0;

     m_bNeedChangeAspect = true;

 

-    memset(&m_DXVA1Config, 0, sizeof(m_DXVA1Config));

-    memset(&m_DXVA1BufferDesc, 0, sizeof(m_DXVA1BufferDesc));

+    ZeroMemory(&m_DXVA1Config, sizeof(m_DXVA1Config));

+    ZeroMemory(&m_DXVA1BufferDesc, sizeof(m_DXVA1BufferDesc));

     m_DXVA1Config.guidConfigBitstreamEncryption = DXVA_NoEncrypt;

     m_DXVA1Config.guidConfigMBcontrolEncryption = DXVA_NoEncrypt;

     m_DXVA1Config.guidConfigResidDiffEncryption = DXVA_NoEncrypt;

     m_DXVA1Config.bConfigBitstreamRaw           = 2;

 

-    memset(&m_DXVA1BufferInfo, 0, sizeof(m_DXVA1BufferInfo));

-    memset(&m_ExecuteParams, 0, sizeof(m_ExecuteParams));

+    ZeroMemory(&m_DXVA1BufferInfo, sizeof(m_DXVA1BufferInfo));

+    ZeroMemory(&m_ExecuteParams, sizeof(m_ExecuteParams));

     Flush();

 }

 

@@ -101,7 +101,7 @@ void CDXVADecoder::AllocExecuteParams(int nSize)
     m_ExecuteParams.pCompressedBuffers = DEBUG_NEW DXVA2_DecodeBufferDesc[nSize];

 

     for (int i = 0; i < nSize; i++) {

-        memset(&m_ExecuteParams.pCompressedBuffers[i], 0, sizeof(DXVA2_DecodeBufferDesc));

+        ZeroMemory(&m_ExecuteParams.pCompressedBuffers[i], sizeof(DXVA2_DecodeBufferDesc));

     }

 }

 

@@ -142,7 +142,7 @@ HRESULT CDXVADecoder::ConfigureDXVA1()
     DXVA_ConfigPictureDecode ConfigRequested;

 

     if (m_pAMVideoAccelerator) {

-        memset(&ConfigRequested, 0, sizeof(ConfigRequested));

+        ZeroMemory(&ConfigRequested, sizeof(ConfigRequested));

         ConfigRequested.guidConfigBitstreamEncryption = DXVA_NoEncrypt;

         ConfigRequested.guidConfigMBcontrolEncryption = DXVA_NoEncrypt;

         ConfigRequested.guidConfigResidDiffEncryption = DXVA_NoEncrypt;

@@ -367,8 +367,8 @@ HRESULT CDXVADecoder::QueryStatus(PVOID LPDXVAStatus, UINT nSize)
             break;

 

         case ENGINE_DXVA2:

-            memset(&ExecuteParams, 0, sizeof(ExecuteParams));

-            memset(&ExtensionData, 0, sizeof(ExtensionData));

+            ZeroMemory(&ExecuteParams, sizeof(ExecuteParams));

+            ZeroMemory(&ExtensionData, sizeof(ExtensionData));

             ExecuteParams.pExtensionData        = &ExtensionData;

             ExtensionData.pPrivateOutputData    = LPDXVAStatus;

             ExtensionData.PrivateOutputDataSize = nSize;

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp
index 71ffbe82a..3c46e62e8 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp
+++ b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp
@@ -53,10 +53,10 @@ CDXVADecoderH264::~CDXVADecoderH264()
 

 void CDXVADecoderH264::Init()

 {

-    memset(&m_DXVAPicParams, 0, sizeof(m_DXVAPicParams));

-    memset(&m_DXVAPicParams, 0, sizeof(DXVA_PicParams_H264));

-    memset(&m_pSliceLong, 0, sizeof(DXVA_Slice_H264_Long) * MAX_SLICES);

-    memset(&m_pSliceShort, 0, sizeof(DXVA_Slice_H264_Short) * MAX_SLICES);

+    ZeroMemory(&m_DXVAPicParams, sizeof(m_DXVAPicParams));

+    ZeroMemory(&m_DXVAPicParams, sizeof(DXVA_PicParams_H264));

+    ZeroMemory(&m_pSliceLong, sizeof(DXVA_Slice_H264_Long) * MAX_SLICES);

+    ZeroMemory(&m_pSliceShort, sizeof(DXVA_Slice_H264_Short) * MAX_SLICES);

 

     m_DXVAPicParams.MbsConsecutiveFlag = 1;

     if (m_pFilter->GetPCIVendor() == PCIV_Intel) {

@@ -137,7 +137,7 @@ void CDXVADecoderH264::CopyBitstream(BYTE* pDXVABuffer, BYTE* pBuffer, UINT& nSi
     // Complete with zero padding (buffer size should be a multiple of 128)

     nDummy = 128 - (nSize % 128);

 

-    memset(pDXVABuffer, 0, nDummy);

+    ZeroMemory(pDXVABuffer, nDummy);

     m_pSliceShort[nSlices - 1].SliceBytesInBuffer += nDummy;

     nSize += nDummy;

 }

@@ -354,7 +354,7 @@ HRESULT CDXVADecoderH264::DisplayStatus()
     HRESULT hr = E_INVALIDARG;

     DXVA_Status_H264 Status;

 

-    memset(&Status, 0, sizeof(Status));

+    ZeroMemory(&Status, sizeof(Status));

     CHECK_HR_TRACE(CDXVADecoder::QueryStatus(&Status, sizeof(Status)));

 

     TRACE_H264("CDXVADecoderH264::DisplayStatus() : Status for the frame %u : bBufType = %u, bStatus = %u, wNumMbsAffected = %u\n",

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp
index 286ba9d0c..a6e7d8dd5 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp
+++ b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp
@@ -49,9 +49,9 @@ CDXVADecoderMpeg2::~CDXVADecoderMpeg2()
 

 void CDXVADecoderMpeg2::Init()

 {

-    memset(&m_PictureParams, 0, sizeof(m_PictureParams));

-    memset(&m_SliceInfo,     0, sizeof(m_SliceInfo));

-    memset(&m_QMatrixData,   0, sizeof(m_QMatrixData));

+    ZeroMemory(&m_PictureParams, sizeof(m_PictureParams));

+    ZeroMemory(&m_SliceInfo, sizeof(m_SliceInfo));

+    ZeroMemory(&m_QMatrixData, sizeof(m_QMatrixData));

 

     m_nMaxWaiting           = 5;

     m_wRefPictureIndex[0]   = NO_REF_FRAME;

diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp
index 66910d6c4..acdd62520 100644
--- a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp
+++ b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp
@@ -57,8 +57,8 @@ CDXVADecoderVC1::~CDXVADecoderVC1()
 

 void CDXVADecoderVC1::Init()

 {

-    memset(&m_PictureParams, 0, sizeof(m_PictureParams));

-    memset(&m_SliceInfo, 0, sizeof(m_SliceInfo));

+    ZeroMemory(&m_PictureParams, sizeof(m_PictureParams));

+    ZeroMemory(&m_SliceInfo, sizeof(m_SliceInfo));

 

     m_nMaxWaiting = 5;

     m_wRefPictureIndex[0] = NO_REF_FRAME;

@@ -286,7 +286,7 @@ void CDXVADecoderVC1::CopyBitstream(BYTE* pDXVABuffer, BYTE* pBuffer, UINT& nSiz
     // Copy bitstream buffer, with zero padding (buffer is rounded to multiple of 128)

     nDummy  = 128 - (nSize % 128);

 

-    memset(pDXVABuffer + nSize, 0, nDummy);

+    ZeroMemory(pDXVABuffer + nSize, nDummy);

     nSize  += nDummy;

 }

 

@@ -314,7 +314,7 @@ HRESULT CDXVADecoderVC1::DisplayStatus()
     HRESULT hr = E_INVALIDARG;

     DXVA_Status_VC1 Status;

 

-    memset(&Status, 0, sizeof(Status));

+    ZeroMemory(&Status, sizeof(Status));

 

     if (SUCCEEDED(hr = CDXVADecoder::QueryStatus(&Status, sizeof(Status)))) {

         Status.StatusReportFeedbackNumber = 0x00FF & Status.StatusReportFeedbackNumber;

diff --git a/src/filters/transform/MPCVideoDec/FfmpegContext.cpp b/src/filters/transform/MPCVideoDec/FfmpegContext.cpp
index c5d496228..06a9ea3fe 100644
--- a/src/filters/transform/MPCVideoDec/FfmpegContext.cpp
+++ b/src/filters/transform/MPCVideoDec/FfmpegContext.cpp
@@ -294,7 +294,7 @@ int FFH264CheckCompatibility(int nWidth,
 void CopyScalingMatrix(DXVA_Qmatrix_H264* pDest, PPS* pps, DWORD nPCIVendor)

 {

     int i, j;

-    memset(pDest, 0, sizeof(DXVA_Qmatrix_H264));

+    ZeroMemory(pDest, sizeof(DXVA_Qmatrix_H264));

     if (nPCIVendor == PCIV_ATI) {

         for (i = 0; i < 6; i++) {

             for (j = 0; j < 16; j++) {

diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
index 18fea379a..e49553dc7 100644
--- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
+++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
@@ -1503,7 +1503,7 @@ HRESULT CMPCVideoDecFilter::NewSegment(REFERENCE_TIME rtStart, REFERENCE_TIME rt
     }

 

     m_nPosB = 1;

-    memset(&m_BFrames, 0, sizeof(m_BFrames));

+    ZeroMemory(&m_BFrames, sizeof(m_BFrames));

     m_rtLastStart = 0;

     m_nCountEstimated = 0;

     m_dRate = dRate;

@@ -1751,7 +1751,7 @@ HRESULT CMPCVideoDecFilter::SoftwareDecode(IMediaSample* pIn, BYTE* pDataIn, int
             // Note: If the first 23 bits of the additional bytes are not 0, then damaged

             // MPEG bitstreams could cause overread and segfault.

             memcpy(m_pFFBuffer, pDataIn, nSize);

-            memset(m_pFFBuffer + nSize, 0, FF_INPUT_BUFFER_PADDING_SIZE);

+            ZeroMemory(m_pFFBuffer + nSize, FF_INPUT_BUFFER_PADDING_SIZE);

 

             avpkt.data = m_pFFBuffer;

             avpkt.size = nSize;

@@ -2113,7 +2113,7 @@ void CMPCVideoDecFilter::ReorderBFrames(REFERENCE_TIME& rtStart, REFERENCE_TIME&
 

 void CMPCVideoDecFilter::FillInVideoDescription(DXVA2_VideoDesc* pDesc)

 {

-    memset(pDesc, 0, sizeof(DXVA2_VideoDesc));

+    ZeroMemory(pDesc, sizeof(DXVA2_VideoDesc));

     pDesc->SampleWidth = PictWidthRounded();

     pDesc->SampleHeight = PictHeightRounded();

     pDesc->Format = D3DFMT_A8R8G8B8;

diff --git a/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp b/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp
index 9f38a7852..a0b9e1c8e 100644
--- a/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp
+++ b/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp
@@ -31,7 +31,7 @@ CVideoDecOutputPin::CVideoDecOutputPin(TCHAR* pObjectName, CBaseVideoFilter* pFi
     m_pDXVA2Allocator = nullptr;

     m_dwDXVA1SurfaceCount = 0;

     m_GuidDecoderDXVA1 = GUID_NULL;

-    memset(&m_ddUncompPixelFormat, 0, sizeof(m_ddUncompPixelFormat));

+    ZeroMemory(&m_ddUncompPixelFormat, sizeof(m_ddUncompPixelFormat));

 }

 

 CVideoDecOutputPin::~CVideoDecOutputPin()