diff options
52 files changed, 155 insertions, 154 deletions
diff --git a/docs/Changelog.txt b/docs/Changelog.txt index 83403773e..ea3aa922a 100644 --- a/docs/Changelog.txt +++ b/docs/Changelog.txt @@ -3,6 +3,7 @@ next version - not yet released NEW : Add the ability to export MPC-HC settings
NEW : Add the ability to use different mouse button bindings in windowed and
fullscreen modes
+NEW : Add colors controls for all EVR based renderers
NEW : Ticket #372, Add the ability of resetting MPC-HC to its default settings using
either a new button in "Misc" option page or "/reset" command line option.
Be careful, when using this feature ALL your current settings will be lost.
diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp index 20b63762b..ded0d7367 100644 --- a/src/DSUtil/DSUtil.cpp +++ b/src/DSUtil/DSUtil.cpp @@ -1024,11 +1024,11 @@ void memsetd(void* dst, unsigned int c, size_t nbytes) __m128i val = _mm_set1_epi32 ( (int)c );
if (((uintptr_t)dst & 0x0F) == 0) { // 16-byte aligned
- for (ptrdiff_t i = 0; i < o; i+=4) {
+ for (size_t i = 0; i < o; i+=4) {
_mm_store_si128( (__m128i*)&(((DWORD*)dst)[i]), val );
}
} else {
- for (ptrdiff_t i = 0; i < o; i+=4) {
+ for (size_t i = 0; i < o; i+=4) {
_mm_storeu_si128( (__m128i*)&(((DWORD*)dst)[i]), val );
}
}
diff --git a/src/DSUtil/HdmvClipInfo.cpp b/src/DSUtil/HdmvClipInfo.cpp index 0a40a262b..9c8bf9cd9 100644 --- a/src/DSUtil/HdmvClipInfo.cpp +++ b/src/DSUtil/HdmvClipInfo.cpp @@ -275,7 +275,7 @@ HRESULT CHdmvClipInfo::ReadPlaylist(CString strPlaylistFile, REFERENCE_TIME& rtD DWORD dwPos;
DWORD dwTemp;
- SHORT nPlaylistItems;
+ USHORT nPlaylistItems;
dwPos = ReadDword(); // PlayList_start_address
ReadDword(); // PlayListMark_start_address
@@ -366,7 +366,7 @@ HRESULT CHdmvClipInfo::ReadChapters(CString strPlaylistFile, CAtlList<CHdmvClipI }
DWORD dwPos;
- SHORT nMarkCount;
+ USHORT nMarkCount;
ReadDword(); // PlayList_start_address
dwPos = ReadDword(); // PlayListMark_start_address
diff --git a/src/DSUtil/MediaTypes.cpp b/src/DSUtil/MediaTypes.cpp index 5d848238e..48cebc636 100644 --- a/src/DSUtil/MediaTypes.cpp +++ b/src/DSUtil/MediaTypes.cpp @@ -359,7 +359,7 @@ void CorrectMediaType(AM_MEDIA_TYPE* pmt) if(mt.formattype == FORMAT_VideoInfo) {
VIDEOINFOHEADER* vih = (VIDEOINFOHEADER*)mt.pbFormat;
- for(ptrdiff_t i = 0; i < VIHSIZE; i++) {
+ for(UINT i = 0; i < VIHSIZE; i++) {
if(mt.subtype == *vihs[i].subtype
&& vih->bmiHeader.biCompression == vihs[i].vih.bmiHeader.biCompression) {
mt.AllocFormatBuffer(vihs[i].size);
@@ -371,7 +371,7 @@ void CorrectMediaType(AM_MEDIA_TYPE* pmt) } else if(mt.formattype == FORMAT_VideoInfo2) {
VIDEOINFOHEADER2* vih2 = (VIDEOINFOHEADER2*)mt.pbFormat;
- for(ptrdiff_t i = 0; i < VIHSIZE; i++) {
+ for(UINT i = 0; i < VIHSIZE; i++) {
if(mt.subtype == *vih2s[i].subtype
&& vih2->bmiHeader.biCompression == vih2s[i].vih.bmiHeader.biCompression) {
mt.AllocFormatBuffer(vih2s[i].size);
diff --git a/src/DSUtil/SharedInclude.h b/src/DSUtil/SharedInclude.h index 0e875a7d0..777b042f8 100644 --- a/src/DSUtil/SharedInclude.h +++ b/src/DSUtil/SharedInclude.h @@ -1,6 +1,5 @@ #pragma once
-#pragma warning(disable:4018)
#pragma warning(disable:4244)
#ifdef _WIN64
#pragma warning(disable:4267)
diff --git a/src/DSUtil/deinterlace.cpp b/src/DSUtil/deinterlace.cpp index ef5ee9ef5..b945389a7 100644 --- a/src/DSUtil/deinterlace.cpp +++ b/src/DSUtil/deinterlace.cpp @@ -1881,7 +1881,7 @@ mainRowLoop: w = (w + 3) >> 2;
- int y0 = interpField2 ? 1 : 2;
+ uint32 y0 = interpField2 ? 1 : 2;
if (!interpField2)
memcpy(dst, src, w * 4);
diff --git a/src/DSUtil/text.cpp b/src/DSUtil/text.cpp index cf953105c..623609e9c 100644 --- a/src/DSUtil/text.cpp +++ b/src/DSUtil/text.cpp @@ -112,7 +112,7 @@ CStringA UrlEncode(CStringA str, bool fRaw) {
CStringA urlstr;
- for(size_t i = 0; i < str.GetLength(); i++) {
+ for(int i = 0; i < str.GetLength(); i++) {
CHAR c = str[i];
if(fRaw && c == '+') {
urlstr += "%2B";
diff --git a/src/DeCSS/VobFile.cpp b/src/DeCSS/VobFile.cpp index 16c4c56fb..ef5c23b3e 100644 --- a/src/DeCSS/VobFile.cpp +++ b/src/DeCSS/VobFile.cpp @@ -463,7 +463,7 @@ bool CVobFile::Open(CAtlList<CString>& vobs, int offset) }
if(m_files.GetCount() > 0 && CDVDSession::Open(m_files[0].fn)) {
- for(int i = 0; !m_fHasTitleKey && i < m_files.GetCount(); i++) {
+ for(size_t i = 0; !m_fHasTitleKey && i < m_files.GetCount(); i++) {
if(BeginSession()) {
m_fDVD = true;
Authenticate();
@@ -567,13 +567,13 @@ int CVobFile::Seek(int pos) {
pos = min(max(pos+m_offset, m_offset), m_size-1);
- int i = -1;
+ size_t i = 0;
int size = 0;
// this suxx, but won't take long
do {
- size += m_files[++i].size;
- } while(i < m_files.GetCount() && pos >= size);
+ size += m_files[i].size;
+ } while(i++ < m_files.GetCount() && pos >= size);
if(i != m_iFile && i < m_files.GetCount()) {
if(!m_file.Open(m_files[i].fn)) {
@@ -602,7 +602,7 @@ bool CVobFile::Read(BYTE* buff) }
if(!m_file.IsOpen()) {
- if(m_iFile >= m_files.GetCount()-1) {
+ if((size_t)m_iFile >= m_files.GetCount()-1) {
return(false);
}
diff --git a/src/Subtitles/GFN.cpp b/src/Subtitles/GFN.cpp index 8c34e69b3..4b3e8408b 100644 --- a/src/Subtitles/GFN.cpp +++ b/src/Subtitles/GFN.cpp @@ -94,7 +94,7 @@ void GetSubFileNames(CString fn, CAtlArray<CString>& paths, CAtlArray<SubFile>& WIN32_FIND_DATA wfd, wfd2;
HANDLE hFile, hFile2;
- for(ptrdiff_t k = 0; k < paths.GetCount(); k++) {
+ for(size_t k = 0; k < paths.GetCount(); k++) {
CString path = paths[k];
path.Replace('\\', '/');
diff --git a/src/Subtitles/RTS.cpp b/src/Subtitles/RTS.cpp index 871ef9cc1..3b8ada52f 100644 --- a/src/Subtitles/RTS.cpp +++ b/src/Subtitles/RTS.cpp @@ -251,7 +251,7 @@ void CWord::Transform_C( CPoint &org ) }
#endif
- for(ptrdiff_t i = 0; i < mPathPoints; i++) {
+ for (size_t i = 0; i < mPathPoints; i++) {
double x, y, z, xx, yy, zz;
x = mpPathPoints[i].x;
@@ -841,20 +841,20 @@ bool CPolygon::ParseStr() int minx = INT_MAX, miny = INT_MAX, maxx = -INT_MAX, maxy = -INT_MAX;
- for(i = 0; i < m_pathTypesOrg.GetCount(); i++) {
- m_pathPointsOrg[i].x = (int)(64 * m_scalex * m_pathPointsOrg[i].x);
- m_pathPointsOrg[i].y = (int)(64 * m_scaley * m_pathPointsOrg[i].y);
- if(minx > m_pathPointsOrg[i].x) {
- minx = m_pathPointsOrg[i].x;
+ for (size_t k = 0; k < m_pathTypesOrg.GetCount(); k++) {
+ m_pathPointsOrg[k].x = (int)(64 * m_scalex * m_pathPointsOrg[k].x);
+ m_pathPointsOrg[k].y = (int)(64 * m_scaley * m_pathPointsOrg[k].y);
+ if (minx > m_pathPointsOrg[k].x) {
+ minx = m_pathPointsOrg[k].x;
}
- if(miny > m_pathPointsOrg[i].y) {
- miny = m_pathPointsOrg[i].y;
+ if (miny > m_pathPointsOrg[k].y) {
+ miny = m_pathPointsOrg[k].y;
}
- if(maxx < m_pathPointsOrg[i].x) {
- maxx = m_pathPointsOrg[i].x;
+ if (maxx < m_pathPointsOrg[k].x) {
+ maxx = m_pathPointsOrg[k].x;
}
- if(maxy < m_pathPointsOrg[i].y) {
- maxy = m_pathPointsOrg[i].y;
+ if (maxy < m_pathPointsOrg[k].y) {
+ maxy = m_pathPointsOrg[k].y;
}
}
@@ -869,7 +869,7 @@ bool CPolygon::ParseStr() m_ascent = ((int)(m_style.fontScaleY/100 * m_ascent) + 4) >> 3;
m_descent = ((int)(m_style.fontScaleY/100 * m_descent) + 4) >> 3;
- return(true);
+ return true;
}
bool CPolygon::CreatePath()
@@ -1642,23 +1642,23 @@ void CScreenLayoutAllocator::Empty() void CScreenLayoutAllocator::AdvanceToSegment(int segment, const CAtlArray<int>& sa)
{
POSITION pos = m_subrects.GetHeadPosition();
- while(pos) {
+ while (pos) {
POSITION prev = pos;
SubRect& sr = m_subrects.GetNext(pos);
bool fFound = false;
- if(abs(sr.segment - segment) <= 1) { // using abs() makes it possible to play the subs backwards, too :)
- for(ptrdiff_t i = 0; i < sa.GetCount() && !fFound; i++) {
- if(sa[i] == sr.entry) {
+ if (abs(sr.segment - segment) <= 1) { // using abs() makes it possible to play the subs backwards, too :)
+ for (size_t i = 0; i < sa.GetCount() && !fFound; i++) {
+ if (sa[i] == sr.entry) {
sr.segment = segment;
fFound = true;
}
}
}
- if(!fFound) {
+ if (!fFound) {
m_subrects.RemoveAt(prev);
}
}
@@ -2951,7 +2951,7 @@ bool CRenderedTextSubtitle::ParseHtmlTag(CSubtitle* sub, CStringW str, STSStyle& style.fStrikeOut = !fClosing ? true : org.fStrikeOut;
} else if(tag == L"font") {
if(!fClosing) {
- for(i = 0; i < attribs.GetCount(); i++) {
+ for(size_t i = 0; i < attribs.GetCount(); i++) {
if(params[i].IsEmpty()) {
continue;
}
diff --git a/src/Subtitles/Rasterizer.cpp b/src/Subtitles/Rasterizer.cpp index 712c5cbd7..da585a492 100644 --- a/src/Subtitles/Rasterizer.cpp +++ b/src/Subtitles/Rasterizer.cpp @@ -1388,6 +1388,7 @@ void Rasterizer::Draw_Alpha_sp_noBody_sse2(RasterizerNfo& rnfo) int gran = min(rnfo.sw[3]+1-rnfo.xo,rnfo.w);
int color2 = rnfo.sw[2];
UNUSED_ALWAYS(color2);
+
while(h--) {
#ifdef _VSMOD // patch m006. moveable vector clip
for(int wt=0; wt<gran; ++wt) {
diff --git a/src/Subtitles/STS.cpp b/src/Subtitles/STS.cpp index 429dc4d07..456602606 100644 --- a/src/Subtitles/STS.cpp +++ b/src/Subtitles/STS.cpp @@ -260,7 +260,7 @@ int FindChar(CStringW str, WCHAR c, int pos, bool fUnicode, int CharSet) DWORD cp = CharSetToCodePage(CharSet);
int OrgCharSet = CharSet;
- for(size_t i = 0, j = str.GetLength(), k; i < j; i++) {
+ for(int i = 0, j = str.GetLength(), k; i < j; i++) {
WCHAR c2 = str[i];
if(IsDBCSLeadByteEx(cp, (BYTE)c2)) {
@@ -581,7 +581,7 @@ static bool OpenSubViewer(CTextFile* file, CSimpleTextSubtitle& ret, int CharSet }
if(buff[0] == '[') {
- for(size_t i = 0; i < buff.GetLength() && buff[i]== '['; ) {
+ for(int i = 0; i < buff.GetLength() && buff[i]== '['; ) {
int j = buff.Find(']', ++i);
if(j < i) {
break;
@@ -2143,7 +2143,7 @@ void CSimpleTextSubtitle::Add(CStringW str, bool fUnicode, int start, int end, C m_segments.InsertAt(0, stss);
}
- for(ptrdiff_t i = 0; i < m_segments.GetCount(); i++) {
+ for(size_t i = 0; i < m_segments.GetCount(); i++) {
STSSegment& s = m_segments[i];
if(start >= s.end) {
@@ -2249,7 +2249,7 @@ void CSimpleTextSubtitle::ChangeUnknownStylesToDefault() CAtlMap<CString, STSStyle*, CStringElementTraits<CString> > unknown;
bool fReport = true;
- for(ptrdiff_t i = 0; i < GetCount(); i++) {
+ for(size_t i = 0; i < GetCount(); i++) {
STSEntry& stse = GetAt(i);
STSStyle* val;
@@ -2483,13 +2483,13 @@ const STSSegment* CSimpleTextSubtitle::SearchSubs(int t, double fps, /*[out]*/ i }
}
- if(0 <= ret && ret < m_segments.GetCount()) {
+ if(0 <= ret && (size_t)ret < m_segments.GetCount()) {
if(iSegment) {
*iSegment = ret;
}
}
- if(0 <= ret && ret < m_segments.GetCount()
+ if(0 <= ret && (size_t)ret < m_segments.GetCount()
&& m_segments[ret].subs.GetCount() > 0
&& TranslateSegmentStart(ret, fps) <= t && t < TranslateSegmentEnd(ret, fps)) {
return(&m_segments[ret]);
@@ -2500,7 +2500,7 @@ const STSSegment* CSimpleTextSubtitle::SearchSubs(int t, double fps, /*[out]*/ i int CSimpleTextSubtitle::TranslateStart(int i, double fps)
{
- return(i < 0 || GetCount() <= i ? -1 :
+ return(i < 0 || GetCount() <= (size_t)i ? -1 :
m_mode == TIME ? GetAt(i).start :
m_mode == FRAME ? (int)(GetAt(i).start*1000/fps) :
0);
@@ -2508,7 +2508,7 @@ int CSimpleTextSubtitle::TranslateStart(int i, double fps) int CSimpleTextSubtitle::TranslateEnd(int i, double fps)
{
- return(i < 0 || GetCount() <= i ? -1 :
+ return(i < 0 || GetCount() <= (size_t)i ? -1 :
m_mode == TIME ? GetAt(i).end :
m_mode == FRAME ? (int)(GetAt(i).end*1000/fps) :
0);
@@ -2516,7 +2516,7 @@ int CSimpleTextSubtitle::TranslateEnd(int i, double fps) int CSimpleTextSubtitle::TranslateSegmentStart(int i, double fps)
{
- return(i < 0 || m_segments.GetCount() <= i ? -1 :
+ return(i < 0 || m_segments.GetCount() <= (size_t)i ? -1 :
m_mode == TIME ? m_segments[i].start :
m_mode == FRAME ? (int)(m_segments[i].start*1000/fps) :
0);
@@ -2524,7 +2524,7 @@ int CSimpleTextSubtitle::TranslateSegmentStart(int i, double fps) int CSimpleTextSubtitle::TranslateSegmentEnd(int i, double fps)
{
- return(i < 0 || m_segments.GetCount() <= i ? -1 :
+ return(i < 0 || m_segments.GetCount() <= (size_t)i ? -1 :
m_mode == TIME ? m_segments[i].end :
m_mode == FRAME ? (int)(m_segments[i].end*1000/fps) :
0);
@@ -2700,7 +2700,7 @@ void CSimpleTextSubtitle::CreateSegments() {
m_segments.RemoveAll();
- int i, j;
+ size_t i, j;
CAtlArray<int> breakpoints;
diff --git a/src/Subtitles/TextFile.cpp b/src/Subtitles/TextFile.cpp index 2a64547a8..fe85256b7 100644 --- a/src/Subtitles/TextFile.cpp +++ b/src/Subtitles/TextFile.cpp @@ -187,7 +187,7 @@ void CTextFile::WriteString(LPCWSTR lpsz/*CStringW str*/) Write((LPCSTR)stra, stra.GetLength());
} else if(m_encoding == UTF8) {
str.Replace(L"\n", L"\r\n");
- for(size_t i = 0; i < str.GetLength(); i++) {
+ for(int i = 0; i < str.GetLength(); i++) {
DWORD c = (WORD)str[i];
if(0 <= c && c < 0x80) { // 0xxxxxxx
@@ -211,7 +211,7 @@ void CTextFile::WriteString(LPCWSTR lpsz/*CStringW str*/) Write((LPCWSTR)str, str.GetLength()*2);
} else if(m_encoding == BE16) {
str.Replace(L"\n", L"\r\n");
- for(size_t i = 0; i < str.GetLength(); i++) {
+ for(int i = 0; i < str.GetLength(); i++) {
str.SetAt(i, ((str[i]>>8)&0x00ff)|((str[i]<<8)&0xff00));
}
Write((LPCWSTR)str, str.GetLength()*2);
diff --git a/src/Subtitles/USFSubtitles.cpp b/src/Subtitles/USFSubtitles.cpp index f50de280c..1ebefa9be 100644 --- a/src/Subtitles/USFSubtitles.cpp +++ b/src/Subtitles/USFSubtitles.cpp @@ -64,7 +64,7 @@ static CStringW GetXML(CComPtr<IXMLDOMNode> pNode) CStringW str(bstr);
str.Remove('\r');
str.Replace('\n', ' ');
- for(size_t i = 0; (i = str.Find(L" ", i)) >= 0; ) {
+ for(int i = 0; (i = str.Find(L" ", i)) >= 0; ) {
for(++i; i < str.GetLength() && (str[i] == ' ');) {
str.Delete(i);
}
diff --git a/src/Subtitles/VobSubFile.cpp b/src/Subtitles/VobSubFile.cpp index cdd3a480d..e5b28e2b8 100644 --- a/src/Subtitles/VobSubFile.cpp +++ b/src/Subtitles/VobSubFile.cpp @@ -237,7 +237,7 @@ bool CVobSubFile::Copy(CVobSubFile& vsf) dst.name = src.name;
dst.alt = src.alt;
- for(ptrdiff_t j = 0; j < src.subpos.GetCount(); j++) {
+ for(size_t j = 0; j < src.subpos.GetCount(); j++) {
SubPos& sp = src.subpos[j];
if(!sp.fValid) {
continue;
@@ -320,7 +320,7 @@ bool CVobSubFile::Open(CString fn) for(ptrdiff_t i = 0; i < 32; i++) {
CAtlArray<SubPos>& sp = m_langs[i].subpos;
- for(ptrdiff_t j = 0; j < sp.GetCount(); j++) {
+ for(size_t j = 0; j < sp.GetCount(); j++) {
sp[j].stop = sp[j].start;
sp[j].fForced = false;
@@ -1031,7 +1031,7 @@ bool CVobSubFile::WriteIdx(CString fn) char vobid = -1, cellid = -1;
- for(ptrdiff_t j = 0; j < sp.GetCount(); j++) {
+ for(size_t j = 0; j < sp.GetCount(); j++) {
if(!sp[j].fValid) {
continue;
}
@@ -1093,7 +1093,7 @@ BYTE* CVobSubFile::GetPacket(int idx, int& packetsize, int& datasize, int iLang) CAtlArray<SubPos>& sp = m_langs[iLang].subpos;
do {
- if(idx < 0 || idx >= sp.GetCount()) {
+ if(idx < 0 || (size_t)idx >= sp.GetCount()) {
break;
}
@@ -1156,7 +1156,7 @@ bool CVobSubFile::GetFrame(int idx, int iLang) }
CAtlArray<SubPos>& sp = m_langs[iLang].subpos;
- if(idx < 0 || idx >= sp.GetCount()) {
+ if(idx < 0 || (size_t)idx >= sp.GetCount()) {
return(false);
}
@@ -1169,13 +1169,13 @@ bool CVobSubFile::GetFrame(int idx, int iLang) }
m_img.start = sp[idx].start;
- m_img.delay = idx < (sp.GetCount()-1)
+ m_img.delay = (size_t)idx < (sp.GetCount()-1)
? sp[idx+1].start - sp[idx].start
: 3000;
bool ret = m_img.Decode(buff, packetsize, datasize, m_fCustomPal, m_tridx, m_orgpal, m_cuspal, true);
- if(idx < (sp.GetCount()-1)) {
+ if((size_t)idx < (sp.GetCount()-1)) {
m_img.delay = min(m_img.delay, sp[idx+1].start - m_img.start);
}
@@ -1685,7 +1685,7 @@ bool CVobSubFile::SaveWinSubMux(CString fn) }
CAtlArray<SubPos>& sp = m_langs[m_iLang].subpos;
- for(ptrdiff_t i = 0; i < sp.GetCount(); i++) {
+ for(size_t i = 0; i < sp.GetCount(); i++) {
if(!GetFrame(i)) {
continue;
}
@@ -1920,7 +1920,7 @@ bool CVobSubFile::SaveScenarist(CString fn) int pc[4] = {1, 1, 1, 1}, pa[4] = {15, 15, 15, 0};
CAtlArray<SubPos>& sp = m_langs[m_iLang].subpos;
- for(ptrdiff_t i = 0, k = 0; i < sp.GetCount(); i++) {
+ for(size_t i = 0, k = 0; i < sp.GetCount(); i++) {
if(!GetFrame(i)) {
continue;
}
@@ -2150,7 +2150,7 @@ bool CVobSubFile::SaveMaestro(CString fn) int pc[4] = {1,1,1,1}, pa[4] = {15,15,15,0};
CAtlArray<SubPos>& sp = m_langs[m_iLang].subpos;
- for(ptrdiff_t i = 0, k = 0; i < sp.GetCount(); i++) {
+ for(size_t i = 0, k = 0; i < sp.GetCount(); i++) {
if(!GetFrame(i)) {
continue;
}
diff --git a/src/Subtitles/VobSubFileRipper.cpp b/src/Subtitles/VobSubFileRipper.cpp index 86fde3f8d..39505c4de 100644 --- a/src/Subtitles/VobSubFileRipper.cpp +++ b/src/Subtitles/VobSubFileRipper.cpp @@ -522,7 +522,7 @@ bool CVobSubFileRipper::Create() {
CAutoLock cAutoLock(&m_csAccessLock);
- if(m_rd.iSelPGC < 0 || m_rd.iSelPGC >= m_rd.pgcs.GetCount()) {
+ if(m_rd.iSelPGC < 0 || (size_t)m_rd.iSelPGC >= m_rd.pgcs.GetCount()) {
Log(LOG_ERROR, _T("Invalid program chain number (%d)!"), m_rd.iSelPGC);
return(false);
}
@@ -578,7 +578,7 @@ bool CVobSubFileRipper::Create() CAtlMap<DWORD, int> selvcmap;
selvcmap.RemoveAll();
- for(ptrdiff_t i = 0; i < m_rd.selvcs.GetCount(); i++) {
+ for(size_t i = 0; i < m_rd.selvcs.GetCount(); i++) {
selvcmap[m_rd.selvcs[i]] = 90000;
}
@@ -587,7 +587,7 @@ bool CVobSubFileRipper::Create() if(m_vob.IsDVD()) {
Log(LOG_INFO, _T("Indexing mode: DVD"));
- for(ptrdiff_t i = 0; i < angle.GetCount(); i++) {
+ for(size_t i = 0; i < angle.GetCount(); i++) {
DWORD vc = (angle[i].vob<<16)|angle[i].cell;
if(!selvcmap.Lookup(vc)) {
continue;
@@ -602,7 +602,7 @@ bool CVobSubFileRipper::Create() } else if(LoadChunks(loadedchunks)) {
Log(LOG_INFO, _T("Indexing mode: File"));
- for(ptrdiff_t i = 0; i < loadedchunks.GetCount(); i++) {
+ for(size_t i = 0; i < loadedchunks.GetCount(); i++) {
DWORD vcid = loadedchunks[i].vc;
if(!selvcmap.Lookup(vcid)) {
continue;
@@ -621,11 +621,11 @@ bool CVobSubFileRipper::Create() }
__int64 sizedone = 0, sizetotal = 0;
- for(ptrdiff_t i = 0; i < chunks.GetCount(); i++) {
+ for(size_t i = 0; i < chunks.GetCount(); i++) {
sizetotal += chunks[i].end - chunks[i].start;
}
- for(ptrdiff_t i = 0; !m_fBreakThread && i < chunks.GetCount(); i++) {
+ for(size_t i = 0; !m_fBreakThread && i < chunks.GetCount(); i++) {
__int64 curpos = chunks[i].start, endpos = chunks[i].end;
vcchunk curchunk = {curpos, curpos, chunks[i].vc};
@@ -722,7 +722,7 @@ bool CVobSubFileRipper::Create() tOffset = tTotal = 0;
- for(ptrdiff_t i = 0; i < angle.GetCount(); i++) {
+ for(size_t i = 0; i < angle.GetCount(); i++) {
if(angle[i].vob == vob && angle[i].cell == cell) {
tPrevOffset = tOffset;
tOffset = (__int64)angle[i].tOffset;
@@ -1003,7 +1003,7 @@ STDMETHODIMP CVobSubFileRipper::LoadParamFile(CString fn) phase = P_PGC;
} else if(phase == P_PGC) {
m_rd.iSelPGC = _tcstol(line, NULL, 10)-1;
- if(m_rd.iSelPGC < 0 || m_rd.iSelPGC >= m_rd.pgcs.GetCount()) {
+ if(m_rd.iSelPGC < 0 || (size_t)m_rd.iSelPGC >= m_rd.pgcs.GetCount()) {
break;
}
phase = P_ANGLE;
@@ -1028,7 +1028,7 @@ STDMETHODIMP CVobSubFileRipper::LoadParamFile(CString fn) if(*s == 'v' || s == e-1) {
s++;
if(vob != 0 && cell == 0) {
- for(ptrdiff_t i = 0; i < angle.GetCount(); i++) {
+ for(size_t i = 0; i < angle.GetCount(); i++) {
if(angle[i].vob == vob) {
m_rd.selvcs.Add((angle[i].vob<<16)|angle[i].cell);
}
@@ -1041,7 +1041,7 @@ STDMETHODIMP CVobSubFileRipper::LoadParamFile(CString fn) s++;
cell = _tcstol(s, &s, 10);
- for(ptrdiff_t i = 0; i < angle.GetCount(); i++) {
+ for(size_t i = 0; i < angle.GetCount(); i++) {
if(angle[i].vob == vob && angle[i].cell == cell) {
m_rd.selvcs.Add((vob<<16)|cell);
break;
@@ -1052,7 +1052,7 @@ STDMETHODIMP CVobSubFileRipper::LoadParamFile(CString fn) }
}
} else {
- for(ptrdiff_t i = 0; i < angle.GetCount(); i++) {
+ for(size_t i = 0; i < angle.GetCount(); i++) {
m_rd.selvcs.Add((angle[i].vob<<16)|angle[i].cell);
}
}
diff --git a/src/Subtitles/VobSubImage.cpp b/src/Subtitles/VobSubImage.cpp index d8cea8327..4edcd2d85 100644 --- a/src/Subtitles/VobSubImage.cpp +++ b/src/Subtitles/VobSubImage.cpp @@ -1145,7 +1145,7 @@ bool CVobSubImage::Polygonize(CAtlArray<BYTE>& pathTypes, CAtlArray<CPoint>& pat pos = ol->GetHeadPosition();
while(pos) {
CAtlArray<CPoint>& pa = ol->GetNext(pos)->pa;
- for(ptrdiff_t i = 0; i < pa.GetCount(); i++) {
+ for(size_t i = 0; i < pa.GetCount(); i++) {
pa[i].x = (pa[i].x-topleft.x)<<scale;
pa[i].y = (pa[i].y-topleft.y)<<scale;
}
diff --git a/src/Subtitles/libssf/Rasterizer.cpp b/src/Subtitles/libssf/Rasterizer.cpp index 19497c732..c7c9c3382 100644 --- a/src/Subtitles/libssf/Rasterizer.cpp +++ b/src/Subtitles/libssf/Rasterizer.cpp @@ -644,7 +644,7 @@ namespace ssf int y = (ysub + mOffsetY + (1<<FONT_AA)/2) >> FONT_AA;
int w = mOverlayWidth;
int h = mOverlayHeight;
- int xo = 0, yo = 0;
+ unsigned int xo = 0, yo = 0;
if(x < r.left) {
xo = r.left - x;
@@ -691,7 +691,7 @@ namespace ssf const DWORD* sw = switchpts;
if(fSSE2)
- for(int wt=0; wt<w; ++wt) {
+ for(unsigned int wt=0; wt<(unsigned int)w; ++wt) {
if(wt+xo >= sw[1]) {
while(wt+xo >= sw[1]) {
sw += 2;
@@ -701,7 +701,7 @@ namespace ssf pixmix_sse2(&dst[wt], color, src[wt*4]);
}
else
- for(int wt=0; wt<w; ++wt) {
+ for(unsigned int wt=0; wt<(unsigned int)w; ++wt) {
if(wt+xo >= sw[1]) {
while(wt+xo >= sw[1]) {
sw += 2;
diff --git a/src/apps/mplayerc/MainFrm.cpp b/src/apps/mplayerc/MainFrm.cpp index e242f707e..271de2fdd 100644 --- a/src/apps/mplayerc/MainFrm.cpp +++ b/src/apps/mplayerc/MainFrm.cpp @@ -4051,7 +4051,7 @@ void CMainFrame::OnDvdSub(UINT nID) nNextStream = (nID==0?0:ulStreamsAvailable-1);
}
- if (!bIsDisabled && ((nNextStream < 0) || (nNextStream >= ulStreamsAvailable))) {
+ if (!bIsDisabled && ((nNextStream < 0) || ((ULONG)nNextStream >= ulStreamsAvailable))) {
pDVDC->SetSubpictureState(FALSE, DVD_CMD_FLAG_Block, NULL);
m_OSD.DisplayMessage (OSD_TOPLEFT, ResStr(IDS_SUBTITLE_STREAM_OFF));
} else {
@@ -8303,7 +8303,7 @@ void CMainFrame::OnNavigateSkip(UINT nID) }
}
- if (i >= 0 && i < nChapters) {
+ if (i >= 0 && (DWORD)i < nChapters) {
SeekTo(rt);
SendStatusMessage(ResStr(IDS_AG_CHAPTER2) + CString(name), 3000);
@@ -9319,7 +9319,7 @@ void CMainFrame::SetDefaultWindowRect(int iMonitor) iMonitor--;
CAtlArray<HMONITOR> ml;
EnumDisplayMonitors(NULL, NULL, MonitorEnumProc, (LPARAM)&ml);
- if (iMonitor < ml.GetCount()) {
+ if ((size_t)iMonitor < ml.GetCount()) {
hMonitor = ml[iMonitor];
}
}
@@ -11910,7 +11910,7 @@ int CMainFrame::SearchInDir(bool DirForward) }
qsort(f_array.GetData(), f_array.GetCount(), sizeof(fileName), compare);
- for (int i = 0; i < f_array.GetCount(); i++) {
+ for (size_t i = 0; i < f_array.GetCount(); i++) {
sl.AddTail(f_array[i].fn);
}
@@ -13570,7 +13570,7 @@ void CMainFrame::SeekTo(REFERENCE_TIME rtPos, bool fSeekToKeyFrame) if (fSeekToKeyFrame) {
if (!m_kfs.IsEmpty()) {
int i = rangebsearch(rtPos, m_kfs);
- if (i >= 0 && i < m_kfs.GetCount()) {
+ if (i >= 0 && (size_t)i < m_kfs.GetCount()) {
rtPos = m_kfs[i];
}
}
diff --git a/src/apps/mplayerc/MediaFormats.cpp b/src/apps/mplayerc/MediaFormats.cpp index c3d312ec7..08062e3a0 100644 --- a/src/apps/mplayerc/MediaFormats.cpp +++ b/src/apps/mplayerc/MediaFormats.cpp @@ -272,7 +272,7 @@ void CMediaFormats::UpdateData(bool fSave) m_fRtspFileExtFirst = !!AfxGetApp()->GetProfileInt(_T("FileFormats"), _T("RtspFileExtFirst"), 1);
}
- for (int i = 0; i < GetCount(); i++) {
+ for (size_t i = 0; i < GetCount(); i++) {
GetAt(i).UpdateData(fSave);
}
}
@@ -314,7 +314,7 @@ engine_t CMediaFormats::GetEngine(CString path) }
}
- for (int i = 0; i < GetCount(); i++) {
+ for (size_t i = 0; i < GetCount(); i++) {
CMediaFormatCategory& mfc = GetAt(i);
if (mfc.FindExt(ext)) {
return mfc.GetEngineType();
@@ -334,7 +334,7 @@ bool CMediaFormats::FindExt(CString ext, bool fAudioOnly) ext.TrimLeft(_T("."));
if (!ext.IsEmpty()) {
- for (int i = 0; i < GetCount(); i++) {
+ for (size_t i = 0; i < GetCount(); i++) {
CMediaFormatCategory& mfc = GetAt(i);
if ((!fAudioOnly || mfc.IsAudioOnly()) && mfc.FindExt(ext)) {
return(true);
@@ -352,7 +352,7 @@ void CMediaFormats::GetFilter(CString& filter, CAtlArray<CString>& mask) filter += ResStr(IDS_AG_MEDIAFILES);
mask.Add(_T(""));
- for (int i = 0; i < GetCount(); i++) {
+ for (size_t i = 0; i < GetCount(); i++) {
strTemp = GetAt(i).GetFilter() + _T(";");
mask[0] += strTemp;
filter += strTemp;
@@ -361,7 +361,7 @@ void CMediaFormats::GetFilter(CString& filter, CAtlArray<CString>& mask) filter.TrimRight(_T(";"));
filter += _T("|");
- for (int i = 0; i < GetCount(); i++) {
+ for (size_t i = 0; i < GetCount(); i++) {
CMediaFormatCategory& mfc = GetAt(i);
filter += mfc.GetDescription() + _T("|" + GetAt(i).GetFilter() + _T("|"));
mask.Add(mfc.GetFilter());
@@ -379,7 +379,7 @@ void CMediaFormats::GetAudioFilter(CString& filter, CAtlArray<CString>& mask) filter += ResStr(IDS_AG_AUDIOFILES);
mask.Add(_T(""));
- for (int i = 0; i < GetCount(); i++) {
+ for (size_t i = 0; i < GetCount(); i++) {
CMediaFormatCategory& mfc = GetAt(i);
if (!mfc.IsAudioOnly() || mfc.GetEngineType() != DirectShow) {
continue;
@@ -393,7 +393,7 @@ void CMediaFormats::GetAudioFilter(CString& filter, CAtlArray<CString>& mask) filter.TrimRight(_T(";"));
filter += _T("|");
- for (int i = 0; i < GetCount(); i++) {
+ for (size_t i = 0; i < GetCount(); i++) {
CMediaFormatCategory& mfc = GetAt(i);
if (!mfc.IsAudioOnly() || mfc.GetEngineType() != DirectShow) {
continue;
diff --git a/src/apps/mplayerc/PPageFullscreen.cpp b/src/apps/mplayerc/PPageFullscreen.cpp index bedc9f461..6875f4f73 100644 --- a/src/apps/mplayerc/PPageFullscreen.cpp +++ b/src/apps/mplayerc/PPageFullscreen.cpp @@ -162,22 +162,22 @@ BOOL CPPageFullscreen::OnApply() m_AutoChangeFullscrRes.bEnabled = !!m_fSetFullscreenRes;
if (m_AutoChangeFullscrRes.bEnabled) {
- if (iSel_24 >= 0 && iSel_24 < m_dms.GetCount()) {
+ if (iSel_24 >= 0 && (size_t)iSel_24 < m_dms.GetCount()) {
m_AutoChangeFullscrRes.dmFullscreenRes24Hz = m_dms[m_dispmode24combo.GetCurSel()];
}
- if (iSel_25 >= 0 && iSel_25 < m_dms.GetCount()) {
+ if (iSel_25 >= 0 && (size_t)iSel_25 < m_dms.GetCount()) {
m_AutoChangeFullscrRes.dmFullscreenRes25Hz = m_dms[m_dispmode25combo.GetCurSel()];
}
- if (iSel_30 >= 0 && iSel_30 < m_dms.GetCount()) {
+ if (iSel_30 >= 0 && (size_t)iSel_30 < m_dms.GetCount()) {
m_AutoChangeFullscrRes.dmFullscreenRes30Hz = m_dms[m_dispmode30combo.GetCurSel()];
}
- if (iSel_Other >= 0 && iSel_Other < m_dms.GetCount()) {
+ if (iSel_Other >= 0 && (size_t)iSel_Other < m_dms.GetCount()) {
m_AutoChangeFullscrRes.dmFullscreenResOther = m_dms[m_dispmodeOthercombo.GetCurSel()];
}
- if (iSel_23 >= 0 && iSel_23 < m_dms.GetCount()) {
+ if (iSel_23 >= 0 && (size_t)iSel_23 < m_dms.GetCount()) {
m_AutoChangeFullscrRes.dmFullscreenRes23d976Hz = m_dms[m_dispmode23d976combo.GetCurSel()];
}
- if (iSel_29 >= 0 && iSel_29 < m_dms.GetCount()) {
+ if (iSel_29 >= 0 && (size_t)iSel_29 < m_dms.GetCount()) {
m_AutoChangeFullscrRes.dmFullscreenRes29d97Hz = m_dms[m_dispmode29d97combo.GetCurSel()];
}
}
diff --git a/src/apps/mplayerc/PPageTweaks.cpp b/src/apps/mplayerc/PPageTweaks.cpp index 0ef49fc18..40e5d6811 100644 --- a/src/apps/mplayerc/PPageTweaks.cpp +++ b/src/apps/mplayerc/PPageTweaks.cpp @@ -124,7 +124,7 @@ BOOL CPPageTweaks::OnInitDialog() CAtlArray<CString> fntl;
EnumFontFamilies(dc, NULL,(FONTENUMPROC)EnumFontProc, (LPARAM)&fntl);
DeleteDC(dc);
- for (int i=0; i< fntl.GetCount(); i++) {
+ for (size_t i=0; i< fntl.GetCount(); i++) {
if (i>0 && fntl[i-1] == fntl[i]) {
continue;
}
diff --git a/src/apps/mplayerc/PlayerCaptureDialog.cpp b/src/apps/mplayerc/PlayerCaptureDialog.cpp index 143f748e3..5339cb279 100644 --- a/src/apps/mplayerc/PlayerCaptureDialog.cpp +++ b/src/apps/mplayerc/PlayerCaptureDialog.cpp @@ -1134,7 +1134,7 @@ void CPlayerCaptureDialog::SetupAudioControls( if (pAMAIM.GetCount() > 0) {
m_pAMAIM.Copy(pAMAIM);
- size_t iSel = -1;
+ size_t iSel = MAXSIZE_T;
for (size_t i = 0; i < m_pAMAIM.GetCount(); i++) {
CComQIPtr<IPin> pPin = m_pAMAIM[i];
diff --git a/src/apps/mplayerc/PlayerPlaylistBar.cpp b/src/apps/mplayerc/PlayerPlaylistBar.cpp index 4a394b331..8c0dc6efa 100644 --- a/src/apps/mplayerc/PlayerPlaylistBar.cpp +++ b/src/apps/mplayerc/PlayerPlaylistBar.cpp @@ -175,7 +175,7 @@ static bool SearchFiles(CString mask, CAtlList<CString>& sl) CString path = dir + fd.cFileName;
if (!fFilterKnownExts || mf.FindExt(ext)) {
- for (int i = 0; i < mf.GetCount(); i++) {
+ for (size_t i = 0; i < mf.GetCount(); i++) {
CMediaFormatCategory& mfc = mf.GetAt(i);
/* playlist files are skipped when playing the contents of an entire directory */
if ((mfc.FindExt(ext)) && (mf[i].GetLabel().CompareNoCase(_T("pls")) != 0)) {
@@ -373,7 +373,7 @@ bool CPlayerPlaylistBar::ParseMPCPlayList(CString fn) }
qsort(idx.GetData(), idx.GetCount(), sizeof(int), s_int_comp);
- for (int i = 0; i < idx.GetCount(); i++) {
+ for (size_t i = 0; i < idx.GetCount(); i++) {
m_pl.AddTail(pli[idx[i]]);
}
diff --git a/src/apps/mplayerc/PlayerSubresyncBar.cpp b/src/apps/mplayerc/PlayerSubresyncBar.cpp index 382e87116..0c8140b19 100644 --- a/src/apps/mplayerc/PlayerSubresyncBar.cpp +++ b/src/apps/mplayerc/PlayerSubresyncBar.cpp @@ -443,7 +443,7 @@ void CPlayerSubresyncBar::UpdateStrings() void CPlayerSubresyncBar::GetCheck(int iItem, bool& fStartMod, bool& fEndMod, bool& fStartAdj, bool& fEndAdj)
{
- if (0 <= iItem && iItem < m_sts.GetCount()) {
+ if (0 <= iItem && (size_t)iItem < m_sts.GetCount()) {
int nCheck = (int)m_list.GetItemData(iItem);
fStartMod = !!(nCheck&TSMOD);
fEndMod = !!(nCheck&TEMOD);
@@ -454,7 +454,7 @@ void CPlayerSubresyncBar::GetCheck(int iItem, bool& fStartMod, bool& fEndMod, bo void CPlayerSubresyncBar::SetCheck(int iItem, bool fStart, bool fEnd)
{
- if (0 <= iItem && iItem < m_sts.GetCount()) {
+ if (0 <= iItem && (size_t)iItem < m_sts.GetCount()) {
SubTime& st = m_subtimes[iItem];
int nCheck = (int)m_list.GetItemData(iItem) & TSEP;
@@ -1048,7 +1048,7 @@ void CPlayerSubresyncBar::OnRclickList(NMHDR* pNMHDR, LRESULT* pResult) stss = styles[j];
pages[j]->GetStyle(*stss);
- for (int i = 0; i < m_sts.GetCount(); i++) {
+ for (size_t i = 0; i < m_sts.GetCount(); i++) {
if (m_sts.GetStyle(i) == stss) {
CString str;
m_list.SetItemText(i, COL_TEXT, m_sts.GetStr(i, true));
@@ -1340,7 +1340,7 @@ bool CPlayerSubresyncBar::ShiftSubtitle(int nItem, long lValue, __int64& rtPos) bool bRet = false;
if ((nItem == 0) || (m_subtimes[nItem-1].newend < m_subtimes[nItem].newstart + lValue)) {
- for (int i= nItem; i<m_sts.GetCount(); i++) {
+ for (size_t i= nItem; i<m_sts.GetCount(); i++) {
m_subtimes[i].newstart += lValue;
m_subtimes[i].newend += lValue;
m_subtimes[i].orgstart += lValue;
diff --git a/src/apps/mplayerc/Playlist.cpp b/src/apps/mplayerc/Playlist.cpp index 1acbf3773..a2fb81ffb 100644 --- a/src/apps/mplayerc/Playlist.cpp +++ b/src/apps/mplayerc/Playlist.cpp @@ -210,7 +210,7 @@ void CPlaylistItem::AutoLoadFiles() CAtlArray<SubFile> ret;
GetSubFileNames(fn, paths, ret);
- for (int i = 0; i < ret.GetCount(); i++) {
+ for (size_t i = 0; i < ret.GetCount(); i++) {
if (!FindFileInList(m_subs, ret[i].fn)) {
m_subs.AddTail(ret[i].fn);
}
@@ -283,7 +283,7 @@ void CPlaylist::SortById() a[i].n = GetAt(pos).m_id, a[i].pos = pos;
}
qsort(a.GetData(), a.GetCount(), sizeof(plsort_t), compare);
- for (int i = 0; i < a.GetCount(); i++) {
+ for (size_t i = 0; i < a.GetCount(); i++) {
AddTail(GetAt(a[i].pos));
__super::RemoveAt(a[i].pos);
if (m_pos == a[i].pos) {
@@ -303,7 +303,7 @@ void CPlaylist::SortByName() a[i].pos = pos;
}
qsort(a.GetData(), a.GetCount(), sizeof(plsort2_t), compare2);
- for (int i = 0; i < a.GetCount(); i++) {
+ for (size_t i = 0; i < a.GetCount(); i++) {
AddTail(GetAt(a[i].pos));
__super::RemoveAt(a[i].pos);
if (m_pos == a[i].pos) {
@@ -321,7 +321,7 @@ void CPlaylist::SortByPath() a[i].str = GetAt(pos).m_fns.GetHead(), a[i].pos = pos;
}
qsort(a.GetData(), a.GetCount(), sizeof(plsort2_t), compare2);
- for (int i = 0; i < a.GetCount(); i++) {
+ for (size_t i = 0; i < a.GetCount(); i++) {
AddTail(GetAt(a[i].pos));
__super::RemoveAt(a[i].pos);
if (m_pos == a[i].pos) {
@@ -341,7 +341,7 @@ void CPlaylist::Randomize() }
qsort(a.GetData(), a.GetCount(), sizeof(plsort_t), compare);
CList<CPlaylistItem> pl;
- for (int i = 0; i < a.GetCount(); i++) {
+ for (size_t i = 0; i < a.GetCount(); i++) {
AddTail(GetAt(a[i].pos));
__super::RemoveAt(a[i].pos);
if (m_pos == a[i].pos) {
diff --git a/src/apps/mplayerc/SelectMediaType.cpp b/src/apps/mplayerc/SelectMediaType.cpp index c585f9199..e91dc6e68 100644 --- a/src/apps/mplayerc/SelectMediaType.cpp +++ b/src/apps/mplayerc/SelectMediaType.cpp @@ -61,7 +61,7 @@ BOOL CSelectMediaType::OnInitDialog() {
CCmdUIDialog::OnInitDialog();
- for (int i = 0; i < m_guids.GetCount(); i++) {
+ for (size_t i = 0; i < m_guids.GetCount(); i++) {
m_guidsctrl.AddString(GetMediaTypeName(m_guids[i]));
}
diff --git a/src/apps/mplayerc/TunerScanDlg.cpp b/src/apps/mplayerc/TunerScanDlg.cpp index 944b160be..fc52cffbf 100644 --- a/src/apps/mplayerc/TunerScanDlg.cpp +++ b/src/apps/mplayerc/TunerScanDlg.cpp @@ -197,7 +197,7 @@ LRESULT CTunerScanDlg::OnNewChannel(WPARAM wParam, LPARAM lParam) nChannelNumber = Channel.GetOriginNumber();
// Insert new channel so that channels are sorted by their logical number
for (nItem=0; nItem<m_ChannelList.GetItemCount(); nItem++) {
- if (m_ChannelList.GetItemData(nItem) > nChannelNumber) {
+ if ((int)m_ChannelList.GetItemData(nItem) > nChannelNumber) {
break;
}
}
diff --git a/src/apps/mplayerc/mplayerc.cpp b/src/apps/mplayerc/mplayerc.cpp index 584d1d4a0..0b56a9bbd 100644 --- a/src/apps/mplayerc/mplayerc.cpp +++ b/src/apps/mplayerc/mplayerc.cpp @@ -1336,7 +1336,7 @@ void CMPlayerCApp::RegisterHotkeys() }
nInputDeviceCount = GetRawInputDeviceList (InputDeviceList, &nInputDeviceCount, sizeof(RAWINPUTDEVICELIST));
- for (int i=0; i<nInputDeviceCount; i++) {
+ for (UINT i=0; i<nInputDeviceCount; i++) {
UINT nTemp = sizeof(DevInfo);
if (GetRawInputDeviceInfo (InputDeviceList[i].hDevice, RIDI_DEVICEINFO, &DevInfo, &nTemp)>0) {
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];
}
}
|