diff options
Diffstat (limited to 'src/filters')
23 files changed, 47 insertions, 47 deletions
diff --git a/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.cpp b/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.cpp index 8a6b41a71..cccf16a47 100644 --- a/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.cpp +++ b/src/filters/muxer/BaseMuxer/BaseMuxerOutputPin.cpp @@ -320,7 +320,7 @@ void CBaseMuxerRawOutputPin::MuxPacket(const CMediaType& mt, const MuxerPacket* DVD_HMSF_TIMECODE start = RT2HMSF(pPacket->rtStart, 25);
DVD_HMSF_TIMECODE stop = RT2HMSF(pPacket->rtStop, 25);
- int fields = mt.subtype == MEDIASUBTYPE_ASS2 ? 10 : 9;
+ size_t fields = mt.subtype == MEDIASUBTYPE_ASS2 ? 10 : 9;
CAtlList<CStringA> sl;
Explode(str, sl, ',', fields);
diff --git a/src/filters/parser/AviSplitter/AviReportWnd.cpp b/src/filters/parser/AviSplitter/AviReportWnd.cpp index 4007e33cf..77e994c2b 100644 --- a/src/filters/parser/AviSplitter/AviReportWnd.cpp +++ b/src/filters/parser/AviSplitter/AviReportWnd.cpp @@ -255,13 +255,13 @@ bool CAviPlotterWnd::Create(CAviFile* pAF, CRect r, CWnd* pParentWnd) if(nmax > 0 && tmax > 0) {
CAtlArray<CPen> pen;
pen.SetCount(pAF->m_avih.dwStreams);
- for(int i = 0; i < pen.GetCount(); i++) {
+ for(size_t i = 0; i < pen.GetCount(); i++) {
pen[i].CreatePen(PS_SOLID, 2, clr[i]);
}
CAtlArray<CPoint> pp;
pp.SetCount(pAF->m_avih.dwStreams);
- for(int i = 0; i < pen.GetCount(); i++) {
+ for(size_t i = 0; i < pen.GetCount(); i++) {
pp[i].SetPoint(-1, -1);
}
diff --git a/src/filters/parser/AviSplitter/AviReportWnd.h b/src/filters/parser/AviSplitter/AviReportWnd.h index 2f27b2d79..f610e2ad4 100644 --- a/src/filters/parser/AviSplitter/AviReportWnd.h +++ b/src/filters/parser/AviSplitter/AviReportWnd.h @@ -17,7 +17,7 @@ public: bool Create(CAviFile* pAF, CRect r, CWnd* pParentWnd);
int GetChunkDist(int x) {
- return x >= 0 && x < m_chunkdist.GetCount() ? m_chunkdist[x] : 0;
+ return (x >= 0 && (size_t)x < m_chunkdist.GetCount()) ? m_chunkdist[x] : 0;
}
DECLARE_MESSAGE_MAP()
diff --git a/src/filters/parser/AviSplitter/AviSplitter.cpp b/src/filters/parser/AviSplitter/AviSplitter.cpp index 2815422fe..1311a7f68 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.cpp +++ b/src/filters/parser/AviSplitter/AviSplitter.cpp @@ -221,7 +221,7 @@ HRESULT CAviSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) if(s->cs.GetCount() && pvih->AvgTimePerFrame > 0) {
__int64 size = 0;
- for(int i = 0; i < s->cs.GetCount(); i++) {
+ for(size_t i = 0; i < s->cs.GetCount(); i++) {
size += s->cs[i].orgsize;
}
pvih->dwBitRate = size*8 / s->cs.GetCount() * 10000000i64 / pvih->AvgTimePerFrame;
@@ -811,7 +811,7 @@ STDMETHODIMP CAviSplitterFilter::GetKeyFrameCount(UINT& nKFs) continue;
}
- for(int j = 0; j < s->cs.GetCount(); j++) {
+ for(size_t j = 0; j < s->cs.GetCount(); j++) {
CAviFile::strm_t::chunk& c = s->cs[j];
if(c.fKeyFrame) {
nKFs++;
@@ -850,7 +850,7 @@ STDMETHODIMP CAviSplitterFilter::GetKeyFrames(const GUID* pFormat, REFERENCE_TIM bool fConvertToRefTime = !!(*pFormat == TIME_FORMAT_MEDIA_TIME);
- for(int j = 0; j < s->cs.GetCount() && nKFsTmp < nKFs; j++) {
+ for(size_t j = 0; j < s->cs.GetCount() && nKFsTmp < nKFs; j++) {
if(s->cs[j].fKeyFrame) {
pKFs[nKFsTmp++] = fConvertToRefTime ? s->GetRefTime(j, s->cs[j].size) : j;
}
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index 1098429cd..57e154026 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -279,7 +279,7 @@ HRESULT CBaseSplitterOutputPin::DecideBufferSize(IMemAllocator* pAlloc, ALLOCATO HRESULT CBaseSplitterOutputPin::CheckMediaType(const CMediaType* pmt)
{
- for(int i = 0; i < m_mts.GetCount(); i++) {
+ for(size_t i = 0; i < m_mts.GetCount(); i++) {
if(*pmt == m_mts[i]) {
return S_OK;
}
@@ -295,7 +295,7 @@ HRESULT CBaseSplitterOutputPin::GetMediaType(int iPosition, CMediaType* pmt) if(iPosition < 0) {
return E_INVALIDARG;
}
- if(iPosition >= m_mts.GetCount()) {
+ if((size_t)iPosition >= m_mts.GetCount()) {
return VFW_S_NO_MORE_ITEMS;
}
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp index 8c380ebe4..3caea5a6c 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp @@ -1416,7 +1416,7 @@ bool CBaseSplitterFileEx::Read(avchdr& h, int len, CMediaType* pmt) } else if(pos > nalstartpos) {
// Copy into buffer
Seek(nalstartpos);
- int bufsize = countof(h.spspps[index].buffer);
+ unsigned int bufsize = countof(h.spspps[index].buffer);
int len = min(bufsize - h.spspps[index].size, pos - nalstartpos);
ByteRead(h.spspps[index].buffer+h.spspps[index].size, len);
Seek(pos);
diff --git a/src/filters/parser/BaseSplitter/MultiFiles.cpp b/src/filters/parser/BaseSplitter/MultiFiles.cpp index 98b335d59..cd08aec72 100644 --- a/src/filters/parser/BaseSplitter/MultiFiles.cpp +++ b/src/filters/parser/BaseSplitter/MultiFiles.cpp @@ -93,7 +93,7 @@ ULONGLONG CMultiFiles::Seek(LONGLONG lOff, UINT nFrom) return llNewPos.QuadPart;
} else {
- LONGLONG lAbsolutePos = GetAbsolutePosition(lOff, nFrom);
+ ULONGLONG lAbsolutePos = GetAbsolutePosition(lOff, nFrom);
int nNewPart = 0;
ULONGLONG llSum = 0;
@@ -147,12 +147,12 @@ UINT CMultiFiles::Read(void* lpBuf, UINT nCount) break;
}
- if (dwRead != nCount && m_nCurPart < m_strFiles.GetCount()-1) {
+ if (dwRead != nCount && (m_nCurPart < 0 || (size_t)m_nCurPart < m_strFiles.GetCount()-1)) {
OpenPart (m_nCurPart+1);
lpBuf = (void*)((BYTE*)lpBuf + dwRead);
nCount -= dwRead;
}
- } while (nCount != dwRead && m_nCurPart < m_strFiles.GetCount()-1);
+ } while (nCount != dwRead && (m_nCurPart < 0 || (size_t)m_nCurPart < m_strFiles.GetCount()-1));
return dwRead;
}
diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.cpp b/src/filters/parser/DSMSplitter/DSMSplitter.cpp index e2b37a7be..74c148d53 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitter.cpp +++ b/src/filters/parser/DSMSplitter/DSMSplitter.cpp @@ -126,7 +126,7 @@ HRESULT CDSMSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) qsort(ids.GetData(), ids.GetCount(), sizeof(BYTE), compare_id);
- for(int i = 0; i < ids.GetCount(); i++) {
+ for(size_t i = 0; i < ids.GetCount(); i++) {
BYTE id = ids[i];
CMediaType& mt = m_pFile->m_mts[id];
@@ -177,7 +177,7 @@ HRESULT CDSMSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) SetProperty(CStringW(key), value);
}
- for(int i = 0; i < m_resources.GetCount(); i++) {
+ for(size_t i = 0; i < m_resources.GetCount(); i++) {
const CDSMResource& r = m_resources[i];
if(r.mime == "application/x-truetype-font") {
m_fontinst.InstallFont(r.data);
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp index 11ec12404..4d9d97f27 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp @@ -384,7 +384,7 @@ avcsuccess: }
if(AvgTimePerFrame) {
- for(int i = 0; i < mts.GetCount(); i++) {
+ for(size_t i = 0; i < mts.GetCount(); i++) {
if(mts[i].formattype == FORMAT_VideoInfo
|| mts[i].formattype == FORMAT_VideoInfo2
|| mts[i].formattype == FORMAT_MPEG2Video) {
@@ -394,7 +394,7 @@ avcsuccess: }
if(pTE->v.DisplayWidth != 0 && pTE->v.DisplayHeight != 0) {
- for(int i = 0; i < mts.GetCount(); i++) {
+ for(size_t i = 0; i < mts.GetCount(); i++) {
if(mts[i].formattype == FORMAT_VideoInfo) {
DWORD vih1 = FIELD_OFFSET(VIDEOINFOHEADER, bmiHeader);
DWORD vih2 = FIELD_OFFSET(VIDEOINFOHEADER2, bmiHeader);
@@ -485,7 +485,7 @@ avcsuccess: }
int totalsize = 0;
- for(int i = 0; i < sizes.GetCount(); i++) {
+ for(size_t i = 0; i < sizes.GetCount(); i++) {
totalsize += sizes[i];
}
@@ -501,7 +501,7 @@ avcsuccess: pvf2->SamplesPerSec = (DWORD)pTE->a.SamplingFrequency;
pvf2->BitsPerSample = (DWORD)pTE->a.BitDepth;
BYTE* p2 = mt.Format() + sizeof(VORBISFORMAT2);
- for(int i = 0; i < sizes.GetCount(); p += sizes[i], p2 += sizes[i], i++) {
+ for(size_t i = 0; i < sizes.GetCount(); p += sizes[i], p2 += sizes[i], i++) {
memcpy(p2, p, pvf2->HeaderSize[i] = sizes[i]);
}
@@ -650,7 +650,7 @@ avcsuccess: }
}
- for(int i = 0; i < pinOut.GetCount(); i++) {
+ for(size_t i = 0; i < pinOut.GetCount(); i++) {
CAutoPtr<CBaseSplitterOutputPin> pPinOut;
pPinOut.Attach(pinOut[i]);
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp index 0b8ec7062..a0c6b52eb 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp @@ -762,7 +762,7 @@ HRESULT CMpegSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) // Create
if (m_ClipInfo.IsHdmv()) {
- for (int i=0; i<m_ClipInfo.GetStreamNumber(); i++) {
+ for (size_t i=0; i < m_ClipInfo.GetStreamNumber(); i++) {
CHdmvClipInfo::Stream* stream = m_ClipInfo.GetStreamByIndex (i);
if (stream->m_Type == PRESENTATION_GRAPHICS_STREAM) {
m_pFile->AddHdmvPGStream (stream->m_PID, stream->m_LanguageCode);
diff --git a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp index 270af3d9b..70a03fc50 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp @@ -388,7 +388,7 @@ HRESULT CMpegSplitterFile::SearchStreams(__int64 start, __int64 stop, IAsyncRead // each time a new part is open...
// use this code only if Blu-ray is detected
if (m_ClipInfo.IsHdmv()) {
- for (int i=0; i<m_ClipInfo.GetStreamNumber(); i++) {
+ for (size_t i=0; i<m_ClipInfo.GetStreamNumber(); i++) {
CHdmvClipInfo::Stream* stream = m_ClipInfo.GetStreamByIndex(i);
if (stream->m_Type == VIDEO_STREAM_H264 && m_rtMin == 116506666) {
CComQIPtr<ISyncReader> pReader = pAsyncReader;
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp index 2f29c3b21..5614f5f2f 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp @@ -287,7 +287,7 @@ HRESULT CRealMediaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) fccstr[4] = 0;
BYTE* fmt = pmp->typeSpecData.GetData();
- for(int i = 0; i < pmp->typeSpecData.GetCount()-4; i++, fmt++) {
+ for(size_t i = 0; i < pmp->typeSpecData.GetCount()-4; i++, fmt++) {
if(fmt[0] == '.' || fmt[1] == 'r' || fmt[2] == 'a') {
break;
}
diff --git a/src/filters/reader/CDXAReader/CDXAReader.cpp b/src/filters/reader/CDXAReader/CDXAReader.cpp index 82890e0a4..9e75e484e 100644 --- a/src/filters/reader/CDXAReader/CDXAReader.cpp +++ b/src/filters/reader/CDXAReader/CDXAReader.cpp @@ -499,14 +499,14 @@ bool CCDXAStream::LookForMediaSubType() DWORD BytesRead = 0;
if(S_OK == Read(pData, cb, 1, &BytesRead) && cb == BytesRead) {
if(mask.GetCount() < cb) {
- int i = mask.GetCount();
+ size_t i = mask.GetCount();
mask.SetCount(cb);
for(; i < cb; i++) {
mask[i] = 0xff;
}
}
- for(int i = 0; i < cb; i++) {
+ for(unsigned int i = 0; i < cb; i++) {
pData[i] &= (BYTE)mask[i];
}
diff --git a/src/filters/reader/VTSReader/VTSReader.cpp b/src/filters/reader/VTSReader/VTSReader.cpp index 89150182e..492ea028d 100644 --- a/src/filters/reader/VTSReader/VTSReader.cpp +++ b/src/filters/reader/VTSReader/VTSReader.cpp @@ -178,7 +178,7 @@ HRESULT CVTSStream::Read(PBYTE pbBuffer, DWORD dwBytesToRead, BOOL bAlign, LPDWO break;
}
- int size = min(2048 - m_off, min(len, 2048));
+ int size = min(2048 - m_off, (int)min(len, 2048));
memcpy(ptr, &buff[m_off], size);
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp index 572f837ec..37df822eb 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp @@ -964,7 +964,7 @@ HRESULT CMpcAudioRenderer::DoRenderSampleWasapi(IMediaSample *pMediaSample) UINT32 nAvailableBytes=numFramesAvailable*frameSize;
UINT32 nBytesToWrite=nAvailableBytes;
// More room than enough in the output buffer
- if (nAvailableBytes > pInputBufferEnd - pInputBufferPointer) {
+ if (nAvailableBytes > (size_t)(pInputBufferEnd - pInputBufferPointer)) {
nBytesToWrite=pInputBufferEnd - pInputBufferPointer;
numFramesAvailable=(UINT32)((float)nBytesToWrite/frameSize);
}
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp index 5d464f772..1f126b4bc 100644 --- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp @@ -428,7 +428,7 @@ bool CEVRAllocatorPresenter::GetState( DWORD dwMilliSecsTimeout, FILTER_STATE *S CAutoLock lock(&m_SampleQueueLock);
if (m_bSignaledStarvation) {
- int nSamples = max(m_nNbDXSurface / 2, 1);
+ size_t nSamples = max(m_nNbDXSurface / 2, 1);
if ((m_ScheduledSamples.GetCount() < nSamples || m_LastSampleOffset < -m_rtTimePerFrame*2) && !g_bNoDuration) {
*State = (FILTER_STATE)Paused;
_ReturnValue = VFW_S_STATE_INTERMEDIATE;
diff --git a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp index 39e3e632f..3345fab6c 100644 --- a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp @@ -188,7 +188,7 @@ STDMETHODIMP CVMR9AllocatorPresenter::InitializeDevice(DWORD_PTR dwUserID, VMR9A // The surfaces should already be free when InitializeDevice is called
DeleteSurfaces();
- int nOriginal = *lpNumBuffers;
+ DWORD nOriginal = *lpNumBuffers;
if (*lpNumBuffers == 1) {
*lpNumBuffers = 4;
diff --git a/src/filters/source/D2VSource/MPEG2Dec.cpp b/src/filters/source/D2VSource/MPEG2Dec.cpp index 684ef46c6..ad81ecdbb 100644 --- a/src/filters/source/D2VSource/MPEG2Dec.cpp +++ b/src/filters/source/D2VSource/MPEG2Dec.cpp @@ -4430,7 +4430,7 @@ void CMPEG2Dec::Decode(unsigned char *dst, DWORD frame, int pitch) void CMPEG2Dec::Close()
{
- int i;
+ unsigned int i;
for(i = 0; i < VF_GOPLimit; i++) free(GOPList[i]);
for(i = 0; i < VF_FrameLimit; i++) free(FrameList[i]);
diff --git a/src/filters/source/DTSAC3Source/DTSAC3Source.cpp b/src/filters/source/DTSAC3Source/DTSAC3Source.cpp index 4b2136ab3..69594b744 100644 --- a/src/filters/source/DTSAC3Source/DTSAC3Source.cpp +++ b/src/filters/source/DTSAC3Source/DTSAC3Source.cpp @@ -332,7 +332,7 @@ CDTSAC3Stream::CDTSAC3Stream(const WCHAR* wfn, CSource* pParent, HRESULT* phr) break;
m_file.Seek(m_dataOffset, CFile::begin);
BYTE buf[4100];
- UINT len = m_file.Read(&buf, 4100); //4100=4096+4
+ int len = m_file.Read(&buf, 4100); //4100=4096+4
if (len<100) break; //100=96+4
bool isFound = false;
for (int i=1; i<len-4; i++) { // looking for DTS or AC3 sync
@@ -555,7 +555,7 @@ HRESULT CDTSAC3Stream::FillBuffer(IMediaSample* pSample, int nFrame, BYTE* pOut, if(*majortype == MEDIATYPE_Audio) {
m_file.Seek(m_dataOffset + nFrame*m_nBytesPerFrame, CFile::begin);
- if(m_file.Read(pOut, m_nBytesPerFrame) < m_nBytesPerFrame) {
+ if((int)m_file.Read(pOut, m_nBytesPerFrame) < m_nBytesPerFrame) {
return S_FALSE;
}
pOut += m_nBytesPerFrame;
diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp index 0d9252f12..48c3c6338 100644 --- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp @@ -475,7 +475,7 @@ CMediaType CAudioSwitcherFilter::CreateNewOutputMediaType(CMediaType mt, long& c KSDATAFORMAT_SUBTYPE_PCM; // can't happen
wfex->dwChannelMask = 0;
- for(int i = 0; i < m_chs[wfe->nChannels-1].GetCount(); i++) {
+ for(size_t i = 0; i < m_chs[wfe->nChannels-1].GetCount(); i++) {
wfex->dwChannelMask |= m_chs[wfe->nChannels-1][i].Speaker;
}
diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp index 33401195d..50751da34 100644 --- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp +++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp @@ -329,7 +329,7 @@ HRESULT CBaseVideoFilter::CopyBuffer(BYTE* pOut, BYTE** ppIn, int w, int h, int 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) {
+ for(int y = 0; y < h; y++, pOut += pitchOut) {
memset(pOut, 0, pitchOut);
}
}
@@ -339,7 +339,7 @@ HRESULT CBaseVideoFilter::CopyBuffer(BYTE* pOut, BYTE** ppIn, int w, int h, int 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) {
+ for(int y = 0; y < h; y++, pOut += pitchOut) {
memset(pOut, 0, pitchOut);
}
}
@@ -355,7 +355,7 @@ HRESULT CBaseVideoFilter::CopyBuffer(BYTE* pOut, BYTE** ppIn, int w, int h, int // 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) {
+ for(int y = 0; y < h; y++, pOut += pitchOut) {
memset(pOut, 0, pitchOut);
}
}
diff --git a/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.cpp b/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.cpp index 90114c70a..924be92e1 100644 --- a/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.cpp +++ b/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.cpp @@ -193,7 +193,7 @@ void CVideoDecDXVAAllocator::Free() } while (pSample);
if (m_ppRTSurfaceArray) {
- for (long i = 0; i < m_nSurfaceArrayCount; i++) {
+ for (UINT i = 0; i < m_nSurfaceArrayCount; i++) {
if (m_ppRTSurfaceArray[i] != NULL) {
m_ppRTSurfaceArray[i]->Release();
}
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index a10fc2ac5..dcb008767 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -1219,7 +1219,7 @@ HRESULT CMpaDecFilter::ProcessAAC() dwChannelMask = 0;
}
- for(int j = 0; j < info.samples; j += info.channels, dst += info.channels)
+ for(unsigned long j = 0; j < info.samples; j += info.channels, dst += info.channels)
for(int i = 0; i < info.channels; i++) {
dst[chmap[i]] = *src++;
}
@@ -1554,15 +1554,15 @@ HRESULT CMpaDecFilter::ProcessPS2ADPCM() BYTE* end = p + m_buff.GetCount();
WAVEFORMATEXPS2* wfe = (WAVEFORMATEXPS2*)m_pInput->CurrentMediaType().Format();
- int size = wfe->dwInterleave*wfe->nChannels;
- int samples = wfe->dwInterleave * 14 / 16 * 2;
- int channels = wfe->nChannels;
+ DWORD size = wfe->dwInterleave*wfe->nChannels;
+ DWORD samples = wfe->dwInterleave * 14 / 16 * 2;
+ DWORD channels = wfe->nChannels;
CAtlArray<float> pBuff;
pBuff.SetCount(samples*channels);
float* f = pBuff.GetData();
- while(end - p >= size) {
+ while((DWORD)(end - p) >= size) {
DWORD* dw = (DWORD*)p;
if(dw[0] == 'dhSS') {
@@ -1574,13 +1574,13 @@ HRESULT CMpaDecFilter::ProcessPS2ADPCM() if(m_ps2_state.sync) {
double* tmp = DNew double[samples*channels];
- for(int channel = 0, j = 0, k = 0; channel < channels; channel++, j += wfe->dwInterleave)
- for(int i = 0; i < wfe->dwInterleave; i += 16, k += 28) {
+ for(DWORD channel = 0, j = 0, k = 0; channel < channels; channel++, j += wfe->dwInterleave)
+ for(DWORD i = 0; i < wfe->dwInterleave; i += 16, k += 28) {
decodeps2adpcm(m_ps2_state, channel, p + i + j, tmp + k);
}
- for(int i = 0, k = 0; i < samples; i++)
- for(int j = 0; j < channels; j++, k++) {
+ for(DWORD i = 0, k = 0; i < samples; i++)
+ for(DWORD j = 0; j < channels; j++, k++) {
f[k] = (float)tmp[j*samples+i];
}
@@ -2880,7 +2880,7 @@ HRESULT CMpaDecFilter::DeliverFFmpeg(int nCodecId, BYTE* p, int buffsize, int& s if(pBuff.GetCount() > 0) {
int idx_start = pBuffOut.GetCount();
pBuffOut.SetCount( idx_start + pBuff.GetCount() );
- for(int i = 0; i< pBuff.GetCount(); i++) {
+ for(size_t i = 0; i< pBuff.GetCount(); i++) {
pBuffOut[idx_start+i] = pBuff[i];
}
}
|