diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-07-21 18:27:33 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-07-21 18:27:33 +0400 |
| commit | 287da83923dc89d3e530f0f774622c77b104ff32 (patch) | |
| tree | 068c6eeb6174072c2970b139d1e38a99ab2edb9d /src | |
| parent | 43335a3630fc71331466b2a9d6c62ef02a522c50 (diff) | |
put back the ";" in macro calls; better be consistent. Remove excessive indentation
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5585 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
74 files changed, 1026 insertions, 1022 deletions
diff --git a/src/DSUtil/AudioParser.cpp b/src/DSUtil/AudioParser.cpp index 5be94167e..c5cfb8704 100644 --- a/src/DSUtil/AudioParser.cpp +++ b/src/DSUtil/AudioParser.cpp @@ -204,7 +204,7 @@ int ParseEAC3Header(const BYTE* buf, int* samplerate, int* channels, int* framel int acmod = (buf[4] >> 1) & 0x07;
int lfeon = buf[4] & 0x01;
- *frametype = (buf[2] >> 6) & 0x03;
+ *frametype = (buf[2] >> 6) & 0x03;
if (*frametype == EAC3_FRAME_TYPE_RESERVED) {
return 0;
}
diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp index a24723bed..ea14351b8 100644 --- a/src/DSUtil/DSUtil.cpp +++ b/src/DSUtil/DSUtil.cpp @@ -150,7 +150,7 @@ int CountPins(IBaseFilter* pBF, int& nIn, int& nOut, int& nInC, int& nOutC) }
}
}
- EndEnumPins
+ EndEnumPins;
return (nIn + nOut);
}
@@ -208,7 +208,7 @@ bool IsVideoRenderer(IBaseFilter* pBF) return !!(mt.majortype == MEDIATYPE_Video);
/*&& (mt.formattype == FORMAT_VideoInfo || mt.formattype == FORMAT_VideoInfo2));*/
}
- EndEnumPins
+ EndEnumPins;
}
CLSID clsid;
@@ -238,7 +238,7 @@ bool IsAudioWaveRenderer(IBaseFilter* pBF) return !!(mt.majortype == MEDIATYPE_Audio);
/*&& mt.formattype == FORMAT_WaveFormatEx);*/
}
- EndEnumPins
+ EndEnumPins;
}
CLSID clsid;
@@ -270,7 +270,7 @@ IPin* GetUpStreamPin(IBaseFilter* pBF, IPin* pInputPin) return pRet;
}
}
- EndEnumPins
+ EndEnumPins;
return NULL;
}
@@ -290,7 +290,7 @@ IPin* GetFirstPin(IBaseFilter* pBF, PIN_DIRECTION dir) return pRet;
}
}
- EndEnumPins
+ EndEnumPins;
return NULL;
}
@@ -311,7 +311,7 @@ IPin* GetFirstDisconnectedPin(IBaseFilter* pBF, PIN_DIRECTION dir) return pRet;
}
}
- EndEnumPins
+ EndEnumPins;
return NULL;
}
@@ -331,7 +331,7 @@ IBaseFilter* FindFilter(const CLSID& clsid, IFilterGraph* pFG) return pBF;
}
}
- EndEnumFilters
+ EndEnumFilters;
return NULL;
}
@@ -350,10 +350,10 @@ IPin* FindPin(IBaseFilter* pBF, PIN_DIRECTION direction, const AM_MEDIA_TYPE* pR return (pPin);
}
}
- EndEnumMediaTypes(pmt)
+ EndEnumMediaTypes(pmt);
}
}
- EndEnumPins
+ EndEnumPins;
return NULL;
}
@@ -472,19 +472,19 @@ IPin* AppendFilter(IPin* pPin, CString DisplayName, IGraphBuilder* pGB) }
pFilters.AddTail(pBF);
- BeginEnumFilters(pGB, pEnum, pBF2)
+ BeginEnumFilters(pGB, pEnum, pBF2);
pFilters.AddTail(pBF2);
- EndEnumFilters
+ EndEnumFilters;
if (FAILED(pGB->AddFilter(pBF, CStringW(var.bstrVal)))) {
break;
}
- BeginEnumFilters(pGB, pEnum, pBF2)
+ BeginEnumFilters(pGB, pEnum, pBF2);
if (!pFilters.Find(pBF2) && SUCCEEDED(pGB->RemoveFilter(pBF2))) {
pEnum->Reset();
}
- EndEnumFilters
+ EndEnumFilters;
pPinTo = GetFirstPin(pBF, PINDIR_INPUT);
if (!pPinTo) {
@@ -499,11 +499,11 @@ IPin* AppendFilter(IPin* pPin, CString DisplayName, IGraphBuilder* pGB) break;
}
- BeginEnumFilters(pGB, pEnum, pBF2)
+ BeginEnumFilters(pGB, pEnum, pBF2);
if (!pFilters.Find(pBF2) && SUCCEEDED(pGB->RemoveFilter(pBF2))) {
pEnum->Reset();
}
- EndEnumFilters
+ EndEnumFilters;
pRet = GetFirstPin(pBF, PINDIR_OUTPUT);
if (!pRet) {
@@ -626,7 +626,7 @@ void ExtractMediaTypes(IPin* pPin, CAtlArray<GUID>& types) types.Add(pmt->subtype);
}
}
- EndEnumMediaTypes(pmt)
+ EndEnumMediaTypes(pmt);
}
void ExtractMediaTypes(IPin* pPin, CAtlList<CMediaType>& mts)
@@ -648,7 +648,7 @@ void ExtractMediaTypes(IPin* pPin, CAtlList<CMediaType>& mts) mts.AddTail(CMediaType(*pmt));
}
}
- EndEnumMediaTypes(pmt)
+ EndEnumMediaTypes(pmt);
}
int Eval_Exception(int n_except)
@@ -1319,7 +1319,7 @@ IBaseFilter* AppendFilter(IPin* pPin, IMoniker* pMoniker, IGraphBuilder* pGB) return pBF;
}
}
- EndEnumFilters
+ EndEnumFilters;
pGB->RemoveFilter(pBF);
} while (false);
@@ -2499,7 +2499,7 @@ static const DXVA2_DECODER DXVA2Decoder[] = { LPCTSTR GetDXVAMode(const GUID* guidDecoder)
{
- int nPos = 0;
+ int nPos = 0;
for (int i = 1; i < _countof(DXVA2Decoder); i++) {
if (*guidDecoder == *DXVA2Decoder[i].Guid) {
@@ -2514,7 +2514,7 @@ LPCTSTR GetDXVAMode(const GUID* guidDecoder) void DumpBuffer(BYTE* pBuffer, int nSize)
{
CString strMsg;
- int nPos = 0;
+ int nPos = 0;
strMsg.AppendFormat(L"Size : %d\n", nSize);
for (int i = 0; i < 3; i++) {
for (int j = 0; j < 32; j++) {
@@ -2544,12 +2544,12 @@ void DumpBuffer(BYTE* pBuffer, int nSize) // hour, minute, second, millisec
CString ReftimeToString(const REFERENCE_TIME& rtVal)
{
- CString strTemp;
- LONGLONG llTotalMs = ConvertToMilliseconds(rtVal);
- int lHour = (int)(llTotalMs / (1000 * 60 * 60));
- int lMinute = (llTotalMs / (1000 * 60)) % 60;
- int lSecond = (llTotalMs / 1000) % 60;
- int lMillisec = llTotalMs % 1000;
+ CString strTemp;
+ LONGLONG llTotalMs = ConvertToMilliseconds(rtVal);
+ int lHour = (int)(llTotalMs / (1000 * 60 * 60));
+ int lMinute = (llTotalMs / (1000 * 60)) % 60;
+ int lSecond = (llTotalMs / 1000) % 60;
+ int lMillisec = llTotalMs % 1000;
strTemp.Format(_T("%02d:%02d:%02d,%03d"), lHour, lMinute, lSecond, lMillisec);
return strTemp;
@@ -2558,11 +2558,11 @@ CString ReftimeToString(const REFERENCE_TIME& rtVal) // hour, minute, second (round)
CString ReftimeToString2(const REFERENCE_TIME& rtVal)
{
- CString strTemp;
- LONGLONG seconds = (rtVal + 5000000) / 10000000;
- int lHour = (int)(seconds / 3600);
- int lMinute = (int)(seconds / 60 % 60);
- int lSecond = (int)(seconds % 60);
+ CString strTemp;
+ LONGLONG seconds = (rtVal + 5000000) / 10000000;
+ int lHour = (int)(seconds / 3600);
+ int lMinute = (int)(seconds / 60 % 60);
+ int lSecond = (int)(seconds % 60);
strTemp.Format(_T("%02d:%02d:%02d"), lHour, lMinute, lSecond);
return strTemp;
@@ -2581,11 +2581,11 @@ CString DVDtimeToString(const DVD_HMSF_TIMECODE& rtVal, bool bAlwaysShowHours) REFERENCE_TIME StringToReftime(LPCTSTR strVal)
{
- REFERENCE_TIME rt = 0;
- int lHour = 0;
- int lMinute = 0;
- int lSecond = 0;
- int lMillisec = 0;
+ REFERENCE_TIME rt = 0;
+ int lHour = 0;
+ int lMinute = 0;
+ int lSecond = 0;
+ int lMillisec = 0;
if (_stscanf_s(strVal, _T("%02d:%02d:%02d,%03d"), &lHour, &lMinute, &lSecond, &lMillisec) == 4) {
rt = ((((lHour * 24) + lMinute) * 60 + lSecond) * MILLISECONDS + lMillisec) * (UNITS / MILLISECONDS);
@@ -2651,7 +2651,7 @@ void TraceFilterInfo(IBaseFilter* pBF) TracePinInfo(pPin);
}
- EndEnumPins
+ EndEnumPins;
Info.pGraph->Release();
}
}
@@ -2861,7 +2861,7 @@ void getExtraData(const BYTE* format, const GUID* formattype, const size_t forma //WAVEFORMATEX *wfex = (WAVEFORMATEX *)format;
extraposition = format + sizeof(WAVEFORMATEX);
// Protected against over-reads
- extralength = formatlen - sizeof(WAVEFORMATEX);
+ extralength = formatlen - sizeof(WAVEFORMATEX);
} else if (*formattype == FORMAT_VorbisFormat2) {
VORBISFORMAT2* vf2 = (VORBISFORMAT2*)format;
unsigned offset = 1;
@@ -2887,18 +2887,18 @@ void getExtraData(const BYTE* format, const GUID* formattype, const size_t forma return;
} else if (*formattype == FORMAT_VideoInfo) {
extraposition = format + sizeof(VIDEOINFOHEADER);
- extralength = formatlen - sizeof(VIDEOINFOHEADER);
+ extralength = formatlen - sizeof(VIDEOINFOHEADER);
} else if (*formattype == FORMAT_VideoInfo2) {
extraposition = format + sizeof(VIDEOINFOHEADER2);
- extralength = formatlen - sizeof(VIDEOINFOHEADER2);
+ extralength = formatlen - sizeof(VIDEOINFOHEADER2);
} else if (*formattype == FORMAT_MPEGVideo) {
MPEG1VIDEOINFO* mp1vi = (MPEG1VIDEOINFO*)format;
extraposition = (BYTE*)mp1vi->bSequenceHeader;
- extralength = min(mp1vi->cbSequenceHeader, formatlen - FIELD_OFFSET(MPEG1VIDEOINFO, bSequenceHeader[0]));
+ extralength = min(mp1vi->cbSequenceHeader, formatlen - FIELD_OFFSET(MPEG1VIDEOINFO, bSequenceHeader[0]));
} else if (*formattype == FORMAT_MPEG2Video) {
MPEG2VIDEOINFO* mp2vi = (MPEG2VIDEOINFO*)format;
extraposition = (BYTE*)mp2vi->dwSequenceHeader;
- extralength = min(mp2vi->cbSequenceHeader, formatlen - FIELD_OFFSET(MPEG2VIDEOINFO, dwSequenceHeader[0]));
+ extralength = min(mp2vi->cbSequenceHeader, formatlen - FIELD_OFFSET(MPEG2VIDEOINFO, dwSequenceHeader[0]));
}
if (extra && extralength) {
diff --git a/src/DSUtil/DSUtil.h b/src/DSUtil/DSUtil.h index 51bc3968b..d2d1783d1 100644 --- a/src/DSUtil/DSUtil.h +++ b/src/DSUtil/DSUtil.h @@ -34,7 +34,7 @@ #define LCID_NOSUBTITLES -1
extern void DumpStreamConfig(TCHAR* fn, IAMStreamConfig* pAMVSCCap);
-extern int CountPins(IBaseFilter* pBF, int& nIn, int& nOut, int& nInC, int& nOutC);
+extern int CountPins(IBaseFilter* pBF, int& nIn, int& nOut, int& nInC, int& nOutC);
extern bool IsSplitter(IBaseFilter* pBF, bool fCountConnectedOnly = false);
extern bool IsMultiplexer(IBaseFilter* pBF, bool fCountConnectedOnly = false);
extern bool IsStreamStart(IBaseFilter* pBF);
@@ -45,28 +45,34 @@ extern IBaseFilter* GetUpStreamFilter(IBaseFilter* pBF, IPin* pInputPin = NULL); extern IPin* GetUpStreamPin(IBaseFilter* pBF, IPin* pInputPin = NULL);
extern IPin* GetFirstPin(IBaseFilter* pBF, PIN_DIRECTION dir = PINDIR_INPUT);
extern IPin* GetFirstDisconnectedPin(IBaseFilter* pBF, PIN_DIRECTION dir);
-extern void NukeDownstream(IBaseFilter* pBF, IFilterGraph* pFG);
-extern void NukeDownstream(IPin* pPin, IFilterGraph* pFG);
+extern void NukeDownstream(IBaseFilter* pBF, IFilterGraph* pFG);
+extern void NukeDownstream(IPin* pPin, IFilterGraph* pFG);
extern IBaseFilter* FindFilter(LPCWSTR clsid, IFilterGraph* pFG);
extern IBaseFilter* FindFilter(const CLSID& clsid, IFilterGraph* pFG);
extern IPin* FindPin(IBaseFilter* pBF, PIN_DIRECTION direction, const AM_MEDIA_TYPE* pRequestedMT);
extern CStringW GetFilterName(IBaseFilter* pBF);
extern CStringW GetPinName(IPin* pPin);
extern IFilterGraph* GetGraphFromFilter(IBaseFilter* pBF);
-extern IBaseFilter* GetFilterFromPin(IPin* pPin);
+extern IBaseFilter* GetFilterFromPin(IPin* pPin);
extern IPin* AppendFilter(IPin* pPin, CString DisplayName, IGraphBuilder* pGB);
extern IPin* InsertFilter(IPin* pPin, CString DisplayName, IGraphBuilder* pGB);
-extern void ExtractMediaTypes(IPin* pPin, CAtlArray<GUID>& types);
-extern void ExtractMediaTypes(IPin* pPin, CAtlList<CMediaType>& mts);
-extern void ShowPPage(CString DisplayName, HWND hParentWnd);
-extern void ShowPPage(IUnknown* pUnknown, HWND hParentWnd);
+extern void ExtractMediaTypes(IPin* pPin, CAtlArray<GUID>& types);
+extern void ExtractMediaTypes(IPin* pPin, CAtlList<CMediaType>& mts);
+extern void ShowPPage(CString DisplayName, HWND hParentWnd);
+extern void ShowPPage(IUnknown* pUnknown, HWND hParentWnd);
extern CLSID GetCLSID(IBaseFilter* pBF);
extern CLSID GetCLSID(IPin* pPin);
-extern bool IsCLSIDRegistered(LPCTSTR clsid);
-extern bool IsCLSIDRegistered(const CLSID& clsid);
-extern void CStringToBin(CString str, CAtlArray<BYTE>& data);
+extern bool IsCLSIDRegistered(LPCTSTR clsid);
+extern bool IsCLSIDRegistered(const CLSID& clsid);
+extern void CStringToBin(CString str, CAtlArray<BYTE>& data);
extern CString BinToCString(const BYTE* ptr, size_t len);
-typedef enum { CDROM_NotFound, CDROM_Audio, CDROM_VideoCD, CDROM_DVDVideo, CDROM_Unknown } cdrom_t;
+typedef enum {
+ CDROM_NotFound,
+ CDROM_Audio,
+ CDROM_VideoCD,
+ CDROM_DVDVideo,
+ CDROM_Unknown
+} cdrom_t;
extern cdrom_t GetCDROMType(TCHAR drive, CAtlList<CString>& files);
extern CString GetDriveLabel(TCHAR drive);
extern bool GetKeyFrames(CString fn, CUIntArray& kfs);
@@ -98,12 +104,12 @@ extern CStringW UTF8ToStringW(const char* S); extern CStringW LocalToStringW(const char* S);
extern CString ISO6391ToLanguage(LPCSTR code);
extern CString ISO6392ToLanguage(LPCSTR code);
-extern LCID ISO6391ToLcid(LPCSTR code);
-extern LCID ISO6392ToLcid(LPCSTR code);
+extern LCID ISO6391ToLcid(LPCSTR code);
+extern LCID ISO6392ToLcid(LPCSTR code);
extern CString ISO6391To6392(LPCSTR code);
extern CString ISO6392To6391(LPCSTR code);
extern CString LanguageToISO6392(LPCTSTR lang);
-extern int MakeAACInitData(BYTE* pData, int profile, int freq, int channels);
+extern int MakeAACInitData(BYTE* pData, int profile, int freq, int channels);
extern BOOL CFileGetStatus(LPCTSTR lpszFileName, CFileStatus& status);
extern bool DeleteRegKey(LPCTSTR pszKey, LPCTSTR pszSubkey);
extern bool SetRegKeyValue(LPCTSTR pszKey, LPCTSTR pszSubkey, LPCTSTR pszValueName, LPCTSTR pszValue);
@@ -119,16 +125,19 @@ extern CString DVDtimeToString(const DVD_HMSF_TIMECODE& rtVal, bool bAlwaysShowH extern REFERENCE_TIME StringToReftime(LPCTSTR strVal);
extern COLORREF YCrCbToRGB_Rec601(BYTE Y, BYTE Cr, BYTE Cb);
extern COLORREF YCrCbToRGB_Rec709(BYTE Y, BYTE Cr, BYTE Cb);
-extern DWORD YCrCbToRGB_Rec601(BYTE A, BYTE Y, BYTE Cr, BYTE Cb);
-extern DWORD YCrCbToRGB_Rec709(BYTE A, BYTE Y, BYTE Cr, BYTE Cb);
-extern void TraceFilterInfo(IBaseFilter* pBF);
-extern void TracePinInfo(IPin* pPin);
-extern void SetThreadName(DWORD dwThreadID, LPCSTR szThreadName);
-extern void HexDump(CString fName, BYTE* buf, int size);
-extern void CorrectComboListWidth(CComboBox& m_pComboBox);
+extern DWORD YCrCbToRGB_Rec601(BYTE A, BYTE Y, BYTE Cr, BYTE Cb);
+extern DWORD YCrCbToRGB_Rec709(BYTE A, BYTE Y, BYTE Cr, BYTE Cb);
+extern void TraceFilterInfo(IBaseFilter* pBF);
+extern void TracePinInfo(IPin* pPin);
+extern void SetThreadName(DWORD dwThreadID, LPCSTR szThreadName);
+extern void HexDump(CString fName, BYTE* buf, int size);
+extern void CorrectComboListWidth(CComboBox& m_pComboBox);
-extern void getExtraData(const BYTE* format, const GUID* formattype, const size_t formatlen, BYTE* extra, unsigned int* extralen);
-extern void audioFormatTypeHandler(const BYTE* format, const GUID* formattype, DWORD* pnSamples, WORD* pnChannels, WORD* pnBitsPerSample, WORD* pnBlockAlign, DWORD* pnBytesPerSec);
+extern void getExtraData(const BYTE* format, const GUID* formattype, const size_t formatlen, BYTE* extra, unsigned int* extralen);
+extern void audioFormatTypeHandler(const BYTE* format, const GUID* formattype,
+ DWORD* pnSamples, WORD* pnChannels,
+ WORD* pnBitsPerSample, WORD* pnBlockAlign,
+ DWORD* pnBytesPerSec);
typedef enum {
PICT_NONE,
@@ -215,7 +224,7 @@ public: pDevEnum4$##clsid.CoCreateInstance(CLSID_SystemDeviceEnum); \
CComPtr<IEnumMoniker> pClassEnum4$##clsid; \
if (SUCCEEDED(pDevEnum4$##clsid->CreateClassEnumerator(clsid, &pClassEnum4$##clsid, 0)) \
- && pClassEnum4$##clsid) \
+ && pClassEnum4$##clsid) \
{ \
for (CComPtr<IMoniker> pMoniker; pClassEnum4$##clsid->Next(1, &pMoniker, 0) == S_OK; pMoniker = NULL) \
{
@@ -243,9 +252,10 @@ public: if (_fs == State_Running && _pMS) \
_pMC->Run();
-#define CallQueue(call) \
- if (!m_pOutputQueue) return NOERROR; \
- m_pOutputQueue->##call; \
+#define CallQueue(call) \
+ if (!m_pOutputQueue) \
+ return NOERROR; \
+ m_pOutputQueue->##call; \
return NOERROR;
#define QI(i) (riid == __uuidof(i)) ? GetInterface((i*)this, ppv) :
diff --git a/src/DSUtil/H264Nalu.cpp b/src/DSUtil/H264Nalu.cpp index 761db62ad..9cdb4705e 100644 --- a/src/DSUtil/H264Nalu.cpp +++ b/src/DSUtil/H264Nalu.cpp @@ -74,9 +74,9 @@ bool CH264Nalu::ReadNext() if ((m_nNALSize != 0) && (m_nCurPos == m_nNextRTP)) {
// RTP Nalu type : (XX XX) XX XX NAL..., with XX XX XX XX or XX XX equal to NAL size
- m_nNALStartPos = m_nCurPos;
- m_nNALDataPos = m_nCurPos + m_nNALSize;
- unsigned nTemp = 0;
+ m_nNALStartPos = m_nCurPos;
+ m_nNALDataPos = m_nCurPos + m_nNALSize;
+ unsigned nTemp = 0;
for (int i = 0; i < m_nNALSize; i++) {
nTemp = (nTemp << 8) + m_pBuffer[m_nCurPos++];
}
@@ -89,9 +89,9 @@ bool CH264Nalu::ReadNext() }
// AnnexB Nalu : 00 00 01 NAL...
- m_nNALStartPos = m_nCurPos;
- m_nCurPos += 3;
- m_nNALDataPos = m_nCurPos;
+ m_nNALStartPos = m_nCurPos;
+ m_nCurPos += 3;
+ m_nNALDataPos = m_nCurPos;
MoveToNextAnnexBStartcode();
}
diff --git a/src/DSUtil/HdmvClipInfo.cpp b/src/DSUtil/HdmvClipInfo.cpp index 0e8b0b359..10594a846 100644 --- a/src/DSUtil/HdmvClipInfo.cpp +++ b/src/DSUtil/HdmvClipInfo.cpp @@ -73,8 +73,8 @@ void CHdmvClipInfo::ReadBuffer(BYTE* pBuff, DWORD nLen) HRESULT CHdmvClipInfo::ReadProgramInfo()
{
- BYTE number_of_program_sequences;
- BYTE number_of_streams_in_ps;
+ BYTE number_of_program_sequences;
+ BYTE number_of_streams_in_ps;
LARGE_INTEGER Pos;
m_Streams.RemoveAll();
@@ -88,7 +88,7 @@ HRESULT CHdmvClipInfo::ReadProgramInfo() for (size_t i = 0; i < number_of_program_sequences; i++) {
ReadDword(); //SPN_program_sequence_start
ReadShort(); //program_map_PID
- number_of_streams_in_ps = (BYTE)ReadByte(); //number_of_streams_in_ps
+ number_of_streams_in_ps = (BYTE)ReadByte(); //number_of_streams_in_ps
ReadByte(); //reserved_for_future_use
for (size_t stream_index = 0; stream_index < number_of_streams_in_ps; stream_index++) {
@@ -166,8 +166,8 @@ HRESULT CHdmvClipInfo::ReadInfo(LPCTSTR strFile) BYTE Buff[100];
m_bIsHdmv = false;
- m_hFile = CreateFile(strFile, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
- OPEN_EXISTING, FILE_ATTRIBUTE_READONLY | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
+ m_hFile = CreateFile(strFile, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
+ OPEN_EXISTING, FILE_ATTRIBUTE_READONLY | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
if (m_hFile != INVALID_HANDLE_VALUE) {
ReadBuffer(Buff, 4);
@@ -276,8 +276,8 @@ HRESULT CHdmvClipInfo::ReadPlaylist(CString strPlaylistFile, REFERENCE_TIME& rtD }
LARGE_INTEGER Pos;
- DWORD dwTemp;
- USHORT nPlaylistItems;
+ DWORD dwTemp;
+ USHORT nPlaylistItems;
Pos.QuadPart = ReadDword(); // PlayList_start_address
ReadDword(); // PlayListMark_start_address
@@ -341,27 +341,27 @@ HRESULT CHdmvClipInfo::ReadChapters(CString strPlaylistFile, CAtlList<CHdmvClipI if (m_hFile != INVALID_HANDLE_VALUE) {
REFERENCE_TIME* rtOffset = DNew REFERENCE_TIME[PlaylistItems.GetCount()];
- REFERENCE_TIME rtSum = 0;
- int nIndex = 0;
+ REFERENCE_TIME rtSum = 0;
+ int nIndex = 0;
POSITION pos = PlaylistItems.GetHeadPosition();
while (pos) {
CHdmvClipInfo::PlaylistItem& PI = PlaylistItems.GetNext(pos);
rtOffset[nIndex] = rtSum - PI.m_rtIn;
- rtSum = rtSum + PI.Duration();
+ rtSum = rtSum + PI.Duration();
nIndex++;
}
ReadBuffer(Buff, 4);
if (memcmp(Buff, "MPLS", 4)) {
- SAFE_DELETE_ARRAY(rtOffset)
+ SAFE_DELETE_ARRAY(rtOffset);
return CloseFile(VFW_E_INVALID_FILE_FORMAT);
}
ReadBuffer(Buff, 4);
if ((memcmp(Buff, "0200", 4) != 0) && (memcmp(Buff, "0100", 4) != 0)) {
- SAFE_DELETE_ARRAY(rtOffset)
+ SAFE_DELETE_ARRAY(rtOffset);
return CloseFile(VFW_E_INVALID_FILE_FORMAT);
}
@@ -391,7 +391,7 @@ HRESULT CHdmvClipInfo::ReadChapters(CString strPlaylistFile, CAtlList<CHdmvClipI }
CloseFile(S_OK);
- SAFE_DELETE_ARRAY(rtOffset)
+ SAFE_DELETE_ARRAY(rtOffset);
return bDuplicate ? S_FALSE : S_OK;
}
@@ -421,7 +421,7 @@ HRESULT CHdmvClipInfo::FindMainMovie(LPCTSTR strFolder, CString& strPlaylistFile if (hFind != INVALID_HANDLE_VALUE) {
REFERENCE_TIME rtMax = 0;
REFERENCE_TIME rtCurrent;
- CString strCurrentPlaylist;
+ CString strCurrentPlaylist;
do {
strCurrentPlaylist.Format(_T("%sPLAYLIST\\%s"), strPath, fd.cFileName);
Playlist.RemoveAll();
@@ -441,8 +441,8 @@ HRESULT CHdmvClipInfo::FindMainMovie(LPCTSTR strFolder, CString& strPlaylistFile if (rtCurrent >= (REFERENCE_TIME)MIN_LIMIT * 600000000) {
PlaylistItem Item;
Item.m_strFileName = strCurrentPlaylist;
- Item.m_rtIn = 0;
- Item.m_rtOut = rtCurrent;
+ Item.m_rtIn = 0;
+ Item.m_rtOut = rtCurrent;
MPLSPlaylists.AddTail(Item);
}
diff --git a/src/DeCSS/VobFile.cpp b/src/DeCSS/VobFile.cpp index 8f338ff45..e345edd28 100644 --- a/src/DeCSS/VobFile.cpp +++ b/src/DeCSS/VobFile.cpp @@ -395,7 +395,7 @@ SHORT CVobFile::ReadShort() BYTE CVobFile::ReadByte()
{
- BYTE bVal;
+ BYTE bVal;
m_ifoFile.Read(&bVal, sizeof(bVal));
return bVal;
}
diff --git a/src/SubPic/DX9SubPic.cpp b/src/SubPic/DX9SubPic.cpp index 028b943dc..392f2ba02 100644 --- a/src/SubPic/DX9SubPic.cpp +++ b/src/SubPic/DX9SubPic.cpp @@ -408,7 +408,7 @@ STDMETHODIMP CDX9SubPicAllocator::ChangeDevice(IUnknown* pDev) STDMETHODIMP CDX9SubPicAllocator::SetMaxTextureSize(SIZE MaxTextureSize)
{
ClearCache();
- m_maxsize = MaxTextureSize;
+ m_maxsize = MaxTextureSize;
SetCurSize(MaxTextureSize);
return S_OK;
}
diff --git a/src/Subtitles/BaseSub.h b/src/Subtitles/BaseSub.h index f94680443..d4e14a709 100644 --- a/src/Subtitles/BaseSub.h +++ b/src/Subtitles/BaseSub.h @@ -43,7 +43,7 @@ public: virtual POSITION GetStartPosition(REFERENCE_TIME rt, double fps) = NULL;
virtual POSITION GetNext(POSITION pos) = NULL;
virtual REFERENCE_TIME GetStart(POSITION nPos) = NULL;
- virtual REFERENCE_TIME GetStop(POSITION nPos) = NULL;
+ virtual REFERENCE_TIME GetStop(POSITION nPos) = NULL;
virtual void Render(SubPicDesc& spd, REFERENCE_TIME rt, RECT& bbox) = NULL;
virtual HRESULT GetTextureSize(POSITION pos, SIZE& MaxTextureSize, SIZE& VideoSize, POINT& VideoTopLeft) = NULL;
diff --git a/src/Subtitles/CompositionObject.cpp b/src/Subtitles/CompositionObject.cpp index e348e01e4..83eb2e4e1 100644 --- a/src/Subtitles/CompositionObject.cpp +++ b/src/Subtitles/CompositionObject.cpp @@ -57,9 +57,9 @@ void CompositionObject::SetPalette(int nNbEntry, HDMV_PALETTE* pPalette, bool bI void CompositionObject::SetRLEData(BYTE* pBuffer, int nSize, int nTotalSize)
{
delete [] m_pRLEData;
- m_pRLEData = DNew BYTE[nTotalSize];
- m_nRLEDataSize = nTotalSize;
- m_nRLEPos = nSize;
+ m_pRLEData = DNew BYTE[nTotalSize];
+ m_nRLEDataSize = nTotalSize;
+ m_nRLEPos = nSize;
memcpy(m_pRLEData, pBuffer, nSize);
}
@@ -80,20 +80,19 @@ void CompositionObject::RenderHdmv(SubPicDesc& spd) return;
}
- CGolombBuffer GBuffer(m_pRLEData, m_nRLEDataSize);
- BYTE bTemp;
- BYTE bSwitch;
-
- BYTE nPaletteIndex = 0;
- SHORT nCount;
- SHORT nX = m_horizontal_position;
- SHORT nY = m_vertical_position;
+ CGolombBuffer GBuffer(m_pRLEData, m_nRLEDataSize);
+ BYTE bTemp;
+ BYTE bSwitch;
+ BYTE nPaletteIndex = 0;
+ SHORT nCount;
+ SHORT nX = m_horizontal_position;
+ SHORT nY = m_vertical_position;
while ((nY < (m_vertical_position + m_height)) && !GBuffer.IsEOF()) {
bTemp = GBuffer.ReadByte();
if (bTemp != 0) {
nPaletteIndex = bTemp;
- nCount = 1;
+ nCount = 1;
} else {
bSwitch = GBuffer.ReadByte();
if (!(bSwitch & 0x80)) {
@@ -103,16 +102,16 @@ void CompositionObject::RenderHdmv(SubPicDesc& spd) nPaletteIndex = 0;
}
} else {
- nCount = (bSwitch & 0x3F) << 8 | (SHORT)GBuffer.ReadByte();
- nPaletteIndex = 0;
+ nCount = (bSwitch & 0x3F) << 8 | (SHORT)GBuffer.ReadByte();
+ nPaletteIndex = 0;
}
} else {
if (!(bSwitch & 0x40)) {
- nCount = bSwitch & 0x3F;
- nPaletteIndex = GBuffer.ReadByte();
+ nCount = bSwitch & 0x3F;
+ nPaletteIndex = GBuffer.ReadByte();
} else {
- nCount = (bSwitch & 0x3F) << 8 | (SHORT)GBuffer.ReadByte();
- nPaletteIndex = GBuffer.ReadByte();
+ nCount = (bSwitch & 0x3F) << 8 | (SHORT)GBuffer.ReadByte();
+ nPaletteIndex = GBuffer.ReadByte();
}
}
}
@@ -136,14 +135,14 @@ void CompositionObject::RenderDvb(SubPicDesc& spd, SHORT nX, SHORT nY) return;
}
- CGolombBuffer gb(m_pRLEData, m_nRLEDataSize);
- SHORT sTopFieldLength;
- SHORT sBottomFieldLength;
+ CGolombBuffer gb(m_pRLEData, m_nRLEDataSize);
+ SHORT sTopFieldLength;
+ SHORT sBottomFieldLength;
- sTopFieldLength = gb.ReadShort();
- sBottomFieldLength = gb.ReadShort();
+ sTopFieldLength = gb.ReadShort();
+ sBottomFieldLength = gb.ReadShort();
- DvbRenderField(spd, gb, nX, nY, sTopFieldLength);
+ DvbRenderField(spd, gb, nX, nY, sTopFieldLength);
DvbRenderField(spd, gb, nX, nY + 1, sBottomFieldLength);
}
@@ -154,11 +153,11 @@ void CompositionObject::DvbRenderField(SubPicDesc& spd, CGolombBuffer& gb, SHORT //FillSolidRect (spd, 0, 10, 300, 10, 0xCC00FF00); // Green 80%
//FillSolidRect (spd, 0, 20, 300, 10, 0x100000FF); // Blue 60%
//return;
- SHORT nX = nXStart;
- SHORT nY = nYStart;
- int nEnd = gb.GetPos() + nLength;
+ SHORT nX = nXStart;
+ SHORT nY = nYStart;
+ int nEnd = gb.GetPos() + nLength;
while (gb.GetPos() < nEnd) {
- BYTE bType = gb.ReadByte();
+ BYTE bType = gb.ReadByte();
switch (bType) {
case 0x10 :
Dvb2PixelsCodeString(spd, gb, nX, nY);
@@ -192,38 +191,38 @@ void CompositionObject::DvbRenderField(SubPicDesc& spd, CGolombBuffer& gb, SHORT void CompositionObject::Dvb2PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, SHORT& nX, SHORT& nY)
{
- BYTE bTemp;
- BYTE nPaletteIndex = 0;
- SHORT nCount;
- bool bQuit = false;
+ BYTE bTemp;
+ BYTE nPaletteIndex = 0;
+ SHORT nCount;
+ bool bQuit = false;
while (!bQuit && !gb.IsEOF()) {
- nCount = 0;
- nPaletteIndex = 0;
- bTemp = (BYTE)gb.BitRead(2);
+ nCount = 0;
+ nPaletteIndex = 0;
+ bTemp = (BYTE)gb.BitRead(2);
if (bTemp != 0) {
nPaletteIndex = bTemp;
- nCount = 1;
+ nCount = 1;
} else {
- if (gb.BitRead(1) == 1) { // switch_1
- nCount = 3 + (SHORT)gb.BitRead(3); // run_length_3-9
+ if (gb.BitRead(1) == 1) { // switch_1
+ nCount = 3 + (SHORT)gb.BitRead(3); // run_length_3-9
nPaletteIndex = (BYTE)gb.BitRead(2);
} else {
- if (gb.BitRead(1) == 0) { // switch_2
- switch (gb.BitRead(2)) { // switch_3
+ if (gb.BitRead(1) == 0) { // switch_2
+ switch (gb.BitRead(2)) { // switch_3
case 0 :
- bQuit = true;
+ bQuit = true;
break;
case 1 :
- nCount = 2;
+ nCount = 2;
break;
- case 2 : // if (switch_3 == '10')
- nCount = 12 + (SHORT)gb.BitRead(4); // run_length_12-27
- nPaletteIndex = (BYTE)gb.BitRead(2); // 4-bit_pixel-code
+ case 2 : // if (switch_3 == '10')
+ nCount = 12 + (SHORT)gb.BitRead(4); // run_length_12-27
+ nPaletteIndex = (BYTE)gb.BitRead(2); // 4-bit_pixel-code
break;
case 3 :
- nCount = 29 + gb.ReadByte(); // run_length_29-284
- nPaletteIndex = (BYTE)gb.BitRead(2); // 4-bit_pixel-code
+ nCount = 29 + gb.ReadByte(); // run_length_29-284
+ nPaletteIndex = (BYTE)gb.BitRead(2); // 4-bit_pixel-code
break;
}
} else {
@@ -248,18 +247,18 @@ void CompositionObject::Dvb2PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, void CompositionObject::Dvb4PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, SHORT& nX, SHORT& nY)
{
- BYTE bTemp;
- BYTE nPaletteIndex = 0;
- SHORT nCount;
- bool bQuit = false;
+ BYTE bTemp;
+ BYTE nPaletteIndex = 0;
+ SHORT nCount;
+ bool bQuit = false;
while (!bQuit && !gb.IsEOF()) {
- nCount = 0;
- nPaletteIndex = 0;
- bTemp = (BYTE)gb.BitRead(4);
+ nCount = 0;
+ nPaletteIndex = 0;
+ bTemp = (BYTE)gb.BitRead(4);
if (bTemp != 0) {
nPaletteIndex = bTemp;
- nCount = 1;
+ nCount = 1;
} else {
if (gb.BitRead(1) == 0) { // switch_1
nCount = (SHORT)gb.BitRead(3); // run_length_3-9
@@ -269,24 +268,24 @@ void CompositionObject::Dvb4PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, bQuit = true;
}
} else {
- if (gb.BitRead(1) == 0) { // switch_2
- nCount = 4 + (SHORT)gb.BitRead(2); // run_length_4-7
- nPaletteIndex = (BYTE)gb.BitRead(4); // 4-bit_pixel-code
+ if (gb.BitRead(1) == 0) { // switch_2
+ nCount = 4 + (SHORT)gb.BitRead(2); // run_length_4-7
+ nPaletteIndex = (BYTE)gb.BitRead(4); // 4-bit_pixel-code
} else {
- switch (gb.BitRead(2)) { // switch_3
+ switch (gb.BitRead(2)) { // switch_3
case 0 :
- nCount = 1;
+ nCount = 1;
break;
case 1 :
- nCount = 2;
+ nCount = 2;
break;
- case 2 : // if (switch_3 == '10')
- nCount = 9 + (SHORT)gb.BitRead(4); // run_length_9-24
- nPaletteIndex = (BYTE)gb.BitRead(4); // 4-bit_pixel-code
+ case 2 : // if (switch_3 == '10')
+ nCount = 9 + (SHORT)gb.BitRead(4); // run_length_9-24
+ nPaletteIndex = (BYTE)gb.BitRead(4); // 4-bit_pixel-code
break;
case 3 :
- nCount = 25 + gb.ReadByte(); // run_length_25-280
- nPaletteIndex = (BYTE)gb.BitRead(4); // 4-bit_pixel-code
+ nCount = 25 + gb.ReadByte(); // run_length_25-280
+ nPaletteIndex = (BYTE)gb.BitRead(4); // 4-bit_pixel-code
break;
}
}
@@ -311,27 +310,27 @@ void CompositionObject::Dvb4PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, void CompositionObject::Dvb8PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, SHORT& nX, SHORT& nY)
{
- BYTE bTemp;
- BYTE nPaletteIndex = 0;
- SHORT nCount;
- bool bQuit = false;
+ BYTE bTemp;
+ BYTE nPaletteIndex = 0;
+ SHORT nCount;
+ bool bQuit = false;
while (!bQuit && !gb.IsEOF()) {
- nCount = 0;
- nPaletteIndex = 0;
- bTemp = gb.ReadByte();
+ nCount = 0;
+ nPaletteIndex = 0;
+ bTemp = gb.ReadByte();
if (bTemp != 0) {
nPaletteIndex = bTemp;
- nCount = 1;
+ nCount = 1;
} else {
- if (gb.BitRead(1) == 0) { // switch_1
- nCount = (SHORT)gb.BitRead(7); // run_length_1-127
+ if (gb.BitRead(1) == 0) { // switch_1
+ nCount = (SHORT)gb.BitRead(7); // run_length_1-127
if (nCount == 0) {
bQuit = true;
}
} else {
- nCount = (SHORT)gb.BitRead(7); // run_length_3-127
- nPaletteIndex = gb.ReadByte();
+ nCount = (SHORT)gb.BitRead(7); // run_length_3-127
+ nPaletteIndex = gb.ReadByte();
}
}
diff --git a/src/Subtitles/CompositionObject.h b/src/Subtitles/CompositionObject.h index 16969ebc7..e01e1eb68 100644 --- a/src/Subtitles/CompositionObject.h +++ b/src/Subtitles/CompositionObject.h @@ -26,11 +26,11 @@ struct HDMV_PALETTE {
- BYTE entry_id;
- BYTE Y;
- BYTE Cr;
- BYTE Cb;
- BYTE T; // HDMV rule : 0 transparent, 255 opaque (compatible DirectX)
+ BYTE entry_id;
+ BYTE Y;
+ BYTE Cr;
+ BYTE Cb;
+ BYTE T; // HDMV rule : 0 transparent, 255 opaque (compatible DirectX)
};
class CGolombBuffer;
@@ -38,55 +38,49 @@ class CGolombBuffer; class CompositionObject : Rasterizer
{
public :
- SHORT m_object_id_ref;
- BYTE m_window_id_ref;
- bool m_object_cropped_flag;
- bool m_forced_on_flag;
- BYTE m_version_number;
- BYTE m_nObjectNumber;
+ SHORT m_object_id_ref;
+ BYTE m_window_id_ref;
+ bool m_object_cropped_flag;
+ bool m_forced_on_flag;
+ BYTE m_version_number;
+ BYTE m_nObjectNumber;
- SHORT m_horizontal_position;
- SHORT m_vertical_position;
- SHORT m_width;
- SHORT m_height;
+ SHORT m_horizontal_position;
+ SHORT m_vertical_position;
+ SHORT m_width;
+ SHORT m_height;
- SHORT m_cropping_horizontal_position;
- SHORT m_cropping_vertical_position;
- SHORT m_cropping_width;
- SHORT m_cropping_height;
+ SHORT m_cropping_horizontal_position;
+ SHORT m_cropping_vertical_position;
+ SHORT m_cropping_width;
+ SHORT m_cropping_height;
- REFERENCE_TIME m_rtStart;
- REFERENCE_TIME m_rtStop;
+ REFERENCE_TIME m_rtStart;
+ REFERENCE_TIME m_rtStop;
CompositionObject();
~CompositionObject();
- void SetRLEData(BYTE* pBuffer, int nSize, int nTotalSize);
- void AppendRLEData(BYTE* pBuffer, int nSize);
- int GetRLEDataSize() {
- return m_nRLEDataSize;
- };
- bool IsRLEComplete() {
- return m_nRLEPos >= m_nRLEDataSize;
- };
- void RenderHdmv(SubPicDesc& spd);
- void RenderDvb(SubPicDesc& spd, SHORT nX, SHORT nY);
- void WriteSeg(SubPicDesc& spd, SHORT nX, SHORT nY, SHORT nCount, SHORT nPaletteIndex);
- void SetPalette(int nNbEntry, HDMV_PALETTE* pPalette, bool bIsHD);
- void SetPalette(int nNbEntry, DWORD* dwColors);
- bool HavePalette() {
- return m_nColorNumber > 0;
- };
+ void SetRLEData(BYTE* pBuffer, int nSize, int nTotalSize);
+ void AppendRLEData(BYTE* pBuffer, int nSize);
+ int GetRLEDataSize() { return m_nRLEDataSize; };
+ bool IsRLEComplete() { return m_nRLEPos >= m_nRLEDataSize; };
+ void RenderHdmv(SubPicDesc& spd);
+ void RenderDvb(SubPicDesc& spd, SHORT nX, SHORT nY);
+ void WriteSeg(SubPicDesc& spd, SHORT nX, SHORT nY, SHORT nCount, SHORT nPaletteIndex);
+ void SetPalette(int nNbEntry, HDMV_PALETTE* pPalette, bool bIsHD);
+ void SetPalette(int nNbEntry, DWORD* dwColors);
+ bool HavePalette() { return m_nColorNumber > 0; };
private :
- BYTE* m_pRLEData;
- int m_nRLEDataSize;
- int m_nRLEPos;
- int m_nColorNumber;
- DWORD m_Colors[256];
+ BYTE* m_pRLEData;
+ int m_nRLEDataSize;
+ int m_nRLEPos;
+ int m_nColorNumber;
+ DWORD m_Colors[256];
- void DvbRenderField(SubPicDesc& spd, CGolombBuffer& gb, SHORT nXStart, SHORT nYStart, SHORT nLength);
- void Dvb2PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, SHORT& nX, SHORT& nY);
- void Dvb4PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, SHORT& nX, SHORT& nY);
- void Dvb8PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, SHORT& nX, SHORT& nY);
+ void DvbRenderField(SubPicDesc& spd, CGolombBuffer& gb, SHORT nXStart, SHORT nYStart, SHORT nLength);
+ void Dvb2PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, SHORT& nX, SHORT& nY);
+ void Dvb4PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, SHORT& nX, SHORT& nY);
+ void Dvb8PixelsCodeString(SubPicDesc& spd, CGolombBuffer& gb, SHORT& nX, SHORT& nY);
};
diff --git a/src/Subtitles/DVBSub.cpp b/src/Subtitles/DVBSub.cpp index 5b3886f41..995f8cf9c 100644 --- a/src/Subtitles/DVBSub.cpp +++ b/src/Subtitles/DVBSub.cpp @@ -45,7 +45,7 @@ CDVBSub::CDVBSub(void) CDVBSub::~CDVBSub(void)
{
Reset();
- SAFE_DELETE(m_pBuffer)
+ SAFE_DELETE(m_pBuffer);
}
CDVBSub::DVB_PAGE* CDVBSub::FindPage(REFERENCE_TIME rt)
@@ -132,7 +132,7 @@ HRESULT CDVBSub::AddToBuffer(BYTE* pData, int nSize) m_pBuffer = DNew BYTE[m_nBufferSize];
if (pPrev != NULL) {
memcpy_s(m_pBuffer, m_nBufferSize, pPrev, m_nBufferWritePos);
- SAFE_DELETE(pPrev)
+ SAFE_DELETE(pPrev);
}
}
memcpy_s(m_pBuffer + m_nBufferWritePos, m_nBufferSize, pData, nSize);
@@ -198,11 +198,11 @@ HRESULT CDVBSub::ParseSample(IMediaSample* pSample) REFERENCE_TIME pts = 0;
pts |= gb.BitRead(3) << 30;
- MARKER // 32..30
+ MARKER; // 32..30
pts |= gb.BitRead(15) << 15;
- MARKER // 29..15
+ MARKER; // 29..15
pts |= gb.BitRead(15);
- MARKER // 14..0
+ MARKER; // 14..0
pts = 10000 * pts / 90;
m_rtStart = pts;
@@ -223,7 +223,7 @@ HRESULT CDVBSub::ParseSample(IMediaSample* pSample) //FILE* hFile = fopen("D:\\Sources\\mpc-hc\\A garder\\TestSubRip\\dvbsub.dat", "ab");
//if (hFile != NULL)
//{
- // //BYTE Buff[5] = {48};
+ // //BYTE Buff[5] = {48};
// //*((DWORD*)(Buff+1)) = lSampleLen;
// //fwrite(Buff, 1, sizeof(Buff), hFile);
@@ -512,7 +512,7 @@ HRESULT CDVBSub::ParseClut(CGolombBuffer& gb, WORD wSegLength) pClut = FindClut(m_pCurrentPage, gb.ReadByte());
// ASSERT (pClut != NULL);
if (pClut != NULL) {
- pClut->version_number = (BYTE)gb.BitRead(4);
+ pClut->version_number = (BYTE)gb.BitRead(4);
gb.BitRead(4); // Reserved
pClut->Size = 0;
diff --git a/src/Subtitles/RenderedHdmvSubtitle.cpp b/src/Subtitles/RenderedHdmvSubtitle.cpp index 5471a3aaa..8630c76ef 100644 --- a/src/Subtitles/RenderedHdmvSubtitle.cpp +++ b/src/Subtitles/RenderedHdmvSubtitle.cpp @@ -165,7 +165,7 @@ STDMETHODIMP CRenderedHdmvSubtitle::Reload() HRESULT CRenderedHdmvSubtitle::ParseSample(IMediaSample* pSample)
{
CAutoLock cAutoLock(&m_csCritSec);
- HRESULT hr;
+ HRESULT hr;
hr = m_pSub->ParseSample(pSample);
return hr;
diff --git a/src/Subtitles/SubtitleInputPin.cpp b/src/Subtitles/SubtitleInputPin.cpp index 931f7ca38..8391eaaaa 100644 --- a/src/Subtitles/SubtitleInputPin.cpp +++ b/src/Subtitles/SubtitleInputPin.cpp @@ -80,10 +80,10 @@ HRESULT CSubtitleInputPin::CompleteConnect(IPin* pReceivePin) pRTS->m_dstScreenSize = CSize(384, 288);
pRTS->CreateDefaultStyle(DEFAULT_CHARSET);
} else if (m_mt.majortype == MEDIATYPE_Subtitle) {
- SUBTITLEINFO* psi = (SUBTITLEINFO*)m_mt.pbFormat;
- DWORD dwOffset = 0;
- CString name;
- LCID lcid = 0;
+ SUBTITLEINFO* psi = (SUBTITLEINFO*)m_mt.pbFormat;
+ DWORD dwOffset = 0;
+ CString name;
+ LCID lcid = 0;
if (psi != NULL) {
dwOffset = psi->dwOffset;
diff --git a/src/Subtitles/USFSubtitles.cpp b/src/Subtitles/USFSubtitles.cpp index a561cdcc0..0c15a37bc 100644 --- a/src/Subtitles/USFSubtitles.cpp +++ b/src/Subtitles/USFSubtitles.cpp @@ -80,14 +80,14 @@ static CStringW GetAttrib(CStringW attrib, CComPtr<IXMLDOMNode> pNode) CStringW ret;
BeginEnumAttribs(pNode, pChild) {
- DeclareNameAndValue(pChild, name, val)
+ DeclareNameAndValue(pChild, name, val);
if (CStringW(name) == attrib && val.vt == VT_BSTR) { // TODO: prepare for other types
ret = val.bstrVal;
break;
}
}
- EndEnumAttribs
+ EndEnumAttribs;
return ret;
}
@@ -456,28 +456,28 @@ bool CUSFSubtitles::ConvertToSTS(CSimpleTextSubtitle& sts) bool CUSFSubtitles::ParseUSFSubtitles(CComPtr<IXMLDOMNode> pNode)
{
- DeclareNameAndValue(pNode, name, val)
+ DeclareNameAndValue(pNode, name, val);
if (name == L"usfsubtitles") {
// metadata
BeginEnumChildren(pNode, pChild) {
- DeclareNameAndValue(pChild, name, val)
+ DeclareNameAndValue(pChild, name, val);
if (name == L"metadata") {
ParseMetadata(pChild, metadata);
}
}
- EndEnumChildren
+ EndEnumChildren;
// styles
BeginEnumChildren(pNode, pChild) {
- DeclareNameAndValue(pChild, name, val)
+ DeclareNameAndValue(pChild, name, val);
if (name == L"styles") {
BeginEnumChildren(pChild, pGrandChild) { // :)
- DeclareNameAndValue(pGrandChild, name, val)
+ DeclareNameAndValue(pGrandChild, name, val);
if (name == L"style") {
CAutoPtr<style_t> s(DNew style_t);
@@ -487,19 +487,19 @@ bool CUSFSubtitles::ParseUSFSubtitles(CComPtr<IXMLDOMNode> pNode) }
}
}
- EndEnumChildren
+ EndEnumChildren;
}
}
- EndEnumChildren
+ EndEnumChildren;
// effects
BeginEnumChildren(pNode, pChild) {
- DeclareNameAndValue(pChild, name, val)
+ DeclareNameAndValue(pChild, name, val);
if (name == L"effects") {
BeginEnumChildren(pChild, pGrandChild) { // :)
- DeclareNameAndValue(pGrandChild, name, val)
+ DeclareNameAndValue(pGrandChild, name, val);
if (name == L"effect") {
CAutoPtr<effect_t> e(DNew effect_t);
@@ -509,19 +509,19 @@ bool CUSFSubtitles::ParseUSFSubtitles(CComPtr<IXMLDOMNode> pNode) }
}
}
- EndEnumChildren
+ EndEnumChildren;
}
}
- EndEnumChildren
+ EndEnumChildren;
// subtitles
BeginEnumChildren(pNode, pChild) {
- DeclareNameAndValue(pChild, name, val)
+ DeclareNameAndValue(pChild, name, val);
if (name == L"subtitles") {
BeginEnumChildren(pChild, pGrandChild) { // :)
- DeclareNameAndValue(pGrandChild, name, val)
+ DeclareNameAndValue(pGrandChild, name, val);
if (name == L"subtitle") {
CStringW sstart = GetAttrib(L"start", pGrandChild);
@@ -537,10 +537,10 @@ bool CUSFSubtitles::ParseUSFSubtitles(CComPtr<IXMLDOMNode> pNode) ParseSubtitle(pGrandChild, start, stop);
}
}
- EndEnumChildren
+ EndEnumChildren;
}
}
- EndEnumChildren
+ EndEnumChildren;
return true;
}
@@ -550,14 +550,14 @@ bool CUSFSubtitles::ParseUSFSubtitles(CComPtr<IXMLDOMNode> pNode) return true;
}
}
- EndEnumChildren
+ EndEnumChildren;
return false;
}
void CUSFSubtitles::ParseMetadata(CComPtr<IXMLDOMNode> pNode, metadata_t& m)
{
- DeclareNameAndValue(pNode, name, val)
+ DeclareNameAndValue(pNode, name, val);
if (name == L"title") {
m.title = GetText(pNode);
@@ -567,7 +567,7 @@ void CUSFSubtitles::ParseMetadata(CComPtr<IXMLDOMNode> pNode, metadata_t& m) m.comment = GetText(pNode);
} else if (name == L"author") {
BeginEnumChildren(pNode, pChild) {
- DeclareNameAndValue(pChild, name, val)
+ DeclareNameAndValue(pChild, name, val);
if (name == L"name") {
m.author.name = GetText(pChild);
@@ -577,7 +577,7 @@ void CUSFSubtitles::ParseMetadata(CComPtr<IXMLDOMNode> pNode, metadata_t& m) m.author.url = GetText(pChild);
}
}
- EndEnumChildren
+ EndEnumChildren;
return;
} else if (name == L"language") {
@@ -591,12 +591,12 @@ void CUSFSubtitles::ParseMetadata(CComPtr<IXMLDOMNode> pNode, metadata_t& m) BeginEnumChildren(pNode, pChild) {
ParseMetadata(pChild, metadata);
}
- EndEnumChildren
+ EndEnumChildren;
}
void CUSFSubtitles::ParseStyle(CComPtr<IXMLDOMNode> pNode, style_t* s)
{
- DeclareNameAndValue(pNode, name, val)
+ DeclareNameAndValue(pNode, name, val);
if (name == L"style") {
s->name = GetAttrib(L"name", pNode);
@@ -611,7 +611,7 @@ void CUSFSubtitles::ParseStyle(CComPtr<IXMLDOMNode> pNode, style_t* s) BeginEnumChildren(pNode, pChild) {
ParseStyle(pChild, s);
}
- EndEnumChildren
+ EndEnumChildren;
}
void CUSFSubtitles::ParseFontstyle(CComPtr<IXMLDOMNode> pNode, fontstyle_t& fs)
@@ -644,13 +644,13 @@ void CUSFSubtitles::ParsePal(CComPtr<IXMLDOMNode> pNode, posattriblist_t& pal) void CUSFSubtitles::ParseEffect(CComPtr<IXMLDOMNode> pNode, effect_t* e)
{
- DeclareNameAndValue(pNode, name, val)
+ DeclareNameAndValue(pNode, name, val);
if (name == L"effect") {
e->name = GetAttrib(L"name", pNode);
} else if (name == L"keyframes") {
BeginEnumChildren(pNode, pChild) {
- DeclareNameAndValue(pChild, name, val)
+ DeclareNameAndValue(pChild, name, val);
if (name == L"keyframe") {
CAutoPtr<keyframe_t> k(DNew keyframe_t);
@@ -660,7 +660,7 @@ void CUSFSubtitles::ParseEffect(CComPtr<IXMLDOMNode> pNode, effect_t* e) }
}
}
- EndEnumChildren
+ EndEnumChildren;
return;
}
@@ -668,12 +668,12 @@ void CUSFSubtitles::ParseEffect(CComPtr<IXMLDOMNode> pNode, effect_t* e) BeginEnumChildren(pNode, pChild) {
ParseEffect(pChild, e);
}
- EndEnumChildren
+ EndEnumChildren;
}
void CUSFSubtitles::ParseKeyframe(CComPtr<IXMLDOMNode> pNode, keyframe_t* k)
{
- DeclareNameAndValue(pNode, name, val)
+ DeclareNameAndValue(pNode, name, val);
if (name == L"keyframe") {
k->position = GetAttrib(L"position", pNode);
@@ -688,7 +688,7 @@ void CUSFSubtitles::ParseKeyframe(CComPtr<IXMLDOMNode> pNode, keyframe_t* k) void CUSFSubtitles::ParseSubtitle(CComPtr<IXMLDOMNode> pNode, int start, int stop)
{
- DeclareNameAndValue(pNode, name, val)
+ DeclareNameAndValue(pNode, name, val);
if (name == L"text" || name == L"karaoke") {
CAutoPtr<text_t> t(DNew text_t);
@@ -709,12 +709,12 @@ void CUSFSubtitles::ParseSubtitle(CComPtr<IXMLDOMNode> pNode, int start, int sto BeginEnumChildren(pNode, pChild) {
ParseSubtitle(pChild, start, stop);
}
- EndEnumChildren
+ EndEnumChildren;
}
void CUSFSubtitles::ParseText(CComPtr<IXMLDOMNode> pNode, CStringW& str)
{
- DeclareNameAndValue(pNode, name, val)
+ DeclareNameAndValue(pNode, name, val);
CStringW prefix, postfix;
@@ -776,7 +776,7 @@ void CUSFSubtitles::ParseText(CComPtr<IXMLDOMNode> pNode, CStringW& str) ParseText(pChild, s);
str += s;
}
- EndEnumChildren
+ EndEnumChildren;
str = prefix + str + postfix;
}
diff --git a/src/Subtitles/VobSubFile.cpp b/src/Subtitles/VobSubFile.cpp index 8e55130b1..cbda742e9 100644 --- a/src/Subtitles/VobSubFile.cpp +++ b/src/Subtitles/VobSubFile.cpp @@ -889,12 +889,12 @@ bool CVobSubFile::ReadIfo(CString fn) f.Seek(0xc0 + 0x0c, SEEK_SET);
DWORD pos;
- ReadBEdw(pos)
+ ReadBEdw(pos);
f.Seek(pos * 0x800 + 0x0c, CFile::begin);
DWORD offset;
- ReadBEdw(offset)
+ ReadBEdw(offset);
/* Subpic palette */
diff --git a/src/Subtitles/VobSubFileRipper.cpp b/src/Subtitles/VobSubFileRipper.cpp index b925c9570..d92c895f7 100644 --- a/src/Subtitles/VobSubFileRipper.cpp +++ b/src/Subtitles/VobSubFileRipper.cpp @@ -141,11 +141,11 @@ bool CVobSubFileRipper::LoadIfo(CString fn) memset(ids, 0, sizeof(ids));
int len = 0;
- ReadBEw(len)
+ ReadBEw(len);
for (ptrdiff_t i = 0; i < len; i++) {
f.Seek(2, CFile::current); // 01 00 ?
- ReadBEw(ids[i])
+ ReadBEw(ids[i]);
if (ids[i] == 0) {
ids[i] = '--';
}
@@ -175,12 +175,12 @@ bool CVobSubFileRipper::LoadIfo(CString fn) DWORD pgcpos;
f.Seek(0xc0 + 0x0c, CFile::begin);
- ReadBEdw(pgcpos)
+ ReadBEdw(pgcpos);
pgcpos *= 0x800;
WORD nPGC;
f.Seek(pgcpos, CFile::begin);
- ReadBEw(nPGC)
+ ReadBEw(nPGC);
m_rd.pgcs.RemoveAll();
m_rd.pgcs.SetCount(nPGC);
@@ -189,13 +189,13 @@ bool CVobSubFileRipper::LoadIfo(CString fn) PGC& pgc = m_rd.pgcs[i];
f.Seek(pgcpos + 8 + i * 8 + 4, CFile::begin);
- ReadBEdw(offset)
+ ReadBEdw(offset);
offset += pgcpos;
BYTE nProgs, nCells;
f.Seek(offset + 2, CFile::begin);
- ReadBEb(nProgs)
- ReadBEb(nCells)
+ ReadBEb(nProgs);
+ ReadBEb(nCells);
//
@@ -250,11 +250,11 @@ bool CVobSubFileRipper::LoadIfo(CString fn) WORD progoff, celladdroff, vobcelloff;
f.Seek(offset + 0xe6, CFile::begin);
- ReadBEw(progoff)
+ ReadBEw(progoff);
f.Seek(offset + 0xe8, CFile::begin);
- ReadBEw(celladdroff)
+ ReadBEw(celladdroff);
f.Seek(offset + 0xea, CFile::begin);
- ReadBEw(vobcelloff)
+ ReadBEw(vobcelloff);
//
@@ -272,8 +272,8 @@ bool CVobSubFileRipper::LoadIfo(CString fn) f.Seek(offset + vobcelloff, CFile::begin);
for (size_t j = 0; j < nCells; j++) {
- ReadBEw(pgc.angles[0][j].vob)
- ReadBEw(pgc.angles[0][j].cell)
+ ReadBEw(pgc.angles[0][j].vob);
+ ReadBEw(pgc.angles[0][j].cell);
}
//
@@ -287,7 +287,7 @@ bool CVobSubFileRipper::LoadIfo(CString fn) f.Seek(offset + celladdroff, CFile::begin);
for (size_t j = 0; j < nCells; j++) {
BYTE b;
- ReadBEb(b)
+ ReadBEb(b);
switch (b >> 6) {
case 0:
iAngle = 0;
@@ -306,10 +306,10 @@ bool CVobSubFileRipper::LoadIfo(CString fn) pgc.nAngles = max(pgc.nAngles, iAngle);
f.Seek(3, CFile::current);
- ReadBEdw(pgc.angles[0][j].tTime)
- ReadBEdw(pgc.angles[0][j].start)
+ ReadBEdw(pgc.angles[0][j].tTime);
+ ReadBEdw(pgc.angles[0][j].start);
f.Seek(8, CFile::current);
- ReadBEdw(pgc.angles[0][j].end)
+ ReadBEdw(pgc.angles[0][j].end);
float fps;
switch ((pgc.angles[0][j].tTime >> 6) & 0x3) {
diff --git a/src/filters/PinInfoWnd.cpp b/src/filters/PinInfoWnd.cpp index 7d837f793..226fe9eba 100644 --- a/src/filters/PinInfoWnd.cpp +++ b/src/filters/PinInfoWnd.cpp @@ -77,7 +77,6 @@ static LRESULT CALLBACK ControlProc(HWND control, UINT message, WPARAM wParam, L bool CPinInfoWnd::OnActivate()
{
DWORD dwStyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP;
-
CPoint p(10, 10);
m_pin_static.Create(_T("Pin:"), dwStyle, CRect(p + CPoint(0, 3), CSize(30, m_fontheight)), this);
@@ -99,7 +98,7 @@ bool CPinInfoWnd::OnActivate() }
m_pin_combo.SetItemDataPtr(m_pin_combo.AddString(dir + str), pPin);
}
- EndEnumPins
+ EndEnumPins;
m_pin_combo.SetCurSel(0);
p.y += m_fontheight + 20;
@@ -180,8 +179,8 @@ void CPinInfoWnd::OnCbnSelchangeCombo1() }
CString str;
-
PIN_INFO PinInfo;
+
if (SUCCEEDED(pPin->QueryPinInfo(&PinInfo))) {
CString strName;
CLSID FilterClsid;
@@ -250,7 +249,7 @@ void CPinInfoWnd::OnCbnSelchangeCombo1() }
}
}
- EndEnumMediaTypes(pmt)
+ EndEnumMediaTypes(pmt);
m_info_edit.SetSel(0, 0);
}
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index dc3d3e88a..b8b429c69 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -415,12 +415,12 @@ HRESULT CBaseSplitterOutputPin::QueuePacket(CAutoPtr<Packet> p) bool CBaseSplitterOutputPin::IsDiscontinuous()
{
- return m_mt.majortype == MEDIATYPE_Text
- || m_mt.majortype == MEDIATYPE_ScriptCommand
- || m_mt.majortype == MEDIATYPE_Subtitle
- || m_mt.subtype == MEDIASUBTYPE_DVD_SUBPICTURE
- || m_mt.subtype == MEDIASUBTYPE_CVD_SUBPICTURE
- || m_mt.subtype == MEDIASUBTYPE_SVCD_SUBPICTURE;
+ return m_mt.majortype == MEDIATYPE_Text
+ || m_mt.majortype == MEDIATYPE_ScriptCommand
+ || m_mt.majortype == MEDIATYPE_Subtitle
+ || m_mt.subtype == MEDIASUBTYPE_DVD_SUBPICTURE
+ || m_mt.subtype == MEDIASUBTYPE_CVD_SUBPICTURE
+ || m_mt.subtype == MEDIASUBTYPE_SVCD_SUBPICTURE;
}
bool CBaseSplitterOutputPin::IsActive()
@@ -1254,10 +1254,10 @@ STDMETHODIMP CBaseSplitterFilter::Load(LPCOLESTR pszFileName, const AM_MEDIA_TYP }
if (BuildChapters(pszFileName, Items, Chapters)) {
- POSITION pos = Chapters.GetHeadPosition();
- int i = 1;
+ POSITION pos = Chapters.GetHeadPosition();
+ int i = 1;
while (pos) {
- CString str;
+ CString str;
CHdmvClipInfo::PlaylistChapter& chap = Chapters.GetNext(pos);
if (chap.m_nMarkType == CHdmvClipInfo::EntryMark) {
str.Format(_T("Chapter %d"), i);
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp index 80aa13c85..1616d3d41 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.cpp @@ -83,14 +83,14 @@ bool CBaseSplitterFileEx::Read(pshdr& h) h.scr = 0;
h.scr |= BitRead(3) << 30;
- MARKER // 32..30
+ MARKER; // 32..30
h.scr |= BitRead(15) << 15;
- MARKER // 29..15
+ MARKER; // 29..15
h.scr |= BitRead(15);
- MARKER
- MARKER // 14..0
+ MARKER;
+ MARKER; // 14..0
h.bitrate = BitRead(22);
- MARKER
+ MARKER;
} else if ((b & 0xc4) == 0x44) {
h.type = mpeg2;
@@ -98,16 +98,16 @@ bool CBaseSplitterFileEx::Read(pshdr& h) h.scr = 0;
h.scr |= BitRead(3) << 30;
- MARKER // 32..30
+ MARKER; // 32..30
h.scr |= BitRead(15) << 15;
- MARKER // 29..15
+ MARKER; // 29..15
h.scr |= BitRead(15);
- MARKER // 14..0
+ MARKER; // 14..0
h.scr = (h.scr * 300 + BitRead(9)) * 10 / 27;
- MARKER
+ MARKER;
h.bitrate = BitRead(22);
- MARKER
- MARKER
+ MARKER;
+ MARKER;
BitRead(5); // reserved
UINT64 stuffing = BitRead(3);
while (stuffing-- > 0) {
@@ -127,15 +127,15 @@ bool CBaseSplitterFileEx::Read(pssyshdr& h) memset(&h, 0, sizeof(h));
WORD len = (WORD)BitRead(16);
- MARKER
+ MARKER;
h.rate_bound = (DWORD)BitRead(22);
- MARKER
+ MARKER;
h.audio_bound = (BYTE)BitRead(6);
h.fixed_rate = !!BitRead(1);
h.csps = !!BitRead(1);
h.sys_audio_loc_flag = !!BitRead(1);
h.sys_video_loc_flag = !!BitRead(1);
- MARKER
+ MARKER;
h.video_bound = (BYTE)BitRead(5);
EXECUTE_ASSERT((BitRead(8) & 0x7f) == 0x7f); // reserved (should be 0xff, but not in reality)
@@ -224,11 +224,11 @@ bool CBaseSplitterFileEx::Read(peshdr& h, BYTE code) h.pts = 0;
h.pts |= BitRead(3) << 30;
- MARKER // 32..30
+ MARKER; // 32..30
h.pts |= BitRead(15) << 15;
- MARKER // 29..15
+ MARKER; // 29..15
h.pts |= BitRead(15);
- MARKER // 14..0
+ MARKER; // 14..0
h.pts = 10000 * h.pts / 90 + m_rtPTSOffset;
}
@@ -240,11 +240,11 @@ bool CBaseSplitterFileEx::Read(peshdr& h, BYTE code) h.dts = 0;
h.dts |= BitRead(3) << 30;
- MARKER // 32..30
+ MARKER; // 32..30
h.dts |= BitRead(15) << 15;
- MARKER // 29..15
+ MARKER; // 29..15
h.dts |= BitRead(15);
- MARKER // 14..0
+ MARKER; // 14..0
h.dts = 10000 * h.dts / 90 + m_rtPTSOffset;
}
@@ -336,7 +336,7 @@ bool CBaseSplitterFileEx::Read(seqhdr& h, int len, CMediaType* pmt) static int ifps[16] = {0, 1126125, 1125000, 1080000, 900900, 900000, 540000, 450450, 450000, 0, 0, 0, 0, 0, 0, 0};
h.ifps = ifps[BitRead(4)];
h.bitrate = (DWORD)BitRead(18);
- MARKER
+ MARKER;
h.vbv = (DWORD)BitRead(10);
h.constrained = BitRead(1);
@@ -378,7 +378,7 @@ bool CBaseSplitterFileEx::Read(seqhdr& h, int len, CMediaType* pmt) h.width |= (BitRead(2) << 12);
h.height |= (BitRead(2) << 12);
h.bitrate |= (BitRead(12) << 18);
- MARKER
+ MARKER;
h.vbv |= (BitRead(8) << 10);
h.lowdelay = BitRead(1);
h.ifps = (DWORD)(h.ifps * (BitRead(2) + 1) / (BitRead(5) + 1));
@@ -728,7 +728,7 @@ bool CBaseSplitterFileEx::Read(ac3hdr& h, int len, CMediaType* pmt, bool find_sy return true;
}
- int bitrate = (int)(fsize * 8i64 * samplerate / framelength); // inaccurate, because fsize is not constant
+ int bitrate = (int)(fsize * 8i64 * samplerate / framelength); // inaccurate, because fsize is not constant
pmt->majortype = MEDIATYPE_Audio;
pmt->subtype = isTrueHD ? MEDIASUBTYPE_DOLBY_TRUEHD : MEDIASUBTYPE_MLP;
@@ -1003,7 +1003,7 @@ bool CBaseSplitterFileEx::Read(dvdalpcmhdr& h, int len, CMediaType* pmt) }
h.firstaudioframe = (WORD)BitRead(16);// Byte pointer to start of first audio frame.
- h.unknown1 = (BYTE)BitRead(8); // Unknown - e.g. 0x10 for stereo, 0x00 for surround
+ h.unknown1 = (BYTE)BitRead(8); // Unknown - e.g. 0x10 for stereo, 0x00 for surround
if (h.unknown1 != 0x10 && h.unknown1 != 0x00) {
return false; // this is not the aob. maybe this is a vob.
}
@@ -1080,7 +1080,7 @@ bool CBaseSplitterFileEx::Read(hdmvlpcmhdr& h, CMediaType* pmt) wfe.wFormatTag = WAVE_FORMAT_PCM;
static int channels[] = {0, 1, 0, 2, 3, 3, 4, 4, 5, 6, 7, 8};
- wfe.nChannels = channels[h.channels];
+ wfe.nChannels = channels[h.channels];
wfe.channel_conf = h.channels;
static int freq[] = {0, 48000, 0, 0, 96000, 192000};
@@ -1089,7 +1089,7 @@ bool CBaseSplitterFileEx::Read(hdmvlpcmhdr& h, CMediaType* pmt) static int bitspersample[] = {0, 16, 20, 24};
wfe.wBitsPerSample = bitspersample[h.bitpersample];
- wfe.nBlockAlign = wfe.nChannels * wfe.wBitsPerSample >> 3;
+ wfe.nBlockAlign = wfe.nChannels * wfe.wBitsPerSample >> 3;
wfe.nAvgBytesPerSec = wfe.nBlockAlign * wfe.nSamplesPerSec;
pmt->majortype = MEDIATYPE_Audio;
@@ -1134,9 +1134,9 @@ bool CBaseSplitterFileEx::Read(mlphdr& h, int len, CMediaType* pmt, bool find_sy return true;
}
- int bitrate = (int)(fsize * 8i64 * samplerate / framelength); // inaccurate, because fsize is not constant
- pmt->majortype = MEDIATYPE_Audio;
- pmt->subtype = MEDIASUBTYPE_MLP;
+ int bitrate = (int)(fsize * 8i64 * samplerate / framelength); // inaccurate, because fsize is not constant
+ pmt->majortype = MEDIATYPE_Audio;
+ pmt->subtype = MEDIASUBTYPE_MLP;
pmt->formattype = FORMAT_WaveFormatEx;
WAVEFORMATEX* wfe = (WAVEFORMATEX*)pmt->AllocFormatBuffer(sizeof(WAVEFORMATEX));
@@ -1525,8 +1525,8 @@ int CBaseSplitterFileEx::HrdParameters(CGolombBuffer& gb) void CBaseSplitterFileEx::RemoveMpegEscapeCode(BYTE* dst, BYTE* src, int length)
{
- int si = 0;
- int di = 0;
+ int si = 0;
+ int di = 0;
while (si + 2 < length) {
//remove escapes (very rare 1:2^22)
if (src[si + 2] > 3) {
@@ -2041,38 +2041,38 @@ bool CBaseSplitterFileEx::Read(vc1hdr& h, int len, CMediaType* pmt, int guid_fla __int64 endpos = GetPos() + len; // - sequence header length
__int64 extrapos = 0, extralen = 0;
- int nFrameRateNum = 0, nFrameRateDen = 1;
+ int nFrameRateNum = 0, nFrameRateDen = 1;
if (GetPos() < endpos + 4 && BitRead(32, true) == 0x0000010F) {
extrapos = GetPos();
BitRead(32);
- h.profile = (BYTE)BitRead(2);
+ h.profile = (BYTE)BitRead(2);
// Check if advanced profile
if (h.profile != 3) {
return false;
}
- h.level = (BYTE)BitRead(3);
- h.chromaformat = (BYTE)BitRead(2);
+ h.level = (BYTE)BitRead(3);
+ h.chromaformat = (BYTE)BitRead(2);
// (fps-2)/4 (->30)
- h.frmrtq_postproc = (BYTE)BitRead(3); //common
+ h.frmrtq_postproc = (BYTE)BitRead(3); //common
// (bitrate-32kbps)/64kbps
- h.bitrtq_postproc = (BYTE)BitRead(5); //common
- h.postprocflag = (BYTE)BitRead(1); //common
-
- h.width = ((unsigned int)BitRead(12) + 1) << 1;
- h.height = ((unsigned int)BitRead(12) + 1) << 1;
-
- h.broadcast = (BYTE)BitRead(1);
- h.interlace = (BYTE)BitRead(1);
- h.tfcntrflag = (BYTE)BitRead(1);
- h.finterpflag = (BYTE)BitRead(1);
- BitRead(1); // reserved
- h.psf = (BYTE)BitRead(1);
+ h.bitrtq_postproc = (BYTE)BitRead(5); //common
+ h.postprocflag = (BYTE)BitRead(1); //common
+
+ h.width = ((unsigned int)BitRead(12) + 1) << 1;
+ h.height = ((unsigned int)BitRead(12) + 1) << 1;
+
+ h.broadcast = (BYTE)BitRead(1);
+ h.interlace = (BYTE)BitRead(1);
+ h.tfcntrflag = (BYTE)BitRead(1);
+ h.finterpflag = (BYTE)BitRead(1);
+ BitRead(1); // reserved
+ h.psf = (BYTE)BitRead(1);
if (BitRead(1)) {
int ar = 0;
BitRead(14);
@@ -2184,9 +2184,9 @@ bool CBaseSplitterFileEx::Read(dvbsub& h, int len, CMediaType* pmt) if ((BitRead(32, true) & 0xFFFFFF00) == 0x20000f00) {
static const SUBTITLEINFO SubFormat = { 0, "", L"" };
- pmt->majortype = MEDIATYPE_Subtitle;
- pmt->subtype = MEDIASUBTYPE_DVB_SUBTITLES;
- pmt->formattype = FORMAT_None;
+ pmt->majortype = MEDIATYPE_Subtitle;
+ pmt->subtype = MEDIASUBTYPE_DVB_SUBTITLES;
+ pmt->formattype = FORMAT_None;
pmt->SetFormat((BYTE*)&SubFormat, sizeof(SUBTITLEINFO));
return true;
diff --git a/src/filters/parser/BaseSplitter/MultiFiles.cpp b/src/filters/parser/BaseSplitter/MultiFiles.cpp index d8d308131..57dd8f9cc 100644 --- a/src/filters/parser/BaseSplitter/MultiFiles.cpp +++ b/src/filters/parser/BaseSplitter/MultiFiles.cpp @@ -53,10 +53,10 @@ BOOL CMultiFiles::Open(LPCTSTR lpszFileName, UINT nOpenFlags) BOOL CMultiFiles::OpenFiles(CAtlList<CHdmvClipInfo::PlaylistItem>& files, UINT nOpenFlags)
{
- POSITION pos = files.GetHeadPosition();
- LARGE_INTEGER llSize;
- int nPos = 0;
- REFERENCE_TIME rtDur = 0;
+ POSITION pos = files.GetHeadPosition();
+ LARGE_INTEGER llSize;
+ int nPos = 0;
+ REFERENCE_TIME rtDur = 0;
Reset();
while (pos) {
@@ -84,8 +84,8 @@ BOOL CMultiFiles::OpenFiles(CAtlList<CHdmvClipInfo::PlaylistItem>& files, UINT n ULONGLONG CMultiFiles::Seek(LONGLONG lOff, UINT nFrom)
{
- LARGE_INTEGER llNewPos;
- LARGE_INTEGER llOff;
+ LARGE_INTEGER llNewPos;
+ LARGE_INTEGER llOff;
if (m_strFiles.GetCount() == 1) {
llOff.QuadPart = lOff;
@@ -93,9 +93,9 @@ ULONGLONG CMultiFiles::Seek(LONGLONG lOff, UINT nFrom) return llNewPos.QuadPart;
} else {
- ULONGLONG lAbsolutePos = GetAbsolutePosition(lOff, nFrom);
- int nNewPart = 0;
- ULONGLONG llSum = 0;
+ ULONGLONG lAbsolutePos = GetAbsolutePosition(lOff, nFrom);
+ int nNewPart = 0;
+ ULONGLONG llSum = 0;
while (m_FilesSize[nNewPart] + llSum <= lAbsolutePos) {
llSum += m_FilesSize[nNewPart];
@@ -112,8 +112,8 @@ ULONGLONG CMultiFiles::Seek(LONGLONG lOff, UINT nFrom) ULONGLONG CMultiFiles::GetAbsolutePosition(LONGLONG lOff, UINT nFrom)
{
- LARGE_INTEGER llNoMove = {0, 0};
- LARGE_INTEGER llCurPos;
+ LARGE_INTEGER llNoMove = {0, 0};
+ LARGE_INTEGER llCurPos;
switch (nFrom) {
case begin :
@@ -131,7 +131,7 @@ ULONGLONG CMultiFiles::GetAbsolutePosition(LONGLONG lOff, UINT nFrom) ULONGLONG CMultiFiles::GetLength() const
{
if (m_strFiles.GetCount() == 1) {
- LARGE_INTEGER llSize;
+ LARGE_INTEGER llSize;
GetFileSizeEx(m_hFile, &llSize);
return llSize.QuadPart;
} else {
@@ -141,7 +141,7 @@ ULONGLONG CMultiFiles::GetLength() const UINT CMultiFiles::Read(void* lpBuf, UINT nCount)
{
- DWORD dwRead;
+ DWORD dwRead;
do {
if (!ReadFile(m_hFile, lpBuf, nCount, &dwRead, NULL)) {
break;
@@ -149,8 +149,8 @@ UINT CMultiFiles::Read(void* lpBuf, UINT nCount) 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;
+ lpBuf = (void*)((BYTE*)lpBuf + dwRead);
+ nCount -= dwRead;
}
} while (nCount != dwRead && (m_nCurPart < 0 || (size_t)m_nCurPart < m_strFiles.GetCount() - 1));
return dwRead;
@@ -172,15 +172,15 @@ BOOL CMultiFiles::OpenPart(int nPart) if (m_nCurPart == nPart) {
return TRUE;
} else {
- CString fn;
+ CString fn;
ClosePart();
- fn = m_strFiles.GetAt(nPart);
- m_hFile = CreateFile(fn, GENERIC_READ, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+ fn = m_strFiles.GetAt(nPart);
+ m_hFile = CreateFile(fn, GENERIC_READ, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
if (m_hFile != INVALID_HANDLE_VALUE) {
- m_nCurPart = nPart;
+ m_nCurPart = nPart;
if (m_pCurrentPTSOffset != NULL) {
*m_pCurrentPTSOffset = m_rtPtsOffsets[nPart];
}
@@ -194,7 +194,7 @@ void CMultiFiles::ClosePart() {
if (m_hFile != INVALID_HANDLE_VALUE) {
CloseHandle(m_hFile);
- m_hFile = INVALID_HANDLE_VALUE;
- m_nCurPart = -1;
+ m_hFile = INVALID_HANDLE_VALUE;
+ m_nCurPart = -1;
}
}
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp index 1118d565c..e50551153 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp @@ -422,11 +422,11 @@ avcsuccess: memset(mt.Format(), 0, mt.FormatLength());
memcpy(mt.Format() + sizeof(MPEG1VIDEOINFO), pTE->CodecPrivate.GetData(), pTE->CodecPrivate.GetCount());
- pm1vi->hdr.bmiHeader.biSize = sizeof(pm1vi->hdr.bmiHeader);
- pm1vi->hdr.bmiHeader.biWidth = (LONG)pTE->v.PixelWidth;
- pm1vi->hdr.bmiHeader.biHeight = (LONG)pTE->v.PixelHeight;
- pm1vi->hdr.bmiHeader.biBitCount = 12;
- pm1vi->hdr.bmiHeader.biSizeImage = DIBSIZE(pm1vi->hdr.bmiHeader);
+ pm1vi->hdr.bmiHeader.biSize = sizeof(pm1vi->hdr.bmiHeader);
+ pm1vi->hdr.bmiHeader.biWidth = (LONG)pTE->v.PixelWidth;
+ pm1vi->hdr.bmiHeader.biHeight = (LONG)pTE->v.PixelHeight;
+ pm1vi->hdr.bmiHeader.biBitCount = 12;
+ pm1vi->hdr.bmiHeader.biSizeImage = DIBSIZE(pm1vi->hdr.bmiHeader);
mt.SetSampleSize(pm1vi->hdr.bmiHeader.biWidth * pm1vi->hdr.bmiHeader.biHeight * 4);
if (!bHasVideo) {
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp index 7ac479ff0..a58b02042 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp @@ -1177,8 +1177,8 @@ STDMETHODIMP CMpegSplitterFilter::Enable(long lIndex, DWORD dwFlags) }
if (m_useFastStreamChange) {
- PauseGraph
- ResumeGraph
+ PauseGraph;
+ ResumeGraph;
}
HRESULT hr;
@@ -1782,12 +1782,12 @@ HRESULT CMpegSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p) BYTE* start = m_p->GetData();
BYTE* end = start + m_p->GetCount();
- MOVE_TO_H264_START_CODE(start, end)
+ MOVE_TO_H264_START_CODE(start, end);
while (start <= end - 4) {
BYTE* next = start + 1;
- MOVE_TO_H264_START_CODE(next, end)
+ MOVE_TO_H264_START_CODE(next, end);
if (next >= end - 4) {
break;
@@ -2115,9 +2115,9 @@ HRESULT CMpegSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p) STDMETHODIMP CMpegSplitterOutputPin::Connect(IPin* pReceivePin, const AM_MEDIA_TYPE* pmt)
{
- HRESULT hr;
- PIN_INFO PinInfo;
- GUID FilterClsid;
+ HRESULT hr;
+ PIN_INFO PinInfo;
+ GUID FilterClsid;
if (SUCCEEDED(pReceivePin->QueryPinInfo(&PinInfo))) {
if (SUCCEEDED(PinInfo.pFilter->GetClassID(&FilterClsid))) {
diff --git a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp index ecd874257..b2fb313d0 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp @@ -881,8 +881,8 @@ void CMpegSplitterFile::AddHdmvPGStream(WORD pid, const char* language_code) {
stream s;
- s.pid = pid;
- s.pesid = 0xbd;
+ s.pid = pid;
+ s.pesid = 0xbd;
CMpegSplitterFile::hdmvsubhdr h;
if (!m_streams[subpic].Find(s) && Read(h, &s.mt, language_code)) {
@@ -1005,8 +1005,8 @@ void CMpegSplitterFile::UpdatePrograms(CGolombBuffer gb, WORD pid, bool UpdateLa UNREFERENCED_PARAMETER(nreserved1);
UNREFERENCED_PARAMETER(nreserved2);
- pPair->m_value.streams[i].pid = pid;
- pPair->m_value.streams[i].type = (PES_STREAM_TYPE)stream_type;
+ pPair->m_value.streams[i].pid = pid;
+ pPair->m_value.streams[i].type = (PES_STREAM_TYPE)stream_type;
if (m_ForcedSub) {
if (stream_type == PRESENTATION_GRAPHICS_STREAM) {
diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp index 4de42f37c..f7498fbfc 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.cpp +++ b/src/filters/parser/OggSplitter/OggSplitter.cpp @@ -1288,8 +1288,8 @@ HRESULT COggTheoraOutputPin::UnpackInitPage(OggPage& page) REFERENCE_TIME COggTheoraOutputPin::GetRefTime(__int64 granule_position)
{
- LONGLONG iframe;
- LONGLONG pframe;
+ LONGLONG iframe;
+ LONGLONG pframe;
iframe = granule_position >> m_KfgShift;
pframe = granule_position - (iframe << m_KfgShift);
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp index 6eef4d081..e21856125 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp @@ -277,12 +277,12 @@ HRESULT CRealMediaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader) pvih->bmiHeader.biSizeImage = rvi.w * rvi.h * 3 / 2;
mts.Add(mt);
- BYTE* extra = pmp->typeSpecData.GetData();
- DWORD extralen = (DWORD)pmp->typeSpecData.GetCount();
+ BYTE* extra = pmp->typeSpecData.GetData();
+ DWORD extralen = (DWORD)pmp->typeSpecData.GetCount();
if (extralen > 26) {
- extra += 26;
- extralen -= 26;
+ extra += 26;
+ extralen -= 26;
VIDEOINFOHEADER* pvih2 = (VIDEOINFOHEADER*)mt.ReallocFormatBuffer(sizeof(VIDEOINFOHEADER) + extralen);
memcpy(pvih2 + 1, extra, extralen);
mts.InsertAt(0, mt);
@@ -932,20 +932,20 @@ HRESULT CRealMediaSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p) var = (var << 8) | (*pIn++); \
var = (var << 8) | (*pIn++);
- GetWORD(packetlen)
+ GetWORD(packetlen);
if (packetlen & 0x8000) {
m_segments.fMerged = true;
}
if ((packetlen & 0x4000) == 0) {
- GetWORD(packetlen)
+ GetWORD(packetlen);
packetlen &= 0x3fffffff;
} else {
packetlen &= 0x3fff;
}
- GetWORD(packetoffset)
+ GetWORD(packetoffset);
if ((packetoffset & 0x4000) == 0) {
- GetWORD(packetoffset)
+ GetWORD(packetoffset);
packetoffset &= 0x3fffffff;
} else {
packetoffset &= 0x3fff;
@@ -1539,17 +1539,17 @@ void CRMFile::GetDimensions() var = (var << 8) | (*p++); \
var = (var << 8) | (*p++);
- GetWORD(packetlen)
+ GetWORD(packetlen);
if ((packetlen & 0x4000) == 0) {
- GetWORD(packetlen)
+ GetWORD(packetlen);
packetlen &= 0x3fffffff;
} else {
packetlen &= 0x3fff;
}
- GetWORD(packetoffset)
+ GetWORD(packetoffset);
if ((packetoffset & 0x4000) == 0) {
- GetWORD(packetoffset)
+ GetWORD(packetoffset);
packetoffset &= 0x3fffffff;
} else {
packetoffset &= 0x3fff;
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp index 259c0e425..a0a250a79 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp @@ -165,22 +165,22 @@ CMpcAudioRenderer::~CMpcAudioRenderer() {
Stop();
- SAFE_DELETE(m_pSoundTouch)
- SAFE_RELEASE(m_pDSBuffer)
- SAFE_RELEASE(m_pDS)
+ SAFE_DELETE(m_pSoundTouch);
+ SAFE_RELEASE(m_pDSBuffer);
+ SAFE_RELEASE(m_pDS);
- SAFE_RELEASE(pRenderClient)
- SAFE_RELEASE(pAudioClient)
- SAFE_RELEASE(pMMDevice)
+ SAFE_RELEASE(pRenderClient);
+ SAFE_RELEASE(pAudioClient);
+ SAFE_RELEASE(pMMDevice);
if (m_pReferenceClock) {
SetSyncSource(NULL);
- SAFE_RELEASE(m_pReferenceClock)
+ SAFE_RELEASE(m_pReferenceClock);
}
if (m_pWaveFileFormat) {
BYTE* p = (BYTE*)m_pWaveFileFormat;
- SAFE_DELETE_ARRAY(p)
+ SAFE_DELETE_ARRAY(p);
}
if (hTask != NULL && pfAvRevertMmThreadCharacteristics != NULL) {
@@ -335,7 +335,7 @@ HRESULT CMpcAudioRenderer::SetMediaType(const CMediaType* pmt) if (m_pWaveFileFormat) {
BYTE* p = (BYTE*)m_pWaveFileFormat;
- SAFE_DELETE_ARRAY(p)
+ SAFE_DELETE_ARRAY(p);
}
m_pWaveFileFormat = NULL;
@@ -391,7 +391,7 @@ HRESULT CMpcAudioRenderer::CompleteConnect(IPin* pReceivePin) STDMETHODIMP CMpcAudioRenderer::Run(REFERENCE_TIME tStart)
{
- HRESULT hr;
+ HRESULT hr;
if (m_State == State_Running) {
return NOERROR;
@@ -672,11 +672,11 @@ HRESULT CMpcAudioRenderer::CreateDSBuffer() if (SUCCEEDED(hr = m_pDS->CreateSoundBuffer(&dsbd, &pDSBPrimary, NULL))) {
hr = pDSBPrimary->SetFormat(m_pWaveFileFormat);
ATLASSERT(SUCCEEDED(hr));
- SAFE_RELEASE(pDSBPrimary)
+ SAFE_RELEASE(pDSBPrimary);
}
- SAFE_RELEASE(m_pDSBuffer)
+ SAFE_RELEASE(m_pDSBuffer);
cDSBufferDesc.dwSize = sizeof(DSBUFFERDESC);
cDSBufferDesc.dwFlags = DSBCAPS_GLOBALFOCUS | DSBCAPS_GETCURRENTPOSITION2 |
DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY;
@@ -731,7 +731,7 @@ HRESULT CMpcAudioRenderer::InitCoopLevel() hr = m_pGraph->QueryInterface(__uuidof(IVideoWindow), (void**) &pVideoWindow);
if (SUCCEEDED(hr)) {
pVideoWindow->get_Owner((OAHWND*)&hWnd);
- SAFE_RELEASE(pVideoWindow)
+ SAFE_RELEASE(pVideoWindow);
}
if (!hWnd) {
hWnd = GetTopWindow(NULL);
@@ -827,7 +827,7 @@ HRESULT CMpcAudioRenderer::WriteSampleToDSBuffer(IMediaSample* pMediaSample, boo hr = pMediaSample->GetPointer(&pMediaBuffer);
if (m_dRate > 1.0) {
- int nBytePerSample = m_pWaveFileFormat->nChannels * (m_pWaveFileFormat->wBitsPerSample / 8);
+ int nBytePerSample = m_pWaveFileFormat->nChannels * (m_pWaveFileFormat->wBitsPerSample / 8);
m_pSoundTouch->putSamples((const short*)pMediaBuffer, lSize / nBytePerSample);
lSize = m_pSoundTouch->receiveSamples((short*)pMediaBuffer, lSize / nBytePerSample) * nBytePerSample;
}
@@ -875,7 +875,7 @@ HRESULT CMpcAudioRenderer::WriteSampleToDSBuffer(IMediaSample* pMediaSample, boo HRESULT CMpcAudioRenderer::DoRenderSampleWasapi(IMediaSample* pMediaSample)
{
- HRESULT hr = S_OK;
+ HRESULT hr = S_OK;
REFERENCE_TIME rtStart = 0;
REFERENCE_TIME rtStop = 0;
BYTE* pMediaBuffer = NULL;
@@ -1011,7 +1011,7 @@ HRESULT CMpcAudioRenderer::CheckAudioClient(WAVEFORMATEX* pWaveFormatEx) TRACE(_T("CMpcAudioRenderer::CheckAudioClient Format changed, reinitialize the audio client\n"));
if (m_pWaveFileFormat) {
BYTE* p = (BYTE*)m_pWaveFileFormat;
- SAFE_DELETE_ARRAY(p)
+ SAFE_DELETE_ARRAY(p);
}
m_pWaveFileFormat = pNewWaveFormatEx;
hr = pAudioClient->IsFormatSupported(AUDCLNT_SHAREMODE_EXCLUSIVE, pWaveFormatEx, NULL);
@@ -1020,8 +1020,8 @@ HRESULT CMpcAudioRenderer::CheckAudioClient(WAVEFORMATEX* pWaveFormatEx) pAudioClient->Stop();
}
isAudioClientStarted = false;
- SAFE_RELEASE(pRenderClient)
- SAFE_RELEASE(pAudioClient)
+ SAFE_RELEASE(pRenderClient);
+ SAFE_RELEASE(pAudioClient);
if (SUCCEEDED(hr)) {
hr = CreateAudioClient(pMMDevice, &pAudioClient);
}
@@ -1036,7 +1036,7 @@ HRESULT CMpcAudioRenderer::CheckAudioClient(WAVEFORMATEX* pWaveFormatEx) }
- SAFE_RELEASE(pRenderClient)
+ SAFE_RELEASE(pRenderClient);
if (SUCCEEDED(hr)) {
hr = InitAudioClient(pWaveFormatEx, pAudioClient, &pRenderClient);
}
@@ -1106,17 +1106,17 @@ HRESULT CMpcAudioRenderer::GetAudioDevice(IMMDevice** ppMMDevice) if ((pProps->GetValue(PKEY_Device_FriendlyName, &varName) == S_OK) && (m_csSound_Device == varName.pwszVal)) {
TRACE(_T("CMpcAudioRenderer::GetAudioDevice - devices->GetId OK, num: (%d), pwszVal: %s, pwszID: %s\n"), i, varName.pwszVal, pwszID);
enumerator->GetDevice(pwszID, ppMMDevice);
- SAFE_RELEASE(devices)
+ SAFE_RELEASE(devices);
*(ppMMDevice) = endpoint;
CoTaskMemFree(pwszID);
pwszID = NULL;
PropVariantClear(&varName);
- SAFE_RELEASE(pProps)
+ SAFE_RELEASE(pProps);
return S_OK;
} else {
PropVariantClear(&varName);
- SAFE_RELEASE(pProps)
- SAFE_RELEASE(endpoint)
+ SAFE_RELEASE(pProps);
+ SAFE_RELEASE(endpoint);
CoTaskMemFree(pwszID);
pwszID = NULL;
}
@@ -1136,7 +1136,7 @@ HRESULT CMpcAudioRenderer::GetAudioDevice(IMMDevice** ppMMDevice) TRACE(_T("CMpcAudioRenderer::GetAudioDevice - Unable to find selected audio device, using the default end point!\n"));
hr = enumerator->GetDefaultAudioEndpoint(eRender, eConsole, ppMMDevice);
- SAFE_RELEASE(devices)
+ SAFE_RELEASE(devices);
return hr;
}
@@ -1157,7 +1157,7 @@ bool CMpcAudioRenderer::CheckFormatChanged(WAVEFORMATEX* pWaveFormatEx, WAVEFORM return false;
}
- int size = sizeof(WAVEFORMATEX) + pWaveFormatEx->cbSize; // Always true, even for WAVEFORMATEXTENSIBLE and WAVEFORMATEXTENSIBLE_IEC61937
+ int size = sizeof(WAVEFORMATEX) + pWaveFormatEx->cbSize; // Always true, even for WAVEFORMATEXTENSIBLE and WAVEFORMATEXTENSIBLE_IEC61937
*ppNewWaveFormatEx = (WAVEFORMATEX*)DNew BYTE[size];
if (! *ppNewWaveFormatEx) {
return false;
@@ -1287,7 +1287,7 @@ HRESULT CMpcAudioRenderer::CreateAudioClient(IMMDevice* pMMDevice, IAudioClient* if (isAudioClientStarted) {
(*ppAudioClient)->Stop();
}
- SAFE_RELEASE(*ppAudioClient)
+ SAFE_RELEASE(*ppAudioClient);
isAudioClientStarted = false;
}
diff --git a/src/filters/renderer/VideoRenderers/AllocatorCommon.cpp b/src/filters/renderer/VideoRenderers/AllocatorCommon.cpp index a21587ec5..374472936 100644 --- a/src/filters/renderer/VideoRenderers/AllocatorCommon.cpp +++ b/src/filters/renderer/VideoRenderers/AllocatorCommon.cpp @@ -34,11 +34,11 @@ bool IsVMR9InGraph(IFilterGraph* pFG)
{
- BeginEnumFilters(pFG, pEF, pBF)
+ BeginEnumFilters(pFG, pEF, pBF);
if (CComQIPtr<IVMRWindowlessControl9>(pBF)) {
return true;
}
- EndEnumFilters
+ EndEnumFilters;
return false;
}
@@ -91,10 +91,10 @@ HRESULT CreateAP9(const CLSID& clsid, HWND hWnd, bool bFullscreen, ISubPicAlloca HRESULT CreateEVR(const CLSID& clsid, HWND hWnd, bool bFullscreen, ISubPicAllocatorPresenter** ppAP)
{
- HRESULT hr = E_FAIL;
+ HRESULT hr = E_FAIL;
if (clsid == CLSID_EVRAllocatorPresenter) {
CString Error;
- *ppAP = DNew DSObjects::CEVRAllocatorPresenter(hWnd, bFullscreen, hr, Error);
+ *ppAP = DNew DSObjects::CEVRAllocatorPresenter(hWnd, bFullscreen, hr, Error);
(*ppAP)->AddRef();
if (FAILED(hr)) {
diff --git a/src/filters/renderer/VideoRenderers/AllocatorCommon7.cpp b/src/filters/renderer/VideoRenderers/AllocatorCommon7.cpp index 6cb275993..9919a9be1 100644 --- a/src/filters/renderer/VideoRenderers/AllocatorCommon7.cpp +++ b/src/filters/renderer/VideoRenderers/AllocatorCommon7.cpp @@ -34,11 +34,11 @@ bool IsVMR7InGraph(IFilterGraph* pFG)
{
- BeginEnumFilters(pFG, pEF, pBF)
+ BeginEnumFilters(pFG, pEF, pBF);
if (CComQIPtr<IVMRWindowlessControl>(pBF)) {
return true;
}
- EndEnumFilters
+ EndEnumFilters;
return false;
}
diff --git a/src/filters/renderer/VideoRenderers/D3DFont.cpp b/src/filters/renderer/VideoRenderers/D3DFont.cpp index a89e4e55b..fca56b53c 100644 --- a/src/filters/renderer/VideoRenderers/D3DFont.cpp +++ b/src/filters/renderer/VideoRenderers/D3DFont.cpp @@ -377,9 +377,9 @@ HRESULT CD3DFont::RestoreDeviceObjects() Desc.Format))) {
bSupportsAlphaBlend = false;
}
- SAFE_RELEASE(pSurf)
+ SAFE_RELEASE(pSurf);
}
- SAFE_RELEASE(pd3d9)
+ SAFE_RELEASE(pd3d9);
}
// Create the state blocks for rendering text
@@ -446,9 +446,9 @@ HRESULT CD3DFont::RestoreDeviceObjects() //-----------------------------------------------------------------------------
HRESULT CD3DFont::InvalidateDeviceObjects()
{
- SAFE_RELEASE(m_pVB)
- SAFE_RELEASE(m_pStateBlockSaved)
- SAFE_RELEASE(m_pStateBlockDrawText)
+ SAFE_RELEASE(m_pVB);
+ SAFE_RELEASE(m_pStateBlockSaved);
+ SAFE_RELEASE(m_pStateBlockDrawText);
return S_OK;
}
@@ -461,7 +461,7 @@ HRESULT CD3DFont::InvalidateDeviceObjects() //-----------------------------------------------------------------------------
HRESULT CD3DFont::DeleteDeviceObjects()
{
- SAFE_RELEASE(m_pTexture)
+ SAFE_RELEASE(m_pTexture);
m_pd3dDevice = NULL;
return S_OK;
diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp index 6e2819d6d..3dc3a8fc5 100644 --- a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp @@ -411,13 +411,13 @@ public: void CDX9AllocatorPresenter::VSyncThread()
{
- HANDLE hEvts[] = { m_hEvtQuit};
- bool bQuit = false;
- TIMECAPS tc;
- DWORD dwResolution;
- DWORD dwUser = 0;
+ HANDLE hEvts[] = { m_hEvtQuit};
+ bool bQuit = false;
+ TIMECAPS tc;
+ DWORD dwResolution;
+ DWORD dwUser = 0;
- //DWORD dwTaskIndex = 0;
+ //DWORD dwTaskIndex = 0;
//// Tell Vista Multimedia Class Scheduler we are a playback thread (increase priority)
//if (pfAvSetMmThreadCharacteristicsW)
// hAvrt = pfAvSetMmThreadCharacteristicsW (L"Playback", &dwTaskIndex);
@@ -425,8 +425,8 @@ void CDX9AllocatorPresenter::VSyncThread() // pfAvSetMmThreadPriority (hAvrt, AVRT_PRIORITY_HIGH /*AVRT_PRIORITY_CRITICAL*/);
timeGetDevCaps(&tc, sizeof(TIMECAPS));
- dwResolution = min(max(tc.wPeriodMin, 0), tc.wPeriodMax);
- dwUser = timeBeginPeriod(dwResolution);
+ dwResolution = min(max(tc.wPeriodMin, 0), tc.wPeriodMax);
+ dwUser = timeBeginPeriod(dwResolution);
CRenderersData* pApp = GetRenderersData();
CRenderersSettings& s = GetRenderersSettings();
@@ -441,9 +441,9 @@ void CDX9AllocatorPresenter::VSyncThread() // Do our stuff
if (m_pD3DDev && s.m_RenderSettings.iVMR9VSync) {
- int VSyncPos = GetVBlackPos();
+ int VSyncPos = GetVBlackPos();
int WaitRange = max(m_ScreenSize.cy / 40, 5);
- int MinRange = max(min(int(0.003 * double(m_ScreenSize.cy) * double(m_RefreshRate) + 0.5), m_ScreenSize.cy / 3), 5); // 1.8 ms or max 33 % of Time
+ int MinRange = max(min(int(0.003 * double(m_ScreenSize.cy) * double(m_RefreshRate) + 0.5), m_ScreenSize.cy / 3), 5); // 1.8 ms or max 33 % of Time
VSyncPos += MinRange + WaitRange;
@@ -576,7 +576,7 @@ void CDX9AllocatorPresenter::VSyncThread() DWORD WINAPI CDX9AllocatorPresenter::VSyncThreadStatic(LPVOID lpParam)
{
SetThreadName((DWORD) - 1, "CDX9Presenter::VSyncThread");
- CDX9AllocatorPresenter* pThis = (CDX9AllocatorPresenter*) lpParam;
+ CDX9AllocatorPresenter* pThis = (CDX9AllocatorPresenter*) lpParam;
pThis->VSyncThread();
return 0;
}
@@ -730,8 +730,8 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString& _Error) // If it is present, override default settings
for (UINT Adapter=0;Adapter<g_pD3D->GetAdapterCount();Adapter++)
{
- D3DADAPTER_IDENTIFIER9 Identifier;
- HRESULT Res;
+ D3DADAPTER_IDENTIFIER9 Identifier;
+ HRESULT Res;
Res = g_pD3D->GetAdapterIdentifier(Adapter,0,&Identifier);
if (strstr(Identifier.Description,"PerfHUD") != 0)
@@ -1012,10 +1012,10 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString& _Error) int CurrentSize = min(m_ScreenSize.cx, MinSize);
double Scale = double(CurrentSize) / double(MinSize);
m_TextScale = Scale;
- m_pD3DXCreateFont(m_pD3DDev, // D3D device
+ m_pD3DXCreateFont(m_pD3DDev, // D3D device
(int)(-24.0 * Scale), // Height
- (UINT)(-11.0 * Scale), // Width
- CurrentSize < 800 ? FW_NORMAL : FW_BOLD, // Weight
+ (UINT)(-11.0 * Scale), // Width
+ CurrentSize < 800 ? FW_NORMAL : FW_BOLD, // Weight
0, // MipLevels, 0 = autogen mipmaps
FALSE, // Italic
DEFAULT_CHARSET, // CharSet
@@ -1030,7 +1030,7 @@ HRESULT CDX9AllocatorPresenter::CreateDevice(CString& _Error) m_pSprite = NULL;
if (m_pD3DXCreateSprite) {
- m_pD3DXCreateSprite(m_pD3DDev, // D3D device
+ m_pD3DXCreateSprite(m_pD3DDev, // D3D device
&m_pSprite);
}
@@ -1073,7 +1073,7 @@ UINT CDX9AllocatorPresenter::GetAdapter(IDirect3D9* pD3D, bool bGetAdapter) CRenderersSettings& s = GetRenderersSettings();
if (bGetAdapter && (pD3D->GetAdapterCount() > 1) && (s.D3D9RenderDevice != _T(""))) {
- TCHAR strGUID[50];
+ TCHAR strGUID[50];
D3DADAPTER_IDENTIFIER9 adapterIdentifier;
for (UINT adp = 0, num_adp = pD3D->GetAdapterCount(); adp < num_adp; ++adp) {
@@ -1137,7 +1137,7 @@ STDMETHODIMP CDX9AllocatorPresenter::CreateRenderer(IUnknown** ppRenderer) void CDX9AllocatorPresenter::CalculateJitter(LONGLONG PerfCounter)
{
// Calculate the jitter!
- LONGLONG llPerf = PerfCounter;
+ LONGLONG llPerf = PerfCounter;
if ((m_rtTimePerFrame != 0) && (labs((long)(llPerf - m_llLastPerf)) < m_rtTimePerFrame * 3)) {
m_nNextJitter = (m_nNextJitter + 1) % NB_JITTER;
m_pllJitter[m_nNextJitter] = llPerf - m_llLastPerf;
@@ -1146,8 +1146,8 @@ void CDX9AllocatorPresenter::CalculateJitter(LONGLONG PerfCounter) m_MinJitter = MAXLONG64;
// Calculate the real FPS
- LONGLONG llJitterSum = 0;
- LONGLONG llJitterSumAvg = 0;
+ LONGLONG llJitterSum = 0;
+ LONGLONG llJitterSumAvg = 0;
for (int i = 0; i < NB_JITTER; i++) {
LONGLONG Jitter = m_pllJitter[i];
llJitterSum += Jitter;
@@ -1563,9 +1563,9 @@ STDMETHODIMP_(bool) CDX9AllocatorPresenter::Paint(bool fAll) // Casimir666 : show OSD
if (m_VMR9AlphaBitmap.dwFlags & VMRBITMAP_UPDATE) {
CAutoLock BitMapLock(&m_VMR9AlphaBitmapLock);
- CRect rcSrc(m_VMR9AlphaBitmap.rSrc);
- m_pOSDTexture = NULL;
- m_pOSDSurface = NULL;
+ CRect rcSrc(m_VMR9AlphaBitmap.rSrc);
+ m_pOSDTexture = NULL;
+ m_pOSDSurface = NULL;
if ((m_VMR9AlphaBitmap.dwFlags & VMRBITMAP_DISABLE) == 0 && (BYTE*)m_VMR9AlphaBitmapData) {
if ((m_pD3DXLoadSurfaceFromMemory != NULL) &&
SUCCEEDED(hr = m_pD3DDev->CreateTexture(rcSrc.Width(), rcSrc.Height(), 1,
@@ -1584,8 +1584,8 @@ STDMETHODIMP_(bool) CDX9AllocatorPresenter::Paint(bool fAll) m_VMR9AlphaBitmap.clrSrcKey);
}
if (FAILED(hr)) {
- m_pOSDTexture = NULL;
- m_pOSDSurface = NULL;
+ m_pOSDTexture = NULL;
+ m_pOSDSurface = NULL;
}
}
}
@@ -1978,14 +1978,14 @@ void CDX9AllocatorPresenter::DrawStats() break;
}
- LONGLONG llMaxJitter = m_MaxJitter;
- LONGLONG llMinJitter = m_MinJitter;
- LONGLONG llMaxSyncOffset = m_MaxSyncOffset;
- LONGLONG llMinSyncOffset = m_MinSyncOffset;
- RECT rc = {40, 40, 0, 0 };
+ LONGLONG llMaxJitter = m_MaxJitter;
+ LONGLONG llMinJitter = m_MinJitter;
+ LONGLONG llMaxSyncOffset = m_MaxSyncOffset;
+ LONGLONG llMinSyncOffset = m_MinSyncOffset;
+ RECT rc = {40, 40, 0, 0 };
if (m_pFont && m_pSprite) {
m_pSprite->Begin(D3DXSPRITE_ALPHABLEND);
- CString strText;
+ CString strText;
int TextHeight = int(25.0 * m_TextScale + 0.5);
//strText.Format(L"Frame rate : %7.03f (%7.3f ms = %.03f, %s) (%7.3f ms = %.03f%s) Clock: %7.3f ms %+1.4f %% %+1.9f %+1.9f", m_fAvrFps, double(m_rtTimePerFrame) / 10000.0, 10000000.0 / (double)(m_rtTimePerFrame), m_bInterlaced ? L"I" : L"P", GetFrameTime() * 1000.0, GetFrameRate(), m_DetectedLock ? L" L" : L"", m_ClockDiff/10000.0, m_ModeratedTimeSpeed*100.0 - 100.0, m_ModeratedTimeSpeedDiff, m_ClockDiffCalc/10000.0);
if (bDetailedStats > 1) {
@@ -2258,8 +2258,8 @@ void CDX9AllocatorPresenter::DrawStats() }
if (m_pLine && bDetailedStats) {
- D3DXVECTOR2 Points[NB_JITTER];
- int nIndex;
+ D3DXVECTOR2 Points[NB_JITTER];
+ int nIndex;
int StartX = 0;
int StartY = 0;
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp index 66d4c0528..1eeea9244 100644 --- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp @@ -67,14 +67,14 @@ using namespace DSObjects; CEVRAllocatorPresenter::CEVRAllocatorPresenter(HWND hWnd, bool bFullscreen, HRESULT& hr, CString& _Error)
: CDX9AllocatorPresenter(hWnd, bFullscreen, hr, true, _Error)
{
- HMODULE hLib;
+ HMODULE hLib;
CRenderersSettings& s = GetRenderersSettings();
- m_nResetToken = 0;
- m_hThread = INVALID_HANDLE_VALUE;
+ m_nResetToken = 0;
+ m_hThread = INVALID_HANDLE_VALUE;
m_hGetMixerThread = INVALID_HANDLE_VALUE;
- m_hEvtFlush = INVALID_HANDLE_VALUE;
- m_hEvtQuit = INVALID_HANDLE_VALUE;
+ m_hEvtFlush = INVALID_HANDLE_VALUE;
+ m_hEvtQuit = INVALID_HANDLE_VALUE;
m_bEvtQuit = 0;
m_bEvtFlush = 0;
m_ModeratedTime = 0;
@@ -92,9 +92,9 @@ CEVRAllocatorPresenter::CEVRAllocatorPresenter(HWND hWnd, bool bFullscreen, HRES // Load EVR functions
hLib = LoadLibrary(L"evr.dll");
- pfMFCreateDXSurfaceBuffer = hLib ? (PTR_MFCreateDXSurfaceBuffer) GetProcAddress(hLib, "MFCreateDXSurfaceBuffer") : NULL;
- pfMFCreateVideoSampleFromSurface = hLib ? (PTR_MFCreateVideoSampleFromSurface) GetProcAddress(hLib, "MFCreateVideoSampleFromSurface") : NULL;
- pfMFCreateVideoMediaType = hLib ? (PTR_MFCreateVideoMediaType) GetProcAddress(hLib, "MFCreateVideoMediaType") : NULL;
+ pfMFCreateDXSurfaceBuffer = hLib ? (PTR_MFCreateDXSurfaceBuffer) GetProcAddress(hLib, "MFCreateDXSurfaceBuffer") : NULL;
+ pfMFCreateVideoSampleFromSurface = hLib ? (PTR_MFCreateVideoSampleFromSurface) GetProcAddress(hLib, "MFCreateVideoSampleFromSurface") : NULL;
+ pfMFCreateVideoMediaType = hLib ? (PTR_MFCreateVideoMediaType) GetProcAddress(hLib, "MFCreateVideoMediaType") : NULL;
if (!pfDXVA2CreateDirect3DDeviceManager9 || !pfMFCreateDXSurfaceBuffer || !pfMFCreateVideoSampleFromSurface || !pfMFCreateVideoMediaType) {
if (!pfDXVA2CreateDirect3DDeviceManager9) {
@@ -143,8 +143,8 @@ CEVRAllocatorPresenter::CEVRAllocatorPresenter(HWND hWnd, bool bFullscreen, HRES _Error += L"DXVA2CreateDirect3DDeviceManager9 failed\n";
}
- CComPtr<IDirectXVideoDecoderService> pDecoderService;
- HANDLE hDevice;
+ CComPtr<IDirectXVideoDecoderService> pDecoderService;
+ HANDLE hDevice;
if (SUCCEEDED(m_pD3DManager->OpenDeviceHandle(&hDevice)) &&
SUCCEEDED(m_pD3DManager->GetVideoService(hDevice, __uuidof(IDirectXVideoDecoderService), (void**)&pDecoderService))) {
TRACE_EVR("EVR: DXVA2 : device handle = 0x%08x", hDevice);
@@ -188,10 +188,9 @@ CEVRAllocatorPresenter::CEVRAllocatorPresenter(HWND hWnd, bool bFullscreen, HRES CEVRAllocatorPresenter::~CEVRAllocatorPresenter(void)
{
StopWorkerThreads(); // If not already done...
- m_pMediaType = NULL;
- m_pClock = NULL;
-
- m_pD3DManager = NULL;
+ m_pMediaType = NULL;
+ m_pClock = NULL;
+ m_pD3DManager = NULL;
}
void CEVRAllocatorPresenter::ResetStats()
@@ -214,18 +213,18 @@ HRESULT CEVRAllocatorPresenter::CheckShutdown() const void CEVRAllocatorPresenter::StartWorkerThreads()
{
- DWORD dwThreadId;
+ DWORD dwThreadId;
if (m_nRenderState == Shutdown) {
- m_hEvtQuit = CreateEvent(NULL, TRUE, FALSE, NULL);
- m_hEvtFlush = CreateEvent(NULL, TRUE, FALSE, NULL);
+ m_hEvtQuit = CreateEvent(NULL, TRUE, FALSE, NULL);
+ m_hEvtFlush = CreateEvent(NULL, TRUE, FALSE, NULL);
- m_hThread = ::CreateThread(NULL, 0, PresentThread, (LPVOID)this, 0, &dwThreadId);
+ m_hThread = ::CreateThread(NULL, 0, PresentThread, (LPVOID)this, 0, &dwThreadId);
SetThreadPriority(m_hThread, THREAD_PRIORITY_TIME_CRITICAL);
m_hGetMixerThread = ::CreateThread(NULL, 0, GetMixerThreadStatic, (LPVOID)this, 0, &dwThreadId);
SetThreadPriority(m_hGetMixerThread, THREAD_PRIORITY_HIGHEST);
- m_nRenderState = Stopped;
+ m_nRenderState = Stopped;
TRACE_EVR("EVR: Worker threads started...\n");
}
}
@@ -246,21 +245,21 @@ void CEVRAllocatorPresenter::StopWorkerThreads() TerminateThread(m_hGetMixerThread, 0xDEAD);
}
- if (m_hThread != INVALID_HANDLE_VALUE) {
+ if (m_hThread != INVALID_HANDLE_VALUE) {
CloseHandle(m_hThread);
}
- if (m_hGetMixerThread != INVALID_HANDLE_VALUE) {
+ if (m_hGetMixerThread != INVALID_HANDLE_VALUE) {
CloseHandle(m_hGetMixerThread);
}
- if (m_hEvtFlush != INVALID_HANDLE_VALUE) {
+ if (m_hEvtFlush != INVALID_HANDLE_VALUE) {
CloseHandle(m_hEvtFlush);
}
- if (m_hEvtQuit != INVALID_HANDLE_VALUE) {
+ if (m_hEvtQuit != INVALID_HANDLE_VALUE) {
CloseHandle(m_hEvtQuit);
}
m_bEvtFlush = false;
- m_bEvtQuit = false;
+ m_bEvtQuit = false;
TRACE_EVR("EVR: Worker threads stopped...\n");
@@ -274,11 +273,11 @@ STDMETHODIMP CEVRAllocatorPresenter::CreateRenderer(IUnknown** ppRenderer) *ppRenderer = NULL;
- HRESULT hr = E_FAIL;
+ HRESULT hr = E_FAIL;
do {
- CMacrovisionKicker* pMK = DNew CMacrovisionKicker(NAME("CMacrovisionKicker"), NULL);
- CComPtr<IUnknown> pUnk = (IUnknown*)(INonDelegatingUnknown*)pMK;
+ CMacrovisionKicker* pMK = DNew CMacrovisionKicker(NAME("CMacrovisionKicker"), NULL);
+ CComPtr<IUnknown> pUnk = (IUnknown*)(INonDelegatingUnknown*)pMK;
COuterEVR* pOuterEVR = DNew COuterEVR(NAME("COuterEVR"), pUnk, hr, &m_VMR9AlphaBitmap, this);
m_pOuterEVR = pOuterEVR;
@@ -291,8 +290,8 @@ STDMETHODIMP CEVRAllocatorPresenter::CreateRenderer(IUnknown** ppRenderer) }
// Set EVR custom presenter
- CComPtr<IMFVideoPresenter> pVP;
- CComPtr<IMFVideoRenderer> pMFVR;
+ CComPtr<IMFVideoPresenter> pVP;
+ CComPtr<IMFVideoRenderer> pMFVR;
CComQIPtr<IMFGetService, &__uuidof(IMFGetService)> pMFGS = pBF;
CComQIPtr<IEVRFilterConfig> pConfig = pBF;
if (SUCCEEDED(hr)) {
@@ -311,7 +310,7 @@ STDMETHODIMP CEVRAllocatorPresenter::CreateRenderer(IUnknown** ppRenderer) }
#if 1
- CComPtr<IPin> pPin = GetFirstPin(pBF);
+ CComPtr<IPin> pPin = GetFirstPin(pBF);
CComQIPtr<IMemInputPin> pMemInputPin = pPin;
// No NewSegment : no chocolate :o)
@@ -338,7 +337,7 @@ STDMETHODIMP_(bool) CEVRAllocatorPresenter::Paint(bool fAll) STDMETHODIMP CEVRAllocatorPresenter::NonDelegatingQueryInterface(REFIID riid, void** ppv)
{
- HRESULT hr;
+ HRESULT hr;
if (riid == __uuidof(IMFClockStateSink)) {
hr = GetInterface((IMFClockStateSink*)this, ppv);
} else if (riid == __uuidof(IMFVideoPresenter)) {
@@ -373,10 +372,10 @@ STDMETHODIMP CEVRAllocatorPresenter::NonDelegatingQueryInterface(REFIID riid, vo // IMFClockStateSink
STDMETHODIMP CEVRAllocatorPresenter::OnClockStart(MFTIME hnsSystemTime, LONGLONG llClockStartOffset)
{
- m_nRenderState = Started;
+ m_nRenderState = Started;
TRACE_EVR("EVR: OnClockStart hnsSystemTime = %I64d, llClockStartOffset = %I64d\n", hnsSystemTime, llClockStartOffset);
- m_ModeratedTimeLast = -1;
+ m_ModeratedTimeLast = -1;
m_ModeratedClockLast = -1;
return S_OK;
@@ -385,10 +384,10 @@ STDMETHODIMP CEVRAllocatorPresenter::OnClockStart(MFTIME hnsSystemTime, LONGLON STDMETHODIMP CEVRAllocatorPresenter::OnClockStop(MFTIME hnsSystemTime)
{
TRACE_EVR("EVR: OnClockStop hnsSystemTime = %I64d\n", hnsSystemTime);
- m_nRenderState = Stopped;
+ m_nRenderState = Stopped;
m_ModeratedClockLast = -1;
- m_ModeratedTimeLast = -1;
+ m_ModeratedTimeLast = -1;
return S_OK;
}
@@ -396,18 +395,18 @@ STDMETHODIMP CEVRAllocatorPresenter::OnClockPause(MFTIME hnsSystemTime) {
TRACE_EVR("EVR: OnClockPause hnsSystemTime = %I64d\n", hnsSystemTime);
if (!m_bSignaledStarvation) {
- m_nRenderState = Paused;
+ m_nRenderState = Paused;
}
- m_ModeratedTimeLast = -1;
+ m_ModeratedTimeLast = -1;
m_ModeratedClockLast = -1;
return S_OK;
}
STDMETHODIMP CEVRAllocatorPresenter::OnClockRestart(MFTIME hnsSystemTime)
{
- m_nRenderState = Started;
+ m_nRenderState = Started;
- m_ModeratedTimeLast = -1;
+ m_ModeratedTimeLast = -1;
m_ModeratedClockLast = -1;
TRACE_EVR("EVR: OnClockRestart hnsSystemTime = %I64d\n", hnsSystemTime);
@@ -440,7 +439,7 @@ bool CEVRAllocatorPresenter::GetState(DWORD dwMilliSecsTimeout, FILTER_STATE* St // IQualProp
STDMETHODIMP CEVRAllocatorPresenter::get_FramesDroppedInRenderer(int* pcFrames)
{
- *pcFrames = m_pcFrames;
+ *pcFrames = m_pcFrames;
return S_OK;
}
STDMETHODIMP CEVRAllocatorPresenter::get_FramesDrawn(int* pcFramesDrawn)
@@ -486,7 +485,7 @@ STDMETHODIMP CEVRAllocatorPresenter::GetFastestRate(MFRATE_DIRECTION eDirection, CAutoLock lock(this);
CheckPointer(pflRate, E_POINTER);
- CHECK_HR(CheckShutdown())
+ CHECK_HR(CheckShutdown());
// Get the maximum forward rate.
fMaxRate = GetMaxRate(fThin);
@@ -509,11 +508,11 @@ STDMETHODIMP CEVRAllocatorPresenter::IsRateSupported(BOOL fThin, float flRate, f CAutoLock lock(this);
HRESULT hr = S_OK;
- float fMaxRate = 0.0f;
- float fNearestRate = flRate; // Default.
+ float fMaxRate = 0.0f;
+ float fNearestRate = flRate; // Default.
CheckPointer(pflNearestSupportedRate, E_POINTER);
- CHECK_HR(hr = CheckShutdown())
+ CHECK_HR(hr = CheckShutdown());
// Find the maximum forward rate.
fMaxRate = GetMaxRate(fThin);
@@ -576,7 +575,7 @@ void CEVRAllocatorPresenter::CompleteFrameStep(bool bCancel) // IMFVideoPresenter
STDMETHODIMP CEVRAllocatorPresenter::ProcessMessage(MFVP_MESSAGE_TYPE eMessage, ULONG_PTR ulParam)
{
- HRESULT hr = S_OK;
+ HRESULT hr = S_OK;
switch (eMessage) {
case MFVP_MESSAGE_BEGINSTREAMING : // The EVR switched from stopped to paused. The presenter should allocate resources
@@ -682,12 +681,12 @@ HRESULT CEVRAllocatorPresenter::IsMediaTypeSupported(IMFMediaType* pMixerType) HRESULT CEVRAllocatorPresenter::CreateProposedOutputType(IMFMediaType* pMixerType, IMFMediaType** pType)
{
- HRESULT hr;
- AM_MEDIA_TYPE* pAMMedia = NULL;
- LARGE_INTEGER i64Size;
- MFVIDEOFORMAT* VideoFormat;
+ HRESULT hr;
+ AM_MEDIA_TYPE* pAMMedia = NULL;
+ LARGE_INTEGER i64Size;
+ MFVIDEOFORMAT* VideoFormat;
- CHECK_HR(pMixerType->GetRepresentation(FORMAT_MFVideoFormat, (void**)&pAMMedia))
+ CHECK_HR(pMixerType->GetRepresentation(FORMAT_MFVideoFormat, (void**)&pAMMedia));
VideoFormat = (MFVIDEOFORMAT*)pAMMedia->pbFormat;
hr = pfMFCreateVideoMediaType(VideoFormat, &m_pMediaType);
@@ -788,12 +787,12 @@ HRESULT CEVRAllocatorPresenter::CreateProposedOutputType(IMFMediaType* pMixerTyp HRESULT CEVRAllocatorPresenter::SetMediaType(IMFMediaType* pType)
{
- HRESULT hr;
- AM_MEDIA_TYPE* pAMMedia = NULL;
- CString strTemp, strTemp1;
+ HRESULT hr;
+ AM_MEDIA_TYPE* pAMMedia = NULL;
+ CString strTemp, strTemp1;
CheckPointer(pType, E_POINTER);
- CHECK_HR(pType->GetRepresentation(FORMAT_VideoInfo2, (void**)&pAMMedia))
+ CHECK_HR(pType->GetRepresentation(FORMAT_VideoInfo2, (void**)&pAMMedia));
hr = InitializeDevice(pType);
if (SUCCEEDED(hr)) {
@@ -965,10 +964,10 @@ LPCTSTR CEVRAllocatorPresenter::GetMediaTypeFormatDesc(IMFMediaType* pMediaType) HRESULT CEVRAllocatorPresenter::RenegotiateMediaType()
{
- HRESULT hr = S_OK;
+ HRESULT hr = S_OK;
- CComPtr<IMFMediaType> pMixerType;
- CComPtr<IMFMediaType> pType;
+ CComPtr<IMFMediaType> pMixerType;
+ CComPtr<IMFMediaType> pType;
if (!m_pMixer) {
return MF_E_INVALIDREQUEST;
@@ -1066,19 +1065,19 @@ HRESULT CEVRAllocatorPresenter::RenegotiateMediaType() bool CEVRAllocatorPresenter::GetImageFromMixer()
{
- MFT_OUTPUT_DATA_BUFFER Buffer;
- HRESULT hr = S_OK;
- DWORD dwStatus;
- REFERENCE_TIME nsSampleTime;
- LONGLONG llClockBefore = 0;
- LONGLONG llClockAfter = 0;
- LONGLONG llMixerLatency;
- UINT dwSurface;
+ MFT_OUTPUT_DATA_BUFFER Buffer;
+ HRESULT hr = S_OK;
+ DWORD dwStatus;
+ REFERENCE_TIME nsSampleTime;
+ LONGLONG llClockBefore = 0;
+ LONGLONG llClockAfter = 0;
+ LONGLONG llMixerLatency;
+ UINT dwSurface;
bool bDoneSomething = false;
while (SUCCEEDED(hr)) {
- CComPtr<IMFSample> pSample;
+ CComPtr<IMFSample> pSample;
if (FAILED(GetFreeSample(&pSample))) {
m_bWaitingSample = true;
@@ -1086,12 +1085,12 @@ bool CEVRAllocatorPresenter::GetImageFromMixer() }
memset(&Buffer, 0, sizeof(Buffer));
- Buffer.pSample = pSample;
+ Buffer.pSample = pSample;
pSample->GetUINT32(GUID_SURFACE_INDEX, &dwSurface);
{
llClockBefore = GetRenderersData()->GetPerfCounter();
- hr = m_pMixer->ProcessOutput(0 , 1, &Buffer, &dwStatus);
+ hr = m_pMixer->ProcessOutput(0, 1, &Buffer, &dwStatus);
llClockAfter = GetRenderersData()->GetPerfCounter();
}
@@ -1107,16 +1106,16 @@ bool CEVRAllocatorPresenter::GetImageFromMixer() }
pSample->GetSampleTime(&nsSampleTime);
- REFERENCE_TIME nsDuration;
+ REFERENCE_TIME nsDuration;
pSample->GetSampleDuration(&nsDuration);
if (GetRenderersData()->m_fTearingTest) {
- RECT rcTearing;
+ RECT rcTearing;
- rcTearing.left = m_nTearingPos;
- rcTearing.top = 0;
- rcTearing.right = rcTearing.left + 4;
- rcTearing.bottom = m_NativeVideoSize.cy;
+ rcTearing.left = m_nTearingPos;
+ rcTearing.top = 0;
+ rcTearing.right = rcTearing.left + 4;
+ rcTearing.bottom = m_NativeVideoSize.cy;
m_pD3DDev->ColorFill(m_pVideoSurface[dwSurface], &rcTearing, D3DCOLOR_ARGB(255, 255, 0, 0));
rcTearing.left = (rcTearing.right + 15) % m_NativeVideoSize.cx;
@@ -1143,13 +1142,13 @@ STDMETHODIMP CEVRAllocatorPresenter::GetCurrentMediaType(__deref_out IMFVideoMe CAutoLock lock(this); // Hold the critical section.
CheckPointer(ppMediaType, E_POINTER);
- CHECK_HR(CheckShutdown())
+ CHECK_HR(CheckShutdown());
if (m_pMediaType == NULL) {
CHECK_HR(MF_E_NOT_INITIALIZED);
}
- CHECK_HR(m_pMediaType->QueryInterface(__uuidof(IMFVideoMediaType), (void**)&ppMediaType))
+ CHECK_HR(m_pMediaType->QueryInterface(__uuidof(IMFVideoMediaType), (void**)&ppMediaType));
return hr;
}
@@ -1157,8 +1156,8 @@ STDMETHODIMP CEVRAllocatorPresenter::GetCurrentMediaType(__deref_out IMFVideoMe // IMFTopologyServiceLookupClient
STDMETHODIMP CEVRAllocatorPresenter::InitServicePointers(/* [in] */ __in IMFTopologyServiceLookup* pLookup)
{
- HRESULT hr;
- DWORD dwObjects = 1;
+ HRESULT hr;
+ DWORD dwObjects = 1;
TRACE_EVR("EVR: CEVRAllocatorPresenter::InitServicePointers\n");
hr = pLookup->LookupService(MF_SERVICE_LOOKUP_GLOBAL, 0, MR_VIDEO_MIXER_SERVICE,
@@ -1179,9 +1178,9 @@ STDMETHODIMP CEVRAllocatorPresenter::ReleaseServicePointers() {
TRACE_EVR("EVR: CEVRAllocatorPresenter::ReleaseServicePointers\n");
StopWorkerThreads();
- m_pMixer = NULL;
- m_pSink = NULL;
- m_pClock = NULL;
+ m_pMixer = NULL;
+ m_pSink = NULL;
+ m_pClock = NULL;
return S_OK;
}
@@ -1222,8 +1221,8 @@ STDMETHODIMP CEVRAllocatorPresenter::Invoke(/* [in] */ __RPC__in_opt IMFAsyncRes STDMETHODIMP CEVRAllocatorPresenter::GetNativeVideoSize(SIZE* pszVideo, SIZE* pszARVideo)
{
if (pszVideo) {
- pszVideo->cx = m_NativeVideoSize.cx;
- pszVideo->cy = m_NativeVideoSize.cy;
+ pszVideo->cx = m_NativeVideoSize.cx;
+ pszVideo->cy = m_NativeVideoSize.cy;
}
if (pszARVideo) {
pszARVideo->cx = m_NativeVideoSize.cx * m_AspectRatio.cx;
@@ -1235,17 +1234,17 @@ STDMETHODIMP CEVRAllocatorPresenter::GetNativeVideoSize(SIZE* pszVideo, SIZE* ps STDMETHODIMP CEVRAllocatorPresenter::GetIdealVideoSize(SIZE* pszMin, SIZE* pszMax)
{
if (pszMin) {
- pszMin->cx = 1;
- pszMin->cy = 1;
+ pszMin->cx = 1;
+ pszMin->cy = 1;
}
if (pszMax) {
- D3DDISPLAYMODE d3ddm;
+ D3DDISPLAYMODE d3ddm;
ZeroMemory(&d3ddm, sizeof(d3ddm));
if (SUCCEEDED(m_pD3D->GetAdapterDisplayMode(GetAdapter(m_pD3D), &d3ddm))) {
- pszMax->cx = d3ddm.Width;
- pszMax->cy = d3ddm.Height;
+ pszMax->cx = d3ddm.Width;
+ pszMax->cy = d3ddm.Height;
}
}
@@ -1381,51 +1380,51 @@ STDMETHODIMP CEVRAllocatorPresenter::DisableImageExport(BOOL bDisable) // IDirect3DDeviceManager9
STDMETHODIMP CEVRAllocatorPresenter::ResetDevice(IDirect3DDevice9* pDevice, UINT resetToken)
{
- HRESULT hr = m_pD3DManager->ResetDevice(pDevice, resetToken);
+ HRESULT hr = m_pD3DManager->ResetDevice(pDevice, resetToken);
return hr;
}
STDMETHODIMP CEVRAllocatorPresenter::OpenDeviceHandle(HANDLE* phDevice)
{
- HRESULT hr = m_pD3DManager->OpenDeviceHandle(phDevice);
+ HRESULT hr = m_pD3DManager->OpenDeviceHandle(phDevice);
return hr;
}
STDMETHODIMP CEVRAllocatorPresenter::CloseDeviceHandle(HANDLE hDevice)
{
- HRESULT hr = m_pD3DManager->CloseDeviceHandle(hDevice);
+ HRESULT hr = m_pD3DManager->CloseDeviceHandle(hDevice);
return hr;
}
STDMETHODIMP CEVRAllocatorPresenter::TestDevice(HANDLE hDevice)
{
- HRESULT hr = m_pD3DManager->TestDevice(hDevice);
+ HRESULT hr = m_pD3DManager->TestDevice(hDevice);
return hr;
}
STDMETHODIMP CEVRAllocatorPresenter::LockDevice(HANDLE hDevice, IDirect3DDevice9** ppDevice, BOOL fBlock)
{
- HRESULT hr = m_pD3DManager->LockDevice(hDevice, ppDevice, fBlock);
+ HRESULT hr = m_pD3DManager->LockDevice(hDevice, ppDevice, fBlock);
return hr;
}
STDMETHODIMP CEVRAllocatorPresenter::UnlockDevice(HANDLE hDevice, BOOL fSaveState)
{
- HRESULT hr = m_pD3DManager->UnlockDevice(hDevice, fSaveState);
+ HRESULT hr = m_pD3DManager->UnlockDevice(hDevice, fSaveState);
return hr;
}
STDMETHODIMP CEVRAllocatorPresenter::GetVideoService(HANDLE hDevice, REFIID riid, void** ppService)
{
- HRESULT hr = m_pD3DManager->GetVideoService(hDevice, riid, ppService);
+ HRESULT hr = m_pD3DManager->GetVideoService(hDevice, riid, ppService);
if (riid == __uuidof(IDirectXVideoDecoderService)) {
- UINT nNbDecoder = 5;
- GUID* pDecoderGuid;
- IDirectXVideoDecoderService* pDXVAVideoDecoder = (IDirectXVideoDecoderService*) *ppService;
+ UINT nNbDecoder = 5;
+ GUID* pDecoderGuid;
+ IDirectXVideoDecoderService* pDXVAVideoDecoder = (IDirectXVideoDecoderService*) *ppService;
pDXVAVideoDecoder->GetDecoderDeviceGuids(&nNbDecoder, &pDecoderGuid);
} else if (riid == __uuidof(IDirectXVideoProcessorService)) {
- IDirectXVideoProcessorService* pDXVAProcessor = (IDirectXVideoProcessorService*) *ppService;
+ IDirectXVideoProcessorService* pDXVAProcessor = (IDirectXVideoProcessorService*) *ppService;
UNREFERENCED_PARAMETER(pDXVAProcessor);
}
@@ -1438,13 +1437,13 @@ STDMETHODIMP CEVRAllocatorPresenter::GetNativeVideoSize(LONG* lpWidth, LONG* lpH ASSERT(FALSE);
if (lpWidth) {
- *lpWidth = m_NativeVideoSize.cx;
+ *lpWidth = m_NativeVideoSize.cx;
}
- if (lpHeight) {
- *lpHeight = m_NativeVideoSize.cy;
+ if (lpHeight) {
+ *lpHeight = m_NativeVideoSize.cy;
}
- if (lpARWidth) {
- *lpARWidth = m_AspectRatio.cx;
+ if (lpARWidth) {
+ *lpARWidth = m_AspectRatio.cx;
}
if (lpARHeight) {
*lpARHeight = m_AspectRatio.cy;
@@ -1454,7 +1453,7 @@ STDMETHODIMP CEVRAllocatorPresenter::GetNativeVideoSize(LONG* lpWidth, LONG* lpH STDMETHODIMP CEVRAllocatorPresenter::InitializeDevice(IMFMediaType* pMediaType)
{
- HRESULT hr;
+ HRESULT hr;
CAutoLock lock(this);
CAutoLock lock2(&m_ImageProcessingLock);
CAutoLock cRenderLock(&m_RenderLock);
@@ -1479,7 +1478,7 @@ STDMETHODIMP CEVRAllocatorPresenter::InitializeDevice(IMFMediaType* pMediaType) if (SUCCEEDED(hr)) {
for (int i = 0; i < m_nNbDXSurface; i++) {
- CComPtr<IMFSample> pMFSample;
+ CComPtr<IMFSample> pMFSample;
hr = pfMFCreateVideoSampleFromSurface(m_pVideoSurface[i], &pMFSample);
if (SUCCEEDED(hr)) {
@@ -1496,7 +1495,7 @@ STDMETHODIMP CEVRAllocatorPresenter::InitializeDevice(IMFMediaType* pMediaType) DWORD WINAPI CEVRAllocatorPresenter::GetMixerThreadStatic(LPVOID lpParam)
{
SetThreadName((DWORD) - 1, "CEVRPresenter::MixerThread");
- CEVRAllocatorPresenter* pThis = (CEVRAllocatorPresenter*) lpParam;
+ CEVRAllocatorPresenter* pThis = (CEVRAllocatorPresenter*) lpParam;
pThis->GetMixerThread();
return 0;
}
@@ -1504,7 +1503,7 @@ DWORD WINAPI CEVRAllocatorPresenter::GetMixerThreadStatic(LPVOID lpParam) DWORD WINAPI CEVRAllocatorPresenter::PresentThread(LPVOID lpParam)
{
SetThreadName((DWORD) - 1, "CEVRPresenter::PresentThread");
- CEVRAllocatorPresenter* pThis = (CEVRAllocatorPresenter*) lpParam;
+ CEVRAllocatorPresenter* pThis = (CEVRAllocatorPresenter*) lpParam;
pThis->RenderThread();
return 0;
}
@@ -1534,13 +1533,13 @@ bool ExtractInterlaced(const AM_MEDIA_TYPE* pmt) void CEVRAllocatorPresenter::GetMixerThread()
{
- //HANDLE hAvrt;
- HANDLE hEvts[] = { m_hEvtQuit};
- bool bQuit = false;
- TIMECAPS tc;
- DWORD dwResolution;
- DWORD dwUser = 0;
- //DWORD dwTaskIndex = 0;
+ //HANDLE hAvrt;
+ HANDLE hEvts[] = { m_hEvtQuit};
+ bool bQuit = false;
+ TIMECAPS tc;
+ DWORD dwResolution;
+ DWORD dwUser = 0;
+ //DWORD dwTaskIndex = 0;
// Tell Vista Multimedia Class Scheduler we are a playback thretad (increase priority)
// if (pfAvSetMmThreadCharacteristicsW)
@@ -1550,7 +1549,7 @@ void CEVRAllocatorPresenter::GetMixerThread() timeGetDevCaps(&tc, sizeof(TIMECAPS));
dwResolution = min(max(tc.wPeriodMin, 0), tc.wPeriodMax);
- dwUser = timeBeginPeriod(dwResolution);
+ dwUser = timeBeginPeriod(dwResolution);
while (!bQuit) {
DWORD dwObject = WaitForMultipleObjects(_countof(hEvts), hEvts, FALSE, 1);
@@ -1583,8 +1582,8 @@ void CEVRAllocatorPresenter::GetMixerThread() //CAutoLock cRenderLock(&m_RenderLock);
// Use the code from VMR9 to get the movie fps, as this method is reliable.
- CComPtr<IPin> pPin;
- CMediaType mt;
+ CComPtr<IPin> pPin;
+ CMediaType mt;
if (
SUCCEEDED(m_pOuterEVR->FindPin(L"EVR Input0", &pPin)) &&
SUCCEEDED(pPin->ConnectionMediaType(&mt))) {
@@ -1629,8 +1628,8 @@ void ModerateFloat(double& Value, double Target, double& ValuePrim, double Chang LONGLONG CEVRAllocatorPresenter::GetClockTime(LONGLONG PerformanceCounter)
{
- LONGLONG llClockTime;
- MFTIME nsCurrentTime;
+ LONGLONG llClockTime;
+ MFTIME nsCurrentTime;
m_pClock->GetCorrelatedTime(0, &llClockTime, &nsCurrentTime);
DWORD Characteristics = 0;
m_pClock->GetClockCharacteristics(&Characteristics);
@@ -1657,11 +1656,11 @@ LONGLONG CEVRAllocatorPresenter::GetClockTime(LONGLONG PerformanceCounter) m_LastClockState = State;
- LONGLONG TimeChangeM = llPerf - m_ModeratedTimeLast;
+ LONGLONG TimeChangeM = llPerf - m_ModeratedTimeLast;
LONGLONG ClockChangeM = llClockTime - m_ModeratedClockLast;
UNREFERENCED_PARAMETER(ClockChangeM);
- m_ModeratedTimeLast = llPerf;
+ m_ModeratedTimeLast = llPerf;
m_ModeratedClockLast = llClockTime;
#if 1
@@ -1702,9 +1701,9 @@ LONGLONG CEVRAllocatorPresenter::GetClockTime(LONGLONG PerformanceCounter) }
}
ModerateFloat(m_ModeratedTimeSpeed, ClockSpeedTarget, m_ModeratedTimeSpeedPrim, ChangeSpeed);
- // m_ModeratedTimeSpeed = TimeChange / ClockChange;
+ //m_ModeratedTimeSpeed = TimeChange / ClockChange;
}
- m_TimeChangeHistory[Pos] = (double)llPerf;
+ m_TimeChangeHistory[Pos] = (double)llPerf;
m_ClockChangeHistory[Pos] = (double)llClockTime;
}
@@ -1801,8 +1800,8 @@ void CEVRAllocatorPresenter::OnVBlankFinished(bool fAll, LONGLONG PerformanceCou return;
}
- LONGLONG llClockTime;
- LONGLONG nsSampleTime;
+ LONGLONG llClockTime;
+ LONGLONG nsSampleTime;
LONGLONG SampleDuration = 0;
if (!m_bSignaledStarvation) {
llClockTime = GetClockTime(PerformanceCounter);
@@ -1829,7 +1828,7 @@ void CEVRAllocatorPresenter::OnVBlankFinished(bool fAll, LONGLONG PerformanceCou LONGLONG SyncOffset = nsSampleTime - llClockTime;
m_pllSyncOffset[m_nNextSyncOffset] = SyncOffset;
- // TRACE_EVR("EVR: SyncOffset(%d, %d): %8I64d %8I64d %8I64d \n", m_nCurSurface, m_VSyncMode, m_LastPredictedSync, -SyncOffset, m_LastPredictedSync - (-SyncOffset));
+ //TRACE_EVR("EVR: SyncOffset(%d, %d): %8I64d %8I64d %8I64d \n", m_nCurSurface, m_VSyncMode, m_LastPredictedSync, -SyncOffset, m_LastPredictedSync - (-SyncOffset));
m_MaxSyncOffset = MINLONG64;
m_MinSyncOffset = MAXLONG64;
@@ -1921,14 +1920,14 @@ STDMETHODIMP_(bool) CEVRAllocatorPresenter::DisplayChange() void CEVRAllocatorPresenter::RenderThread()
{
- HANDLE hEvts[] = { m_hEvtQuit, m_hEvtFlush};
- bool bQuit = false;
- TIMECAPS tc;
- DWORD dwResolution;
- MFTIME nsSampleTime;
- LONGLONG llClockTime;
- DWORD dwUser = 0;
- DWORD dwObject;
+ HANDLE hEvts[] = { m_hEvtQuit, m_hEvtFlush};
+ bool bQuit = false;
+ TIMECAPS tc;
+ DWORD dwResolution;
+ MFTIME nsSampleTime;
+ LONGLONG llClockTime;
+ DWORD dwUser = 0;
+ DWORD dwObject;
// Tell Vista Multimedia Class Scheduler we are a playback thretad (increase priority)
@@ -1943,12 +1942,12 @@ void CEVRAllocatorPresenter::RenderThread() timeGetDevCaps(&tc, sizeof(TIMECAPS));
dwResolution = min(max(tc.wPeriodMin, 0), tc.wPeriodMax);
- dwUser = timeBeginPeriod(dwResolution);
+ dwUser = timeBeginPeriod(dwResolution);
CRenderersSettings& s = GetRenderersSettings();
int NextSleepTime = 1;
while (!bQuit) {
- LONGLONG llPerf = GetRenderersData()->GetPerfCounter();
+ LONGLONG llPerf = GetRenderersData()->GetPerfCounter();
UNREFERENCED_PARAMETER(llPerf);
if (!s.m_RenderSettings.iVMR9VSyncAccurate && NextSleepTime == 0) {
NextSleepTime = 1;
@@ -1996,12 +1995,12 @@ void CEVRAllocatorPresenter::RenderThread() // if (WaitForMultipleObjects (_countof(hEvtsBuff), hEvtsBuff, FALSE, INFINITE) == WAIT_OBJECT_0+2)
{
- CComPtr<IMFSample> pMFSample;
- LONGLONG llPerf = GetRenderersData()->GetPerfCounter();
+ CComPtr<IMFSample> pMFSample;
+ LONGLONG llPerf = GetRenderersData()->GetPerfCounter();
UNREFERENCED_PARAMETER(llPerf);
int nSamplesLeft = 0;
if (SUCCEEDED(GetScheduledSample(&pMFSample, nSamplesLeft))) {
- // pMFSample->GetUINT32 (GUID_SURFACE_INDEX, (UINT32*)&m_nCurSurface);
+ //pMFSample->GetUINT32 (GUID_SURFACE_INDEX, (UINT32*)&m_nCurSurface);
m_pCurrentDisplaydSample = pMFSample;
bool bValidSampleTime = true;
@@ -2013,7 +2012,7 @@ void CEVRAllocatorPresenter::RenderThread() LONGLONG SampleDuration = 0;
pMFSample->GetSampleDuration(&SampleDuration);
- // TRACE_EVR ("EVR: RenderThread ==>> Presenting surface %d (%I64d)\n", m_nCurSurface, nsSampleTime);
+ //TRACE_EVR ("EVR: RenderThread ==>> Presenting surface %d (%I64d)\n", m_nCurSurface, nsSampleTime);
bool bStepForward = false;
@@ -2277,7 +2276,7 @@ void CEVRAllocatorPresenter::RenderThread() void CEVRAllocatorPresenter::OnResetDevice()
{
- HRESULT hr;
+ HRESULT hr;
// Reset DXVA Manager, and get new buffers
hr = m_pD3DManager->ResetDevice(m_pD3DDev, m_nResetToken);
@@ -2303,7 +2302,7 @@ void CEVRAllocatorPresenter::RemoveAllSamples() HRESULT CEVRAllocatorPresenter::GetFreeSample(IMFSample** ppSample)
{
CAutoLock lock(&m_SampleQueueLock);
- HRESULT hr = S_OK;
+ HRESULT hr = S_OK;
if (m_FreeSamples.GetCount() > 1) { // <= Cannot use first free buffer (can be currently displayed)
InterlockedIncrement(&m_nUsedBuffer);
@@ -2318,7 +2317,7 @@ HRESULT CEVRAllocatorPresenter::GetFreeSample(IMFSample** ppSample) HRESULT CEVRAllocatorPresenter::GetScheduledSample(IMFSample** ppSample, int& _Count)
{
CAutoLock lock(&m_SampleQueueLock);
- HRESULT hr = S_OK;
+ HRESULT hr = S_OK;
_Count = (int)m_ScheduledSamples.GetCount();
if (_Count > 0) {
diff --git a/src/filters/renderer/VideoRenderers/IPinHook.cpp b/src/filters/renderer/VideoRenderers/IPinHook.cpp index 76d98cd34..a048a7b0c 100644 --- a/src/filters/renderer/VideoRenderers/IPinHook.cpp +++ b/src/filters/renderer/VideoRenderers/IPinHook.cpp @@ -282,7 +282,7 @@ static void LOG(LPCTSTR fmt, ...) {
va_list args;
va_start(args, fmt);
- //int nCount = _vsctprintf(fmt, args) + 1;
+ //int nCount = _vsctprintf(fmt, args) + 1;
TCHAR buff[3000];
FILE* f;
_vstprintf_s(buff, _countof(buff), fmt, args);
@@ -1127,7 +1127,7 @@ public : }
virtual HRESULT STDMETHODCALLTYPE ReleaseBuffer(UINT BufferType) {
- HRESULT hr = m_pDec->ReleaseBuffer(BufferType);
+ HRESULT hr = m_pDec->ReleaseBuffer(BufferType);
//LOG(_T("IDirectXVideoDecoder::ReleaseBuffer Type = %d, hr = %08x"), BufferType, hr);
return hr;
}
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp index 5888551e6..72d59a2e9 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp @@ -2627,7 +2627,7 @@ STDMETHODIMP_(bool) CSyncAP::Paint(bool fAll) STDMETHODIMP CSyncAP::NonDelegatingQueryInterface(REFIID riid, void** ppv)
{
- HRESULT hr;
+ HRESULT hr;
if (riid == __uuidof(IMFClockStateSink)) {
hr = GetInterface((IMFClockStateSink*)this, ppv);
} else if (riid == __uuidof(IMFVideoPresenter)) {
@@ -2757,13 +2757,13 @@ STDMETHODIMP CSyncAP::GetSlowestRate(MFRATE_DIRECTION eDirection, BOOL fThin, fl STDMETHODIMP CSyncAP::GetFastestRate(MFRATE_DIRECTION eDirection, BOOL fThin, float* pflRate)
{
- HRESULT hr = S_OK;
- float fMaxRate = 0.0f;
+ HRESULT hr = S_OK;
+ float fMaxRate = 0.0f;
CAutoLock lock(this);
CheckPointer(pflRate, E_POINTER);
- CHECK_HR(CheckShutdown())
+ CHECK_HR(CheckShutdown());
// Get the maximum forward rate.
fMaxRate = GetMaxRate(fThin);
@@ -2783,11 +2783,11 @@ STDMETHODIMP CSyncAP::IsRateSupported(BOOL fThin, float flRate, float* pflNeares // pfNearestSupportedRate can be NULL.
CAutoLock lock(this);
HRESULT hr = S_OK;
- float fMaxRate = 0.0f;
- float fNearestRate = flRate; // Default.
+ float fMaxRate = 0.0f;
+ float fNearestRate = flRate; // Default.
CheckPointer(pflNearestSupportedRate, E_POINTER);
- CHECK_HR(hr = CheckShutdown())
+ CHECK_HR(hr = CheckShutdown());
// Find the maximum forward rate.
fMaxRate = GetMaxRate(fThin);
@@ -2909,8 +2909,8 @@ HRESULT CSyncAP::IsMediaTypeSupported(IMFMediaType* pMixerType) AM_MEDIA_TYPE* pAMMedia;
UINT nInterlaceMode;
- CHECK_HR(pMixerType->GetRepresentation(FORMAT_VideoInfo2, (void**)&pAMMedia))
- CHECK_HR(pMixerType->GetUINT32(MF_MT_INTERLACE_MODE, &nInterlaceMode))
+ CHECK_HR(pMixerType->GetRepresentation(FORMAT_VideoInfo2, (void**)&pAMMedia));
+ CHECK_HR(pMixerType->GetUINT32(MF_MT_INTERLACE_MODE, &nInterlaceMode));
if ((pAMMedia->majortype != MEDIATYPE_Video)) {
hr = MF_E_INVALIDMEDIATYPE;
@@ -2926,7 +2926,7 @@ HRESULT CSyncAP::CreateProposedOutputType(IMFMediaType* pMixerType, IMFMediaType LARGE_INTEGER i64Size;
MFVIDEOFORMAT* VideoFormat;
- CHECK_HR(pMixerType->GetRepresentation(FORMAT_MFVideoFormat, (void**)&pAMMedia))
+ CHECK_HR(pMixerType->GetRepresentation(FORMAT_MFVideoFormat, (void**)&pAMMedia));
VideoFormat = (MFVIDEOFORMAT*)pAMMedia->pbFormat;
hr = pfMFCreateVideoMediaType(VideoFormat, &m_pMediaType);
@@ -2992,7 +2992,7 @@ HRESULT CSyncAP::SetMediaType(IMFMediaType* pType) CString strTemp;
CheckPointer(pType, E_POINTER);
- CHECK_HR(pType->GetRepresentation(FORMAT_VideoInfo2, (void**)&pAMMedia))
+ CHECK_HR(pType->GetRepresentation(FORMAT_VideoInfo2, (void**)&pAMMedia));
hr = InitializeDevice(pAMMedia);
if (SUCCEEDED(hr)) {
@@ -3017,7 +3017,7 @@ LONGLONG CSyncAP::GetMediaTypeMerit(IMFMediaType* pMediaType) MFVIDEOFORMAT* VideoFormat;
HRESULT hr;
- CHECK_HR(pMediaType->GetRepresentation(FORMAT_MFVideoFormat, (void**)&pAMMedia))
+ CHECK_HR(pMediaType->GetRepresentation(FORMAT_MFVideoFormat, (void**)&pAMMedia));
VideoFormat = (MFVIDEOFORMAT*)pAMMedia->pbFormat;
LONGLONG Merit = 0;
@@ -3189,13 +3189,13 @@ STDMETHODIMP CSyncAP::GetCurrentMediaType(__deref_out IMFVideoMediaType** ppMed HRESULT hr = S_OK;
CAutoLock lock(this);
CheckPointer(ppMediaType, E_POINTER);
- CHECK_HR(CheckShutdown())
+ CHECK_HR(CheckShutdown());
if (m_pMediaType == NULL) {
- CHECK_HR(MF_E_NOT_INITIALIZED)
+ CHECK_HR(MF_E_NOT_INITIALIZED);
}
- CHECK_HR(m_pMediaType->QueryInterface(__uuidof(IMFVideoMediaType), (void**)&ppMediaType))
+ CHECK_HR(m_pMediaType->QueryInterface(__uuidof(IMFVideoMediaType), (void**)&ppMediaType));
return hr;
}
@@ -3407,51 +3407,51 @@ STDMETHODIMP CSyncAP::DisableImageExport(BOOL bDisable) // IDirect3DDeviceManager9
STDMETHODIMP CSyncAP::ResetDevice(IDirect3DDevice9* pDevice, UINT resetToken)
{
- HRESULT hr = m_pD3DManager->ResetDevice(pDevice, resetToken);
+ HRESULT hr = m_pD3DManager->ResetDevice(pDevice, resetToken);
return hr;
}
STDMETHODIMP CSyncAP::OpenDeviceHandle(HANDLE* phDevice)
{
- HRESULT hr = m_pD3DManager->OpenDeviceHandle(phDevice);
+ HRESULT hr = m_pD3DManager->OpenDeviceHandle(phDevice);
return hr;
}
STDMETHODIMP CSyncAP::CloseDeviceHandle(HANDLE hDevice)
{
- HRESULT hr = m_pD3DManager->CloseDeviceHandle(hDevice);
+ HRESULT hr = m_pD3DManager->CloseDeviceHandle(hDevice);
return hr;
}
STDMETHODIMP CSyncAP::TestDevice(HANDLE hDevice)
{
- HRESULT hr = m_pD3DManager->TestDevice(hDevice);
+ HRESULT hr = m_pD3DManager->TestDevice(hDevice);
return hr;
}
STDMETHODIMP CSyncAP::LockDevice(HANDLE hDevice, IDirect3DDevice9** ppDevice, BOOL fBlock)
{
- HRESULT hr = m_pD3DManager->LockDevice(hDevice, ppDevice, fBlock);
+ HRESULT hr = m_pD3DManager->LockDevice(hDevice, ppDevice, fBlock);
return hr;
}
STDMETHODIMP CSyncAP::UnlockDevice(HANDLE hDevice, BOOL fSaveState)
{
- HRESULT hr = m_pD3DManager->UnlockDevice(hDevice, fSaveState);
+ HRESULT hr = m_pD3DManager->UnlockDevice(hDevice, fSaveState);
return hr;
}
STDMETHODIMP CSyncAP::GetVideoService(HANDLE hDevice, REFIID riid, void** ppService)
{
- HRESULT hr = m_pD3DManager->GetVideoService(hDevice, riid, ppService);
+ HRESULT hr = m_pD3DManager->GetVideoService(hDevice, riid, ppService);
if (riid == __uuidof(IDirectXVideoDecoderService)) {
- UINT nNbDecoder = 5;
- GUID* pDecoderGuid;
- IDirectXVideoDecoderService* pDXVAVideoDecoder = (IDirectXVideoDecoderService*) *ppService;
+ UINT nNbDecoder = 5;
+ GUID* pDecoderGuid;
+ IDirectXVideoDecoderService* pDXVAVideoDecoder = (IDirectXVideoDecoderService*) *ppService;
pDXVAVideoDecoder->GetDecoderDeviceGuids(&nNbDecoder, &pDecoderGuid);
} else if (riid == __uuidof(IDirectXVideoProcessorService)) {
- IDirectXVideoProcessorService* pDXVAProcessor = (IDirectXVideoProcessorService*) *ppService;
+ IDirectXVideoProcessorService* pDXVAProcessor = (IDirectXVideoProcessorService*) *ppService;
UNREFERENCED_PARAMETER(pDXVAProcessor);
}
@@ -3464,12 +3464,12 @@ STDMETHODIMP CSyncAP::GetNativeVideoSize(LONG* lpWidth, LONG* lpHeight, LONG* lp ASSERT(FALSE);
if (lpWidth) {
- *lpWidth = m_NativeVideoSize.cx;
+ *lpWidth = m_NativeVideoSize.cx;
}
- if (lpHeight) {
- *lpHeight = m_NativeVideoSize.cy;
+ if (lpHeight) {
+ *lpHeight = m_NativeVideoSize.cy;
}
- if (lpARWidth) {
+ if (lpARWidth) {
*lpARWidth = m_AspectRatio.cx;
}
if (lpARHeight) {
@@ -3594,19 +3594,19 @@ void CSyncAP::RenderThread() m_lNextSampleWait = 1; // Default value for running this loop
nSamplesLeft = 0;
bool stepForward = false;
- LONG lDisplayCycle = (LONG)(GetDisplayCycle());
+ LONG lDisplayCycle = (LONG)(GetDisplayCycle());
LONG lDisplayCycle2 = (LONG)(GetDisplayCycle() / 2.0); // These are a couple of empirically determined constants used the control the "snap" function
LONG lDisplayCycle4 = (LONG)(GetDisplayCycle() / 4.0);
CRenderersSettings& s = GetRenderersSettings();
dTargetSyncOffset = s.m_RenderSettings.fTargetSyncOffset;
- if ((m_nRenderState == Started || !m_bPrerolled) && !pNewSample) { // If either streaming or the pre-roll sample and no sample yet fetched
+ if ((m_nRenderState == Started || !m_bPrerolled) && !pNewSample) { // If either streaming or the pre-roll sample and no sample yet fetched
if (SUCCEEDED(GetScheduledSample(&pNewSample, nSamplesLeft))) { // Get the next sample
m_llLastSampleTime = m_llSampleTime;
if (!m_bPrerolled) {
- m_bPrerolled = true; // m_bPrerolled is a ticket to show one (1) frame immediately
- m_lNextSampleWait = 0; // Present immediately
+ m_bPrerolled = true; // m_bPrerolled is a ticket to show one (1) frame immediately
+ m_lNextSampleWait = 0; // Present immediately
} else if (SUCCEEDED(pNewSample->GetSampleTime(&m_llSampleTime))) { // Get zero-based sample due time
if (m_llLastSampleTime == m_llSampleTime) { // In the rare case there are duplicate frames in the movie. There really shouldn't be but it happens.
MoveToFreeList(pNewSample, true);
@@ -3817,7 +3817,7 @@ void CSyncAP::RemoveAllSamples() HRESULT CSyncAP::GetFreeSample(IMFSample** ppSample)
{
CAutoLock lock(&m_SampleQueueLock);
- HRESULT hr = S_OK;
+ HRESULT hr = S_OK;
if (m_FreeSamples.GetCount() > 1) { // Cannot use first free buffer (can be currently displayed)
InterlockedIncrement(&m_nUsedBuffer);
@@ -3832,7 +3832,7 @@ HRESULT CSyncAP::GetFreeSample(IMFSample** ppSample) HRESULT CSyncAP::GetScheduledSample(IMFSample** ppSample, int& _Count)
{
CAutoLock lock(&m_SampleQueueLock);
- HRESULT hr = S_OK;
+ HRESULT hr = S_OK;
_Count = (int)m_ScheduledSamples.GetCount();
if (_Count > 0) {
@@ -3904,11 +3904,11 @@ HRESULT CSyncAP::BeginStreaming() m_pOuterEVR->QueryInterface(__uuidof(IBaseFilter), (void**)&pEVR);
pEVR->QueryFilterInfo(&filterInfo); // This addref's the pGraph member
- BeginEnumFilters(filterInfo.pGraph, pEF, pBF)
+ BeginEnumFilters(filterInfo.pGraph, pEF, pBF);
if (CComQIPtr<IAMAudioRendererStats> pAS = pBF) {
m_pAudioStats = pAS;
};
- EndEnumFilters
+ EndEnumFilters;
pEVR->GetSyncSource(&m_pRefClock);
if (filterInfo.pGraph) {
@@ -3927,10 +3927,10 @@ HRESULT CSyncAP::BeginStreaming() HRESULT CreateSyncRenderer(const CLSID& clsid, HWND hWnd, bool bFullscreen, ISubPicAllocatorPresenter** ppAP)
{
- HRESULT hr = E_FAIL;
+ HRESULT hr = E_FAIL;
if (clsid == CLSID_SyncAllocatorPresenter) {
CString Error;
- *ppAP = DNew CSyncAP(hWnd, bFullscreen, hr, Error);
+ *ppAP = DNew CSyncAP(hWnd, bFullscreen, hr, Error);
(*ppAP)->AddRef();
if (FAILED(hr)) {
@@ -4234,7 +4234,7 @@ HRESULT CGenlock::GetTiming() GlobalGetAtomName(getTiming, savedTiming, MAX_LOADSTRING);
while (params < TIMING_PARAM_CNT) {
- while (savedTiming[i] != _T(',') && savedTiming[i] != _T('\0')) {
+ while (savedTiming[i] != _T(',') && savedTiming[i] != _T('\0')) {
tmpStr[j++] = savedTiming[i];
tmpStr[j] = _T('\0');
i++;
diff --git a/src/filters/source/DTSAC3Source/DTSAC3Source.cpp b/src/filters/source/DTSAC3Source/DTSAC3Source.cpp index b33373e86..c60d2fd2d 100644 --- a/src/filters/source/DTSAC3Source/DTSAC3Source.cpp +++ b/src/filters/source/DTSAC3Source/DTSAC3Source.cpp @@ -87,7 +87,7 @@ int ParseAC3IEC61937Header(const BYTE* buf) {
WORD* wbuf = (WORD*)buf;
if (*(DWORD*)buf == IEC61937_SYNC_WORD
- && wbuf[2] == 0x0001
+ && wbuf[2] == 0x0001
&& wbuf[3] > 0 && wbuf[3] < (6144 - 8) * 8
&& wbuf[4] == 0x0B77) {
return 6144;
diff --git a/src/filters/source/FLACSource/FLACSource.cpp b/src/filters/source/FLACSource/FLACSource.cpp index c6b7f36f3..123573c74 100644 --- a/src/filters/source/FLACSource/FLACSource.cpp +++ b/src/filters/source/FLACSource/FLACSource.cpp @@ -131,14 +131,14 @@ CFLACStream::CFLACStream(const WCHAR* wfn, CSource* pParent, HRESULT* phr) , m_bIsEOF(false)
, m_pDecoder(NULL)
{
- CAutoLock cAutoLock(&m_cSharedState);
- CString fn(wfn);
- CFileException ex;
- HRESULT hr = E_FAIL;
+ CAutoLock cAutoLock(&m_cSharedState);
+ CString fn(wfn);
+ CFileException ex;
+ HRESULT hr = E_FAIL;
do {
if (!m_file.Open(fn, CFile::modeRead | CFile::shareDenyNone, &ex)) {
- hr = AmHresultFromWin32(ex.m_lOsError);
+ hr = AmHresultFromWin32(ex.m_lOsError);
break;
}
@@ -209,8 +209,8 @@ HRESULT CFLACStream::DecideBufferSize(IMemAllocator* pAlloc, ALLOCATOR_PROPERTIE HRESULT CFLACStream::FillBuffer(IMediaSample* pSample, int nFrame, BYTE* pOut, long& len)
{
- FLAC__uint64 llCurPos;
- FLAC__uint64 llNextPos;
+ FLAC__uint64 llCurPos;
+ FLAC__uint64 llNextPos;
if (m_bDiscontinuity) {
FLAC__stream_decoder_seek_absolute(_DECODER_, (m_rtPosition * m_i64TotalNumSamples) / m_rtDuration);
@@ -224,7 +224,7 @@ HRESULT CFLACStream::FillBuffer(IMediaSample* pSample, int nFrame, BYTE* pOut, l }
FLAC__stream_decoder_get_decode_position(_DECODER_, &llNextPos);
- FLAC__uint64 llCurFile = m_file.GetPosition();
+ FLAC__uint64 llCurFile = m_file.GetPosition();
len = (long)(llNextPos - llCurPos);
ASSERT(len > 0);
if (len <= 0) {
@@ -269,7 +269,7 @@ HRESULT CFLACStream::GetMediaType(int iPosition, CMediaType* pmt) HRESULT CFLACStream::CheckMediaType(const CMediaType* pmt)
{
if (pmt->majortype == MEDIATYPE_Audio
- && pmt->subtype == MEDIASUBTYPE_FLAC_FRAMED
+ && pmt->subtype == MEDIASUBTYPE_FLAC_FRAMED
&& pmt->formattype == FORMAT_WaveFormatEx
&& ((WAVEFORMATEX*)pmt->pbFormat)->wFormatTag == WAVE_FORMAT_FLAC) {
return S_OK;
@@ -298,18 +298,18 @@ void CFLACStream::UpdateFromMetadata(void* pBuffer) FLAC__StreamDecoderReadStatus StreamDecoderRead(const FLAC__StreamDecoder* decoder, FLAC__byte buffer[], size_t* bytes, void* client_data)
{
- CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
- UINT nRead = pThis->GetFile()->Read(buffer, (UINT) * bytes);
+ CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
+ UINT nRead = pThis->GetFile()->Read(buffer, (UINT) * bytes);
pThis->m_bIsEOF = (nRead != *bytes);
- *bytes = nRead;
+ *bytes = nRead;
- return (*bytes == 0) ? FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM : FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ return (*bytes == 0) ? FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM : FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
}
FLAC__StreamDecoderSeekStatus StreamDecoderSeek(const FLAC__StreamDecoder* decoder, FLAC__uint64 absolute_byte_offset, void* client_data)
{
- CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
+ CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
pThis->m_bIsEOF = false;
pThis->GetFile()->Seek(absolute_byte_offset, CFile::begin);
@@ -318,15 +318,15 @@ FLAC__StreamDecoderSeekStatus StreamDecoderSeek(const FLAC__StreamDecoder* decod FLAC__StreamDecoderTellStatus StreamDecoderTell(const FLAC__StreamDecoder* decoder, FLAC__uint64* absolute_byte_offset, void* client_data)
{
- CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
+ CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
*absolute_byte_offset = pThis->GetFile()->GetPosition();
return FLAC__STREAM_DECODER_TELL_STATUS_OK;
}
FLAC__StreamDecoderLengthStatus StreamDecoderLength(const FLAC__StreamDecoder* decoder, FLAC__uint64* stream_length, void* client_data)
{
- CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
- CFile* pFile = pThis->GetFile();
+ CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
+ CFile* pFile = pThis->GetFile();
if (pFile == NULL) {
return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;
@@ -338,14 +338,14 @@ FLAC__StreamDecoderLengthStatus StreamDecoderLength(const FLAC__StreamDecoder* d FLAC__bool StreamDecoderEof(const FLAC__StreamDecoder* decoder, void* client_data)
{
- CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
+ CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
return pThis->m_bIsEOF;
}
FLAC__StreamDecoderWriteStatus StreamDecoderWrite(const FLAC__StreamDecoder* decoder, const FLAC__Frame* frame, const FLAC__int32* const buffer[], void* client_data)
{
- CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
+ CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
UNREFERENCED_PARAMETER(pThis);
return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
@@ -357,7 +357,7 @@ void StreamDecoderError(const FLAC__StreamDecoder* decoder, FLAC__StreamDecoderE void StreamDecoderMetadata(const FLAC__StreamDecoder* decoder, const FLAC__StreamMetadata* metadata, void* client_data)
{
- CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
+ CFLACStream* pThis = static_cast<CFLACStream*>(client_data);
if (pThis) {
pThis->UpdateFromMetadata((void*)metadata);
diff --git a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp index 5c766a83f..0beea6f20 100644 --- a/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/AudioSwitcher.cpp @@ -580,9 +580,10 @@ STDMETHODIMP CAudioSwitcherFilter::GetSpeakerConfig(bool* pfCustomChannelMapping STDMETHODIMP CAudioSwitcherFilter::SetSpeakerConfig(bool fCustomChannelMapping, DWORD pSpeakerToChannelMap[18][18])
{
- if (m_State == State_Stopped || m_fCustomChannelMapping != fCustomChannelMapping
+ if (m_State == State_Stopped
+ || m_fCustomChannelMapping != fCustomChannelMapping
|| memcmp(m_pSpeakerToChannelMap, pSpeakerToChannelMap, sizeof(m_pSpeakerToChannelMap))) {
- PauseGraph
+ PauseGraph;
CStreamSwitcherInputPin* pInput = GetInputPin();
@@ -593,7 +594,7 @@ STDMETHODIMP CAudioSwitcherFilter::SetSpeakerConfig(bool fCustomChannelMapping, SelectInput(pInput);
- ResumeGraph
+ ResumeGraph;
}
return S_OK;
@@ -613,9 +614,9 @@ STDMETHODIMP_(bool) CAudioSwitcherFilter::IsDownSamplingTo441Enabled() STDMETHODIMP CAudioSwitcherFilter::EnableDownSamplingTo441(bool fEnable)
{
if (m_fDownSampleTo441 != fEnable) {
- PauseGraph
+ PauseGraph;
m_fDownSampleTo441 = fEnable;
- ResumeGraph
+ ResumeGraph;
}
return S_OK;
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp index a0f4c20b0..f3eddaa5a 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp @@ -137,82 +137,82 @@ HRESULT GetPeer(CStreamSwitcherFilter* pFilter, T** ppT) STDMETHODIMP CStreamSwitcherPassThru::GetCapabilities(DWORD* pCaps)
{
- CallPeerSeeking(GetCapabilities(pCaps))
+ CallPeerSeeking(GetCapabilities(pCaps));
}
STDMETHODIMP CStreamSwitcherPassThru::CheckCapabilities(DWORD* pCaps)
{
- CallPeerSeeking(CheckCapabilities(pCaps))
+ CallPeerSeeking(CheckCapabilities(pCaps));
}
STDMETHODIMP CStreamSwitcherPassThru::IsFormatSupported(const GUID* pFormat)
{
- CallPeerSeeking(IsFormatSupported(pFormat))
+ CallPeerSeeking(IsFormatSupported(pFormat));
}
STDMETHODIMP CStreamSwitcherPassThru::QueryPreferredFormat(GUID* pFormat)
{
- CallPeerSeeking(QueryPreferredFormat(pFormat))
+ CallPeerSeeking(QueryPreferredFormat(pFormat));
}
STDMETHODIMP CStreamSwitcherPassThru::SetTimeFormat(const GUID* pFormat)
{
- CallPeerSeeking(SetTimeFormat(pFormat))
+ CallPeerSeeking(SetTimeFormat(pFormat));
}
STDMETHODIMP CStreamSwitcherPassThru::GetTimeFormat(GUID* pFormat)
{
- CallPeerSeeking(GetTimeFormat(pFormat))
+ CallPeerSeeking(GetTimeFormat(pFormat));
}
STDMETHODIMP CStreamSwitcherPassThru::IsUsingTimeFormat(const GUID* pFormat)
{
- CallPeerSeeking(IsUsingTimeFormat(pFormat))
+ CallPeerSeeking(IsUsingTimeFormat(pFormat));
}
STDMETHODIMP CStreamSwitcherPassThru::ConvertTimeFormat(LONGLONG* pTarget, const GUID* pTargetFormat, LONGLONG Source, const GUID* pSourceFormat)
{
- CallPeerSeeking(ConvertTimeFormat(pTarget, pTargetFormat, Source, pSourceFormat))
+ CallPeerSeeking(ConvertTimeFormat(pTarget, pTargetFormat, Source, pSourceFormat));
}
STDMETHODIMP CStreamSwitcherPassThru::SetPositions(LONGLONG* pCurrent, DWORD CurrentFlags, LONGLONG* pStop, DWORD StopFlags)
{
- CallPeerSeekingAll(SetPositions(pCurrent, CurrentFlags, pStop, StopFlags))
+ CallPeerSeekingAll(SetPositions(pCurrent, CurrentFlags, pStop, StopFlags));
}
STDMETHODIMP CStreamSwitcherPassThru::GetPositions(LONGLONG* pCurrent, LONGLONG* pStop)
{
- CallPeerSeeking(GetPositions(pCurrent, pStop))
+ CallPeerSeeking(GetPositions(pCurrent, pStop));
}
STDMETHODIMP CStreamSwitcherPassThru::GetCurrentPosition(LONGLONG* pCurrent)
{
- CallPeerSeeking(GetCurrentPosition(pCurrent))
+ CallPeerSeeking(GetCurrentPosition(pCurrent));
}
STDMETHODIMP CStreamSwitcherPassThru::GetStopPosition(LONGLONG* pStop)
{
- CallPeerSeeking(GetStopPosition(pStop))
+ CallPeerSeeking(GetStopPosition(pStop));
}
STDMETHODIMP CStreamSwitcherPassThru::GetDuration(LONGLONG* pDuration)
{
- CallPeerSeeking(GetDuration(pDuration))
+ CallPeerSeeking(GetDuration(pDuration));
}
STDMETHODIMP CStreamSwitcherPassThru::GetPreroll(LONGLONG* pllPreroll)
{
- CallPeerSeeking(GetPreroll(pllPreroll))
+ CallPeerSeeking(GetPreroll(pllPreroll));
}
STDMETHODIMP CStreamSwitcherPassThru::GetAvailable(LONGLONG* pEarliest, LONGLONG* pLatest)
{
- CallPeerSeeking(GetAvailable(pEarliest, pLatest))
+ CallPeerSeeking(GetAvailable(pEarliest, pLatest));
}
STDMETHODIMP CStreamSwitcherPassThru::GetRate(double* pdRate)
{
- CallPeerSeeking(GetRate(pdRate))
+ CallPeerSeeking(GetRate(pdRate));
}
STDMETHODIMP CStreamSwitcherPassThru::SetRate(double dRate)
@@ -220,49 +220,49 @@ STDMETHODIMP CStreamSwitcherPassThru::SetRate(double dRate) if (0.0 == dRate) {
return E_INVALIDARG;
}
- CallPeerSeekingAll(SetRate(dRate))
+ CallPeerSeekingAll(SetRate(dRate));
}
// IMediaPosition
STDMETHODIMP CStreamSwitcherPassThru::get_Duration(REFTIME* plength)
{
- CallPeer(get_Duration(plength))
+ CallPeer(get_Duration(plength));
}
STDMETHODIMP CStreamSwitcherPassThru::get_CurrentPosition(REFTIME* pllTime)
{
- CallPeer(get_CurrentPosition(pllTime))
+ CallPeer(get_CurrentPosition(pllTime));
}
STDMETHODIMP CStreamSwitcherPassThru::put_CurrentPosition(REFTIME llTime)
{
- CallPeerAll(put_CurrentPosition(llTime))
+ CallPeerAll(put_CurrentPosition(llTime));
}
STDMETHODIMP CStreamSwitcherPassThru::get_StopTime(REFTIME* pllTime)
{
- CallPeer(get_StopTime(pllTime))
+ CallPeer(get_StopTime(pllTime));
}
STDMETHODIMP CStreamSwitcherPassThru::put_StopTime(REFTIME llTime)
{
- CallPeerAll(put_StopTime(llTime))
+ CallPeerAll(put_StopTime(llTime));
}
STDMETHODIMP CStreamSwitcherPassThru::get_PrerollTime(REFTIME* pllTime)
{
- CallPeer(get_PrerollTime(pllTime))
+ CallPeer(get_PrerollTime(pllTime));
}
STDMETHODIMP CStreamSwitcherPassThru::put_PrerollTime(REFTIME llTime)
{
- CallPeerAll(put_PrerollTime(llTime))
+ CallPeerAll(put_PrerollTime(llTime));
}
STDMETHODIMP CStreamSwitcherPassThru::get_Rate(double* pdRate)
{
- CallPeer(get_Rate(pdRate))
+ CallPeer(get_Rate(pdRate));
}
STDMETHODIMP CStreamSwitcherPassThru::put_Rate(double dRate)
@@ -270,17 +270,17 @@ STDMETHODIMP CStreamSwitcherPassThru::put_Rate(double dRate) if (0.0 == dRate) {
return E_INVALIDARG;
}
- CallPeerAll(put_Rate(dRate))
+ CallPeerAll(put_Rate(dRate));
}
STDMETHODIMP CStreamSwitcherPassThru::CanSeekForward(LONG* pCanSeekForward)
{
- CallPeer(CanSeekForward(pCanSeekForward))
+ CallPeer(CanSeekForward(pCanSeekForward));
}
STDMETHODIMP CStreamSwitcherPassThru::CanSeekBackward(LONG* pCanSeekBackward)
{
- CallPeer(CanSeekBackward(pCanSeekBackward))
+ CallPeer(CanSeekBackward(pCanSeekBackward));
}
//
@@ -1245,8 +1245,8 @@ int CStreamSwitcherFilter::GetConnectedInputPinCount() CAutoLock cAutoLock(&m_csPins);
int nConnected = 0;
-
POSITION pos = m_pInputs.GetHeadPosition();
+
while (pos) {
if (m_pInputs.GetNext(pos)->IsConnected()) {
nConnected++;
@@ -1351,7 +1351,7 @@ void CStreamSwitcherFilter::SelectInput(CStreamSwitcherInputPin* pInput) HRESULT CStreamSwitcherFilter::Transform(IMediaSample* pIn, IMediaSample* pOut)
{
- BYTE* pDataIn = NULL;
+ BYTE* pDataIn = NULL;
BYTE* pDataOut = NULL;
HRESULT hr;
@@ -1362,7 +1362,7 @@ HRESULT CStreamSwitcherFilter::Transform(IMediaSample* pIn, IMediaSample* pOut) return hr;
}
- long len = pIn->GetActualDataLength();
+ long len = pIn->GetActualDataLength();
long size = pOut->GetSize();
if (!pDataIn || !pDataOut /*|| len > size || len <= 0*/) {
@@ -1464,7 +1464,7 @@ STDMETHODIMP CStreamSwitcherFilter::Enable(long lIndex, DWORD dwFlags) return E_NOTIMPL;
}
- PauseGraph
+ PauseGraph;
CStreamSwitcherInputPin* pNewInput = GetConnectedInputPin(lIndex);
if (!pNewInput) {
@@ -1473,7 +1473,7 @@ STDMETHODIMP CStreamSwitcherFilter::Enable(long lIndex, DWORD dwFlags) SelectInput(pNewInput);
- ResumeGraph
+ ResumeGraph;
return S_OK;
}
diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp index ed1e116bd..051712ff5 100644 --- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp +++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp @@ -457,7 +457,7 @@ HRESULT CBaseVideoFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_ pProperties->cBuffers = m_cBuffers;
pProperties->cbBuffer = bih.biSizeImage;
- pProperties->cbAlign = 1;
+ pProperties->cbAlign = 1;
pProperties->cbPrefix = 0;
HRESULT hr;
@@ -490,14 +490,14 @@ VIDEO_OUTPUT_FORMATS DefaultFormats[] = { void CBaseVideoFilter::GetOutputFormats(int& nNumber, VIDEO_OUTPUT_FORMATS** ppFormats)
{
- nNumber = _countof(DefaultFormats);
- *ppFormats = DefaultFormats;
+ nNumber = _countof(DefaultFormats);
+ *ppFormats = DefaultFormats;
}
HRESULT CBaseVideoFilter::GetMediaType(int iPosition, CMediaType* pmt)
{
- VIDEO_OUTPUT_FORMATS* fmts;
- int nFormatCount;
+ VIDEO_OUTPUT_FORMATS* fmts;
+ int nFormatCount;
if (m_pInput->IsConnected() == FALSE) {
return E_UNEXPECTED;
diff --git a/src/filters/transform/BufferFilter/BufferFilter.cpp b/src/filters/transform/BufferFilter/BufferFilter.cpp index 20e3dd2af..a40cbc9cc 100644 --- a/src/filters/transform/BufferFilter/BufferFilter.cpp +++ b/src/filters/transform/BufferFilter/BufferFilter.cpp @@ -71,7 +71,9 @@ CFilterApp theApp; //
CBufferFilter::CBufferFilter(LPUNKNOWN lpunk, HRESULT* phr)
- : CTransformFilter(NAME("CBufferFilter"), lpunk, __uuidof(this))
+ : CTransformFilter(NAME("CBufferFilter")
+ , lpunk
+ , __uuidof(this))
, m_nSamplesToBuffer(2)
{
HRESULT hr = S_OK;
@@ -223,7 +225,7 @@ HRESULT CBufferFilter::Transform(IMediaSample* pIn, IMediaSample* pOut) pIn->GetPointer(&pDataIn);
pOut->GetPointer(&pDataOut);
- long len = pIn->GetActualDataLength();
+ long len = pIn->GetActualDataLength();
long size = pOut->GetSize();
if (!pDataIn || !pDataOut || len > size || len <= 0) {
@@ -353,20 +355,20 @@ HRESULT CBufferFilterOutputPin::Deliver(IMediaSample* pMediaSample) HRESULT CBufferFilterOutputPin::DeliverEndOfStream()
{
- CallQueue(EOS())
+ CallQueue(EOS());
}
HRESULT CBufferFilterOutputPin::DeliverBeginFlush()
{
- CallQueue(BeginFlush())
+ CallQueue(BeginFlush());
}
HRESULT CBufferFilterOutputPin::DeliverEndFlush()
{
- CallQueue(EndFlush())
+ CallQueue(EndFlush());
}
HRESULT CBufferFilterOutputPin::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)
{
- CallQueue(NewSegment(tStart, tStop, dRate))
+ CallQueue(NewSegment(tStart, tStop, dRate));
}
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp index 8215fe2f7..840799266 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp @@ -63,8 +63,8 @@ CDXVADecoder::CDXVADecoder(CMPCVideoDecFilter* pFilter, IDirectXVideoDecoder* pD CDXVADecoder::~CDXVADecoder()
{
- SAFE_DELETE_ARRAY(m_pPictureStore)
- SAFE_DELETE_ARRAY(m_ExecuteParams.pCompressedBuffers)
+ SAFE_DELETE_ARRAY(m_pPictureStore);
+ SAFE_DELETE_ARRAY(m_ExecuteParams.pCompressedBuffers);
}
void CDXVADecoder::Init(CMPCVideoDecFilter* pFilter, DXVAMode nMode, int nPicEntryNumber)
@@ -311,7 +311,7 @@ HRESULT CDXVADecoder::Execute() switch (m_nEngine) {
case ENGINE_DXVA1 :
- DWORD dwFunction;
+ DWORD dwFunction;
HRESULT hr2;
//writeDXVA_QueryOrReplyFunc(&dwFunction, DXVA_QUERYORREPLYFUNCFLAG_DECODER_LOCK_QUERY, DXVA_PICTURE_DECODING_FUNCTION);
@@ -401,15 +401,15 @@ HRESULT CDXVADecoder::FindFreeDXVA1Buffer(DWORD dwTypeIndex, DWORD& dwBufferInde int nTry = 0;
dwBufferIndex = 0; //(dwBufferIndex + 1) % m_ComBufferInfo[DXVA_PICTURE_DECODE_BUFFER].dwNumCompBuffers;
- DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->QueryRenderStatus((DWORD) - 1, dwBufferIndex, 0))
+ DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->QueryRenderStatus((DWORD) - 1, dwBufferIndex, 0));
return hr;
}
HRESULT CDXVADecoder::BeginFrame(int nSurfaceIndex, IMediaSample* pSampleToDeliver)
{
- HRESULT hr = E_INVALIDARG;
- int nTry = 0;
+ HRESULT hr = E_INVALIDARG;
+ int nTry = 0;
for (int i = 0; i < 20; i++) {
switch (m_nEngine) {
@@ -422,7 +422,7 @@ HRESULT CDXVADecoder::BeginFrame(int nSurfaceIndex, IMediaSample* pSampleToDeliv BeginFrameInfo.dwSizeOutputData = 0;
BeginFrameInfo.pOutputData = NULL;
- DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->BeginFrame(&BeginFrameInfo))
+ DO_DXVA_PENDING_LOOP(m_pAMVideoAccelerator->BeginFrame(&BeginFrameInfo));
ASSERT(SUCCEEDED(hr));
if (SUCCEEDED(hr)) {
@@ -437,7 +437,7 @@ HRESULT CDXVADecoder::BeginFrame(int nSurfaceIndex, IMediaSample* pSampleToDeliv if (pSampleService) {
hr = pSampleService->GetService(MR_BUFFER_SERVICE, __uuidof(IDirect3DSurface9), (void**) &pDecoderRenderTarget);
if (SUCCEEDED(hr)) {
- DO_DXVA_PENDING_LOOP(m_pDirectXVideoDec->BeginFrame(pDecoderRenderTarget, NULL))
+ DO_DXVA_PENDING_LOOP(m_pDirectXVideoDec->BeginFrame(pDecoderRenderTarget, NULL));
}
}
}
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp index aaeb541d9..517a3ac4e 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp @@ -262,31 +262,31 @@ HRESULT CDXVADecoderH264::DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME //
*/
- CHECK_HR_TRACE(GetFreeSurfaceIndex(nSurfaceIndex, &pSampleToDeliver, rtStart, rtStop))
+ CHECK_HR_TRACE(GetFreeSurfaceIndex(nSurfaceIndex, &pSampleToDeliver, rtStart, rtStop));
FFH264SetCurrentPicture(nSurfaceIndex, &m_DXVAPicParams, m_pFilter->GetAVCtx());
- CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver))
+ CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver));
m_DXVAPicParams.StatusReportFeedbackNumber++;
// Send picture parameters
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_DXVAPicParams), &m_DXVAPicParams))
- CHECK_HR_TRACE(Execute())
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_DXVAPicParams), &m_DXVAPicParams));
+ CHECK_HR_TRACE(Execute());
// Add bitstream, slice control and quantization matrix
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize, pDataIn, &nSize))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize, pDataIn, &nSize));
if (m_bUseLongSlice) {
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_Slice_H264_Long)*nSlices, m_pSliceLong))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_Slice_H264_Long)*nSlices, m_pSliceLong));
} else {
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_Slice_H264_Short)*nSlices, m_pSliceShort))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_Slice_H264_Short)*nSlices, m_pSliceShort));
}
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_InverseQuantizationMatrixBufferType, sizeof(DXVA_Qmatrix_H264), (void*)&m_DXVAScalingMatrix))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_InverseQuantizationMatrixBufferType, sizeof(DXVA_Qmatrix_H264), (void*)&m_DXVAScalingMatrix));
// Decode bitstream
- CHECK_HR_TRACE(Execute())
- CHECK_HR_TRACE(EndFrame(nSurfaceIndex))
+ CHECK_HR_TRACE(Execute());
+ CHECK_HR_TRACE(EndFrame(nSurfaceIndex));
#if defined(_DEBUG) && 0
DisplayStatus();
@@ -361,7 +361,7 @@ HRESULT CDXVADecoderH264::DisplayStatus() DXVA_Status_H264 Status;
memset(&Status, 0, sizeof(Status));
- CHECK_HR_TRACE(hr = CDXVADecoder::QueryStatus(&Status, sizeof(Status)))
+ CHECK_HR_TRACE(hr = CDXVADecoder::QueryStatus(&Status, sizeof(Status)));
TRACE_H264("CDXVADecoderH264::DisplayStatus() : Status for the frame %u : bBufType = %u, bStatus = %u, wNumMbsAffected = %u\n",
Status.StatusReportFeedbackNumber,
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp index 8ff382652..14ee6ac72 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp @@ -115,7 +115,7 @@ HRESULT CDXVADecoderMpeg2::DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME return S_FALSE;
}
- CHECK_HR_TRACE(BeginFrame(m_nSurfaceIndex, m_pSampleToDeliver))
+ CHECK_HR_TRACE(BeginFrame(m_nSurfaceIndex, m_pSampleToDeliver));
if (m_bSecondField) {
if (!m_PictureParams.bSecondField) {
@@ -128,16 +128,16 @@ HRESULT CDXVADecoderMpeg2::DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME TRACE_MPEG2("CDXVADecoderMpeg2::DecodeFrame() : Surf = %d, PictureType = %d, SecondField = %d, m_nNextCodecIndex = %d, rtStart = [%I64d]\n",
m_nSurfaceIndex, nSliceType, m_PictureParams.bSecondField, m_nNextCodecIndex, rtStart);
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams))
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_InverseQuantizationMatrixBufferType, sizeof(m_QMatrixData), &m_QMatrixData))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams));
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_InverseQuantizationMatrixBufferType, sizeof(m_QMatrixData), &m_QMatrixData));
// Send bitstream to accelerator
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_SliceInfo)*m_nSliceCount, &m_SliceInfo))
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize, pDataIn, &nSize))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(DXVA_SliceInfo)*m_nSliceCount, &m_SliceInfo));
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize, pDataIn, &nSize));
// Decode frame
- CHECK_HR_TRACE(Execute())
- CHECK_HR_TRACE(EndFrame(m_nSurfaceIndex))
+ CHECK_HR_TRACE(Execute());
+ CHECK_HR_TRACE(EndFrame(m_nSurfaceIndex));
if (m_bSecondField) {
if (m_PictureParams.bSecondField) {
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp index 6f05f4033..fce7f5cda 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp @@ -35,7 +35,7 @@ inline void SwapRT(REFERENCE_TIME& rtFirst, REFERENCE_TIME& rtSecond)
{
- REFERENCE_TIME rtTemp = rtFirst;
+ REFERENCE_TIME rtTemp = rtFirst;
rtFirst = rtSecond;
rtSecond = rtTemp;
}
@@ -103,7 +103,7 @@ HRESULT CDXVADecoderVC1::DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME r return hr;
}
- CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver))
+ CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver));
TRACE_VC1("CDXVADecoderVC1::DecodeFrame() : PictureType = %d, rtStart = %I64d, Surf = %d\n", nSliceType, rtStart, nSurfaceIndex);
@@ -129,39 +129,39 @@ HRESULT CDXVADecoderVC1::DecodeFrame(BYTE* pDataIn, UINT nSize, REFERENCE_TIME r TRACE_VC1("CDXVADecoderVC1::DecodeFrame() : Decode frame %i\n", m_PictureParams.bPicScanMethod);
// Send picture params to accelerator
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams));
// Send bitstream to accelerator
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nFrameSize ? nFrameSize : nSize, pDataIn, &nSize_Result))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nFrameSize ? nFrameSize : nSize, pDataIn, &nSize_Result));
m_SliceInfo.wQuantizerScaleCode = 1; // TODO : 1->31 ???
m_SliceInfo.dwSliceBitsInBuffer = nSize_Result * 8;
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(m_SliceInfo), &m_SliceInfo))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(m_SliceInfo), &m_SliceInfo));
// Decode frame
- CHECK_HR_TRACE(Execute())
- CHECK_HR_TRACE(EndFrame(nSurfaceIndex))
+ CHECK_HR_TRACE(Execute());
+ CHECK_HR_TRACE(EndFrame(nSurfaceIndex));
// ***************
if (nFrameSize) { // Decoding Second Field
FFVC1UpdatePictureParam(&m_PictureParams, m_pFilter->GetAVCtx(), NULL, NULL, pDataIn, nSize, NULL, TRUE, &m_bFrame_repeat_pict);
- CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver))
+ CHECK_HR_TRACE(BeginFrame(nSurfaceIndex, pSampleToDeliver));
TRACE_VC1("CDXVADecoderVC1::DecodeFrame() : PictureType = %d\n", nSliceType);
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_PictureParametersBufferType, sizeof(m_PictureParams), &m_PictureParams));
// Send bitstream to accelerator
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize - nFrameSize, pDataIn + nFrameSize, &nSize_Result))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_BitStreamDateBufferType, nSize - nFrameSize, pDataIn + nFrameSize, &nSize_Result));
m_SliceInfo.wQuantizerScaleCode = 1; // TODO : 1->31 ???
m_SliceInfo.dwSliceBitsInBuffer = nSize_Result * 8;
- CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(m_SliceInfo), &m_SliceInfo))
+ CHECK_HR_TRACE(AddExecuteBuffer(DXVA2_SliceControlBufferType, sizeof(m_SliceInfo), &m_SliceInfo));
// Decode frame
- CHECK_HR_TRACE(Execute())
- CHECK_HR_TRACE(EndFrame(nSurfaceIndex))
+ CHECK_HR_TRACE(Execute());
+ CHECK_HR_TRACE(EndFrame(nSurfaceIndex));
}
// ***************
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp index 722dc8de0..1f44e731d 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp @@ -714,7 +714,7 @@ void CMPCVideoDecFilter::DetectVideoCard(HWND hWnd) CMPCVideoDecFilter::~CMPCVideoDecFilter()
{
Cleanup();
- SAFE_DELETE(m_pCpuId)
+ SAFE_DELETE(m_pCpuId);
}
bool CMPCVideoDecFilter::IsVideoInterlaced()
@@ -930,7 +930,7 @@ int CMPCVideoDecFilter::FindCodec(const CMediaType* mtIn) void CMPCVideoDecFilter::Cleanup()
{
- SAFE_DELETE(m_pDXVADecoder)
+ SAFE_DELETE(m_pDXVADecoder);
// Release FFMpeg
if (m_pAVCtx) {
@@ -976,7 +976,7 @@ void CMPCVideoDecFilter::Cleanup() m_nFFPicEnd = INT_MIN;
m_nCodecNb = -1;
m_nCodecId = CODEC_ID_NONE;
- SAFE_DELETE_ARRAY(m_pVideoOutputFormat)
+ SAFE_DELETE_ARRAY(m_pVideoOutputFormat);
// Release DXVA ressources
if (m_hDevice != INVALID_HANDLE_VALUE) {
@@ -1080,7 +1080,7 @@ CString CMPCVideoDecFilter::GetFileExtension() break;
}
}
- EndEnumFilters
+ EndEnumFilters;
return ext;
}
@@ -1293,7 +1293,7 @@ bool CMPCVideoDecFilter::IsDXVASupported() void CMPCVideoDecFilter::BuildDXVAOutputFormat()
{
- SAFE_DELETE_ARRAY(m_pVideoOutputFormat)
+ SAFE_DELETE_ARRAY(m_pVideoOutputFormat);
m_nVideoOutputCount = IsDXVASupported() ? ffCodecs[m_nCodecNb].DXVAModeCount() + _countof(DXVAFormats) : 0;
if (m_bUseFFmpeg) {
@@ -1871,7 +1871,7 @@ HRESULT CMPCVideoDecFilter::SoftwareDecode(IMediaSample* pIn, BYTE* pDataIn, int }
#if defined(_DEBUG) && 0
- static REFERENCE_TIME rtLast = 0;
+ static REFERENCE_TIME rtLast = 0;
TRACE("Deliver : %10I64d - %10I64d (%10I64d) {%10I64d}\n", rtStart, rtStop,
rtStop - rtStart, rtStart - rtLast);
rtLast = rtStart;
@@ -2388,12 +2388,12 @@ HRESULT CMPCVideoDecFilter::FindDXVA1DecoderConfiguration(IAMVideoAccelerator* p for (DWORD iFormat = 0; iFormat < dwFormats; iFormat++) {
if (pPixelFormats[iFormat].dwFourCC == MAKEFOURCC('N', 'V', '1', '2')) {
memcpy(pPixelFormat, &pPixelFormats[iFormat], sizeof(DDPIXELFORMAT));
- SAFE_DELETE_ARRAY(pPixelFormats)
+ SAFE_DELETE_ARRAY(pPixelFormats);
return S_OK;
}
}
- SAFE_DELETE_ARRAY(pPixelFormats)
+ SAFE_DELETE_ARRAY(pPixelFormats);
hr = E_FAIL;
}
}
@@ -2436,7 +2436,7 @@ HRESULT CMPCVideoDecFilter::CreateDXVA1Decoder(IAMVideoAccelerator* pAMVideoAcc if (m_pDXVADecoder && m_DXVADecoderGUID == *pDecoderGuid) {
return S_OK;
}
- SAFE_DELETE(m_pDXVADecoder)
+ SAFE_DELETE(m_pDXVADecoder);
if (!m_bUseDXVA) {
return E_FAIL;
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index f4626bf2c..fae6a818e 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -2103,7 +2103,7 @@ HRESULT CMpaDecFilter::DeliverFFmpeg(enum CodecID nCodecId, BYTE* p, int buffsiz }
//
else {
- COPY_TO_BUFFER(p, buffsize)
+ COPY_TO_BUFFER(p, buffsize);
pDataBuff = m_pFFBuffer;
}
@@ -2179,7 +2179,7 @@ HRESULT CMpaDecFilter::DeliverFFmpeg(enum CodecID nCodecId, BYTE* p, int buffsiz }
CAtlArray<float> pBuffOut;
- float* pDataOut;
+ float* pDataOut;
pBuffOut.SetCount(nSamples);
pDataOut = pBuffOut.GetData();
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp index 6495b7001..a5a9d1ad0 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp @@ -1557,22 +1557,22 @@ HRESULT CMpeg2DecOutputPin::Deliver(IMediaSample* pMediaSample) HRESULT CMpeg2DecOutputPin::DeliverEndOfStream()
{
- CallQueue(EOS())
+ CallQueue(EOS());
}
HRESULT CMpeg2DecOutputPin::DeliverBeginFlush()
{
- CallQueue(BeginFlush())
+ CallQueue(BeginFlush());
}
HRESULT CMpeg2DecOutputPin::DeliverEndFlush()
{
- CallQueue(EndFlush())
+ CallQueue(EndFlush());
}
HRESULT CMpeg2DecOutputPin::DeliverNewSegment(REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate)
{
- CallQueue(NewSegment(tStart, tStop, dRate))
+ CallQueue(NewSegment(tStart, tStop, dRate));
}
diff --git a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp index 1f0135169..16b9cf60c 100644 --- a/src/filters/transform/VSFilter/DirectVobSubFilter.cpp +++ b/src/filters/transform/VSFilter/DirectVobSubFilter.cpp @@ -1192,7 +1192,7 @@ HRESULT CDirectVobSubFilter2::JoinFilterGraph(IFilterGraph* pGraph, LPCWSTR pNam return E_FAIL;
}
}
- EndEnumFilters
+ EndEnumFilters;
// don't look... we will do some serious graph hacking again...
//
@@ -1273,7 +1273,7 @@ HRESULT CDirectVobSubFilter2::JoinFilterGraph(IFilterGraph* pGraph, LPCWSTR pNam break;
}
}
- EndEnumFilters
+ EndEnumFilters;
}
} else {
}
@@ -1356,12 +1356,12 @@ bool CDirectVobSubFilter2::ShouldWeAutoload(IFilterGraph* pGraph) break;
}
}
- EndEnumMediaTypes(pmt)
+ EndEnumMediaTypes(pmt);
if (fRet) {
break;
}
}
- EndEnumFilters
+ EndEnumFilters;
}
}
@@ -1380,7 +1380,7 @@ bool CDirectVobSubFilter2::ShouldWeAutoload(IFilterGraph* pGraph) break;
}
}
- EndEnumFilters
+ EndEnumFilters;
if ((m_fExternalLoad || m_fWebLoad) && (m_fWebLoad || !(wcsstr(fn, L"http://") || wcsstr(fn, L"mms://")))) {
bool fTemp = m_fHideSubtitles;
@@ -1409,7 +1409,7 @@ void CDirectVobSubFilter2::GetRidOfInternalScriptRenderer() m_pGraph->ConnectDirect(pPinTo, GetPin(2 + m_pTextInput.GetCount() - 1), NULL);
}
}
- EndEnumPins
+ EndEnumPins;
if (FAILED(m_pGraph->RemoveFilter(pBF))) {
break;
diff --git a/src/filters/transform/VSFilter/Systray.cpp b/src/filters/transform/VSFilter/Systray.cpp index a4aeb6e5b..3b86b5db1 100644 --- a/src/filters/transform/VSFilter/Systray.cpp +++ b/src/filters/transform/VSFilter/Systray.cpp @@ -213,7 +213,7 @@ LRESULT CSystrayWindow::OnNotifyIcon(WPARAM wParam, LPARAM lParam) break;
}
- EndEnumFilters
+ EndEnumFilters;
if (pBF2) {
ShowPPage(pBF2, hWnd);
@@ -239,7 +239,7 @@ LRESULT CSystrayWindow::OnNotifyIcon(WPARAM wParam, LPARAM lParam) names.Add(name);
}
}
- EndEnumFilters
+ EndEnumFilters;
CMenu popup;
popup.CreatePopupMenu();
@@ -370,7 +370,7 @@ static TCHAR* CallPPage(IFilterGraph* pGraph, int idx, HWND hWnd) i++;
}
- EndEnumFilters
+ EndEnumFilters;
TCHAR* ret = NULL;
diff --git a/src/mpc-hc/AppSettings.cpp b/src/mpc-hc/AppSettings.cpp index 4e0644974..2d9ee20d0 100644 --- a/src/mpc-hc/AppSettings.cpp +++ b/src/mpc-hc/AppSettings.cpp @@ -461,7 +461,7 @@ bool CAppSettings::NewDvd(ULONGLONG llDVDGuid) memcpy(&DvdPosition[i], &DvdPosition[i - 1], sizeof(DVD_POSITION));
}
DvdPosition[0].llDVDGuid = llDVDGuid;
- nCurrentDvdPosition = 0;
+ nCurrentDvdPosition = 0;
return true;
}
@@ -507,8 +507,8 @@ void CAppSettings::DeserializeHex(LPCTSTR strVal, BYTE* pBuffer, int nBufSize) c CString CAppSettings::SerializeHex(BYTE* pBuffer, int nBufSize) const
{
- CString strTemp;
- CString strResult;
+ CString strTemp;
+ CString strResult;
for (int i = 0; i < nBufSize; i++) {
strTemp.Format(_T("%02x"), pBuffer[i]);
@@ -523,7 +523,7 @@ void CAppSettings::UpdateData(bool fSave) CWinApp* pApp = AfxGetApp();
ASSERT(pApp);
- UINT len;
+ UINT len;
BYTE* ptr = NULL;
if (fSave) {
@@ -682,12 +682,12 @@ void CAppSettings::UpdateData(bool fSave) pApp->WriteProfileInt(IDS_RS_DVB, IDS_RS_BDA_IGNORE_ENCRYPTED_CHANNELS, fBDAIgnoreEncryptedChannels);
pApp->WriteProfileInt(IDS_RS_DVB, IDS_RS_DVB_LAST_CHANNEL, nDVBLastChannel);
- int iChannel = 0;
- POSITION pos = m_DVBChannels.GetHeadPosition();
+ int iChannel = 0;
+ POSITION pos = m_DVBChannels.GetHeadPosition();
while (pos) {
- CString strTemp2;
- CString strChannel;
- CDVBChannel& Channel = m_DVBChannels.GetNext(pos);
+ CString strTemp2;
+ CString strChannel;
+ CDVBChannel& Channel = m_DVBChannels.GetNext(pos);
strTemp2.Format(_T("%d"), iChannel);
pApp->WriteProfileString(IDS_RS_DVB, strTemp2, Channel.ToString());
iChannel++;
@@ -698,8 +698,8 @@ void CAppSettings::UpdateData(bool fSave) pApp->WriteProfileInt(IDS_R_SETTINGS, IDS_RS_FILEPOS, (int)fRememberFilePos);
if (fKeepHistory) {
for (int i = 0; i < MAX_DVD_POSITION; i++) {
- CString strDVDPos;
- CString strValue;
+ CString strDVDPos;
+ CString strValue;
strDVDPos.Format(_T("DVD Position %d"), i);
strValue = SerializeHex((BYTE*)&DvdPosition[i], sizeof(DVD_POSITION));
@@ -708,8 +708,8 @@ void CAppSettings::UpdateData(bool fSave) // playback positions for last played files
for (int i = 0; i < MAX_FILE_POSITION; i++) {
- CString strFilePos;
- CString strValue;
+ CString strFilePos;
+ CString strValue;
strFilePos.Format(_T("File Name %d"), i);
pApp->WriteProfileString(IDS_R_SETTINGS, strFilePos, FilePosition[i].strFile);
@@ -954,7 +954,7 @@ void CAppSettings::UpdateData(bool fSave) fExitAfterPlayback = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_MPC_EXIT_AFTER_PB, 0);
fNextInDirAfterPlayback = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_MPC_NEXT_AFTER_PB, 0);
// TODO: Change IDS_RS_MPC_NO_SEARCH_IN_FOLDER into IDS_RS_SEARCH_IN_FOLDER
- fUseSearchInFolder = !pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_MPC_NO_SEARCH_IN_FOLDER, 0);
+ fUseSearchInFolder = !pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_MPC_NO_SEARCH_IN_FOLDER, 0);
fUseTimeTooltip = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_USE_TIME_TOOLTIP, TRUE);
nTimeTooltipPosition = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_TIME_TOOLTIP_POSITION, TIME_TOOLTIP_ABOVE_SEEKBAR);
nOSDSize = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_MPC_OSD_SIZE, SysVersion::IsVistaOrLater() ? 18 : 20);
@@ -1380,13 +1380,13 @@ void CAppSettings::UpdateData(bool fSave) fD3DFullscreen = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_D3DFULLSCREEN, FALSE);
fMonitorAutoRefreshRate = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_MONITOR_AUTOREFRESHRATE, FALSE);
- iBrightness = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_COLOR_BRIGHTNESS, 0);
- iContrast = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_COLOR_CONTRAST, 0);
- iHue = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_COLOR_HUE, 0);
- iSaturation = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_COLOR_SATURATION, 0);
+ iBrightness = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_COLOR_BRIGHTNESS, 0);
+ iContrast = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_COLOR_CONTRAST, 0);
+ iHue = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_COLOR_HUE, 0);
+ iSaturation = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_COLOR_SATURATION, 0);
strShaderList = pApp->GetProfileString(IDS_R_SETTINGS, IDS_RS_SHADERLIST, _T(""));
- strShaderListScreenSpace = pApp->GetProfileString(IDS_R_SETTINGS, IDS_RS_SHADERLISTSCREENSPACE, _T(""));
+ strShaderListScreenSpace = pApp->GetProfileString(IDS_R_SETTINGS, IDS_RS_SHADERLISTSCREENSPACE, _T(""));
fToggleShader = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_TOGGLESHADER, 0);
fToggleShaderScreenSpace = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_TOGGLESHADERSSCREENSPACE, 0);
@@ -1428,12 +1428,12 @@ void CAppSettings::UpdateData(bool fSave) }
// playback positions for last played DVDs
- fRememberDVDPos = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_DVDPOS, 0);
+ fRememberDVDPos = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_DVDPOS, 0);
nCurrentDvdPosition = -1;
memset(DvdPosition, 0, sizeof(DvdPosition));
for (int i = 0; i < MAX_DVD_POSITION; i++) {
- CString strDVDPos;
- CString strValue;
+ CString strDVDPos;
+ CString strValue;
strDVDPos.Format(_T("DVD Position %d"), i);
strValue = pApp->GetProfileString(IDS_R_SETTINGS, strDVDPos, _T(""));
@@ -1443,11 +1443,11 @@ void CAppSettings::UpdateData(bool fSave) }
// playback positions for last played files
- fRememberFilePos = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_FILEPOS, 0);
- nCurrentFilePosition = -1;
+ fRememberFilePos = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_FILEPOS, 0);
+ nCurrentFilePosition = -1;
for (int i = 0; i < MAX_FILE_POSITION; i++) {
- CString strFilePos;
- CString strValue;
+ CString strFilePos;
+ CString strValue;
strFilePos.Format(_T("File Name %d"), i);
FilePosition[i].strFile = pApp->GetProfileString(IDS_R_SETTINGS, strFilePos, _T(""));
@@ -1457,7 +1457,7 @@ void CAppSettings::UpdateData(bool fSave) FilePosition[i].llPosition = _tstoi64(strValue);
}
- fLastFullScreen = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_LASTFULLSCREEN, 0);
+ fLastFullScreen = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_LASTFULLSCREEN, 0);
// TODO: sort shaders by label
@@ -1600,7 +1600,7 @@ void CAppSettings::UpdateRenderersData(bool fSave) r.fSPCPow2Tex = !!pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_POW2TEX, TRUE);
r.fSPCAllowAnimationWhenBuffering = !!pApp->GetProfileInt(IDS_R_SETTINGS, _T("SPCAllowAnimationWhenBuffering"), TRUE);
- r.iEvrBuffers = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_EVR_BUFFERS, 5);
+ r.iEvrBuffers = pApp->GetProfileInt(IDS_R_SETTINGS, IDS_RS_EVR_BUFFERS, 5);
r.D3D9RenderDevice = pApp->GetProfileString(IDS_R_SETTINGS, IDS_D3D9RENDERDEVICE, _T(""));
}
}
@@ -1608,8 +1608,8 @@ void CAppSettings::UpdateRenderersData(bool fSave) void CAppSettings::SaveCurrentFilePosition()
{
CWinApp* pApp = AfxGetApp();
- CString strFilePos;
- CString strValue;
+ CString strFilePos;
+ CString strValue;
int i = nCurrentFilePosition;
strFilePos.Format(_T("File Name %d"), i);
@@ -1622,7 +1622,7 @@ void CAppSettings::SaveCurrentFilePosition() void CAppSettings::ClearFilePositions()
{
CWinApp* pApp = AfxGetApp();
- CString strFilePos;
+ CString strFilePos;
for (int i = 0; i < MAX_FILE_POSITION; i++) {
FilePosition[i].strFile = _T("");
FilePosition[i].llPosition = 0;
@@ -1637,8 +1637,8 @@ void CAppSettings::ClearFilePositions() void CAppSettings::SaveCurrentDVDPosition()
{
CWinApp* pApp = AfxGetApp();
- CString strDVDPos;
- CString strValue;
+ CString strDVDPos;
+ CString strValue;
int i = nCurrentDvdPosition;
strDVDPos.Format(_T("DVD Position %d"), i);
@@ -1771,8 +1771,8 @@ void CAppSettings::ParseCommandLine(CAtlList<CString>& cmdln) } else if (sw == _T("dub") && pos) {
slDubs.AddTail(ParseFileName(cmdln.GetNext(pos)));
} else if (sw == _T("dubdelay") && pos) {
- CString strFile = ParseFileName(cmdln.GetNext(pos));
- int nPos = strFile.Find(_T("DELAY"));
+ CString strFile = ParseFileName(cmdln.GetNext(pos));
+ int nPos = strFile.Find(_T("DELAY"));
if (nPos != -1) {
rtShift = 10000 * _tstol(strFile.Mid(nPos + 6));
}
@@ -1942,9 +1942,9 @@ void CAppSettings::AddFav(favtype ft, CString s) CDVBChannel* CAppSettings::FindChannelByPref(int nPrefNumber)
{
- POSITION pos = m_DVBChannels.GetHeadPosition();
+ POSITION pos = m_DVBChannels.GetHeadPosition();
while (pos) {
- CDVBChannel& Channel = m_DVBChannels.GetNext(pos);
+ CDVBChannel& Channel = m_DVBChannels.GetNext(pos);
if (Channel.GetPrefNumber() == nPrefNumber) {
return &Channel;
}
diff --git a/src/mpc-hc/DVBChannel.cpp b/src/mpc-hc/DVBChannel.cpp index ae3681725..057fdfaba 100644 --- a/src/mpc-hc/DVBChannel.cpp +++ b/src/mpc-hc/DVBChannel.cpp @@ -59,19 +59,19 @@ void CDVBChannel::FromString(CString strValue) m_nPrefNumber = _tstol(strValue.Tokenize(_T("|"), i));
m_nOriginNumber = _tstol(strValue.Tokenize(_T("|"), i));
if (nVersion > FORMAT_VERSION_0) {
- m_bEncrypted = !!_tstol(strValue.Tokenize(_T("|"), i));
+ m_bEncrypted = !!_tstol(strValue.Tokenize(_T("|"), i));
}
if (nVersion > FORMAT_VERSION_1) {
- m_bNowNextFlag = !!_tstol(strValue.Tokenize(_T("|"), i));
+ m_bNowNextFlag = !!_tstol(strValue.Tokenize(_T("|"), i));
}
- m_ulONID = _tstol(strValue.Tokenize(_T("|"), i));
- m_ulTSID = _tstol(strValue.Tokenize(_T("|"), i));
- m_ulSID = _tstol(strValue.Tokenize(_T("|"), i));
- m_ulPMT = _tstol(strValue.Tokenize(_T("|"), i));
- m_ulPCR = _tstol(strValue.Tokenize(_T("|"), i));
- m_ulVideoPID = _tstol(strValue.Tokenize(_T("|"), i));
- m_nVideoType = (DVB_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));
- m_nAudioCount = _tstol(strValue.Tokenize(_T("|"), i));
+ m_ulONID = _tstol(strValue.Tokenize(_T("|"), i));
+ m_ulTSID = _tstol(strValue.Tokenize(_T("|"), i));
+ m_ulSID = _tstol(strValue.Tokenize(_T("|"), i));
+ m_ulPMT = _tstol(strValue.Tokenize(_T("|"), i));
+ m_ulPCR = _tstol(strValue.Tokenize(_T("|"), i));
+ m_ulVideoPID = _tstol(strValue.Tokenize(_T("|"), i));
+ m_nVideoType = (DVB_STREAM_TYPE)_tstol(strValue.Tokenize(_T("|"), i));
+ m_nAudioCount = _tstol(strValue.Tokenize(_T("|"), i));
if (nVersion > FORMAT_VERSION_1) {
m_nDefaultAudio = _tstol(strValue.Tokenize(_T("|"), i));
}
diff --git a/src/mpc-hc/EditListEditor.cpp b/src/mpc-hc/EditListEditor.cpp index 509d4c4fc..4e1b8c54f 100644 --- a/src/mpc-hc/EditListEditor.cpp +++ b/src/mpc-hc/EditListEditor.cpp @@ -581,7 +581,7 @@ void CEditListEditor::OnDolabeleditList(NMHDR* pNMHDR, LRESULT* pResult) CClip& CurClip = m_EditList.GetAt(m_CurPos);
int nSel = FindNameIndex(CurClip.GetName());
- CAtlList<CString> sl;
+ CAtlList<CString> sl;
for (int i = 0; i < m_NameList.GetCount(); i++) {
sl.AddTail(m_NameList.GetAt(i));
}
diff --git a/src/mpc-hc/FGFilter.cpp b/src/mpc-hc/FGFilter.cpp index 7fe6647ee..2c3998b71 100644 --- a/src/mpc-hc/FGFilter.cpp +++ b/src/mpc-hc/FGFilter.cpp @@ -468,7 +468,7 @@ HRESULT CFGFilterVideoRenderer::Create(IBaseFilter** ppBF, CInterfaceList<IUnkno break;
}
}
- EndEnumPins
+ EndEnumPins;
*ppBF = pBF.Detach();
}
diff --git a/src/mpc-hc/FGManager.cpp b/src/mpc-hc/FGManager.cpp index fe6548a50..44d171cfe 100644 --- a/src/mpc-hc/FGManager.cpp +++ b/src/mpc-hc/FGManager.cpp @@ -458,7 +458,7 @@ HRESULT CFGManager::AddSourceFilter(CFGFilter* pFGF, LPCWSTR lpcwstrFileName, LP return hr;
}
}
- EndEnumMediaTypes(pmt)
+ EndEnumMediaTypes(pmt);
*ppBF = pBF.Detach();
@@ -650,7 +650,7 @@ HRESULT CFGManager::Connect(IPin* pPinOut, IPin* pPinIn, bool bContinueRender) hr = pGC->AddFilterToCache(pBF);
}
- EndEnumCachedFilters
+ EndEnumCachedFilters;
}
// 3. Try filters in the graph
@@ -672,7 +672,7 @@ HRESULT CFGManager::Connect(IPin* pPinOut, IPin* pPinIn, bool bContinueRender) pBFs.AddTail(pBF);
}
- EndEnumFilters
+ EndEnumFilters;
POSITION pos = pBFs.GetHeadPosition();
while (pos) {
@@ -871,7 +871,7 @@ HRESULT CFGManager::Connect(IPin* pPinOut, IPin* pPinIn, bool bContinueRender) }
psde->mts.AddTail(CMediaType(*pmt));
}
- EndEnumMediaTypes(pmt)
+ EndEnumMediaTypes(pmt);
if (skip < (int)psde->mts.GetCount()) {
m_deadends.Add(psde);
}
@@ -1042,10 +1042,10 @@ STDMETHODIMP CFGManager::RenderEx(IPin* pPinOut, DWORD dwFlags, DWORD* pvContext break;
}
}
- EndEnumPins
+ EndEnumPins;
}
}
- EndEnumFilters
+ EndEnumFilters;
HRESULT hr;
@@ -1150,7 +1150,7 @@ STDMETHODIMP CFGManager::ConnectFilter(IBaseFilter* pBF, IPin* pPinIn) }
}
}
- EndEnumPins
+ EndEnumPins;
return
nRendered == nTotal ? (nRendered > 0 ? S_OK : S_FALSE) :
@@ -1181,7 +1181,7 @@ STDMETHODIMP CFGManager::ConnectFilter(IPin* pPinOut, IBaseFilter* pBF) }
}
}
- EndEnumPins
+ EndEnumPins;
return VFW_E_CANNOT_CONNECT;
}
@@ -1209,7 +1209,7 @@ STDMETHODIMP CFGManager::ConnectFilterDirect(IPin* pPinOut, IBaseFilter* pBF, co }
}
}
- EndEnumPins
+ EndEnumPins;
return VFW_E_CANNOT_CONNECT;
}
@@ -1222,7 +1222,7 @@ STDMETHODIMP CFGManager::NukeDownstream(IUnknown* pUnk) BeginEnumPins(pBF, pEP, pPin) {
NukeDownstream(pPin);
}
- EndEnumPins
+ EndEnumPins;
} else if (CComQIPtr<IPin> pPin = pUnk) {
CComPtr<IPin> pPinTo;
if (S_OK == IsPinDirection(pPin, PINDIR_OUTPUT)
@@ -1343,8 +1343,8 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) {
const CAppSettings& s = AfxGetAppSettings();
- bool bOverrideBroadcom = false;
- CFGFilter* pFGF;
+ bool bOverrideBroadcom = false;
+ CFGFilter* pFGF;
const bool* src = s.SrcFilters;
const bool* tra = s.TraFilters;
@@ -2509,7 +2509,7 @@ CFGManagerPlayer::CFGManagerPlayer(LPCTSTR pName, LPUNKNOWN pUnk, HWND hWnd) CFGFilterRegistry f(pMoniker);
m_armerit = max(m_armerit, f.GetMerit());
}
- EndEnumSysDev
+ EndEnumSysDev;
m_armerit += 0x100;
}
diff --git a/src/mpc-hc/FGManagerBDA.cpp b/src/mpc-hc/FGManagerBDA.cpp index 3a78cb617..a233de2c6 100644 --- a/src/mpc-hc/FGManagerBDA.cpp +++ b/src/mpc-hc/FGManagerBDA.cpp @@ -248,14 +248,14 @@ CFGManagerBDA::CFGManagerBDA(LPCTSTR pName, LPUNKNOWN pUnk, HWND hWnd) : CFGManagerPlayer(pName, pUnk, hWnd)
{
LOG(_T("\nStarting session ------------------------------------------------->"));
- m_DVBStreams[DVB_MPV] = CDVBStream(L"mpv", &mt_Mpv);
- m_DVBStreams[DVB_H264] = CDVBStream(L"h264", &mt_H264);
- m_DVBStreams[DVB_MPA] = CDVBStream(L"mpa", &mt_Mpa);
- m_DVBStreams[DVB_AC3] = CDVBStream(L"ac3", &mt_Ac3);
- m_DVBStreams[DVB_EAC3] = CDVBStream(L"eac3", &mt_Eac3);
- m_DVBStreams[DVB_PSI] = CDVBStream(L"psi", &mt_Psi, true, MEDIA_MPEG2_PSI);
- m_DVBStreams[DVB_TIF] = CDVBStream(L"tif", &mt_Tif, true);
- m_DVBStreams[DVB_EPG] = CDVBStream(L"epg", &mt_Epg);
+ m_DVBStreams[DVB_MPV] = CDVBStream(L"mpv", &mt_Mpv);
+ m_DVBStreams[DVB_H264] = CDVBStream(L"h264", &mt_H264);
+ m_DVBStreams[DVB_MPA] = CDVBStream(L"mpa", &mt_Mpa);
+ m_DVBStreams[DVB_AC3] = CDVBStream(L"ac3", &mt_Ac3);
+ m_DVBStreams[DVB_EAC3] = CDVBStream(L"eac3", &mt_Eac3);
+ m_DVBStreams[DVB_PSI] = CDVBStream(L"psi", &mt_Psi, true, MEDIA_MPEG2_PSI);
+ m_DVBStreams[DVB_TIF] = CDVBStream(L"tif", &mt_Tif, true);
+ m_DVBStreams[DVB_EPG] = CDVBStream(L"epg", &mt_Epg);
// Warning : MEDIA_ELEMENTARY_STREAM didn't work for subtitles with Windows XP!
if (SysVersion::IsVistaOrLater()) {
@@ -314,7 +314,7 @@ HRESULT CFGManagerBDA::CreateKSFilter(IBaseFilter** ppBF, CLSID KSCategory, cons CoTaskMemFree(strName);
}
}
- EndEnumSysDev
+ EndEnumSysDev;
return hr;
}
@@ -365,27 +365,27 @@ HRESULT CFGManagerBDA::ConnectFilters(IBaseFilter* pOutFilter, IBaseFilter* pInF hr = this->ConnectDirect(pOutPin, pInPin, NULL);
/*#ifdef _DEBUG
- PIN_INFO InfoPinIn, InfoPinOut;
- FILTER_INFO InfoFilterIn, InfoFilterOut;
- pInPin->QueryPinInfo (&InfoPinIn);
- pOutPin->QueryPinInfo (&InfoPinOut);
- InfoPinIn.pFilter->QueryFilterInfo(&InfoFilterIn);
- InfoPinOut.pFilter->QueryFilterInfo(&InfoFilterOut);
+ PIN_INFO InfoPinIn, InfoPinOut;
+ FILTER_INFO InfoFilterIn, InfoFilterOut;
+ pInPin->QueryPinInfo (&InfoPinIn);
+ pOutPin->QueryPinInfo (&InfoPinOut);
+ InfoPinIn.pFilter->QueryFilterInfo(&InfoFilterIn);
+ InfoPinOut.pFilter->QueryFilterInfo(&InfoFilterOut);
- TRACE ("%S - %S => %S - %S (hr=0x%08x)\n", InfoFilterOut.achName, InfoPinOut.achName, InfoFilterIn.achName, InfoPinIn.achName, hr);
+ TRACE ("%S - %S => %S - %S (hr=0x%08x)\n", InfoFilterOut.achName, InfoPinOut.achName, InfoFilterIn.achName, InfoPinIn.achName, hr);
- InfoPinIn.pFilter->Release();
- InfoPinOut.pFilter->Release();
+ InfoPinIn.pFilter->Release();
+ InfoPinOut.pFilter->Release();
#endif*/
if (SUCCEEDED(hr)) {
return hr;
}
}
}
- EndEnumPins
+ EndEnumPins;
}
}
- EndEnumPins
+ EndEnumPins;
return hr;
}
@@ -476,7 +476,7 @@ STDMETHODIMP CFGManagerBDA::RenderFile(LPCWSTR lpcwstrFile, LPCWSTR lpcwstrPlayL BeginEnumFilters(this, pEF, pBF) {
LOG(GetFilterName(pBF));
}
- EndEnumFilters
+ EndEnumFilters;
#endif
return S_OK;
diff --git a/src/mpc-hc/FileAssoc.cpp b/src/mpc-hc/FileAssoc.cpp index 6576e8291..83aeb3e2f 100644 --- a/src/mpc-hc/FileAssoc.cpp +++ b/src/mpc-hc/FileAssoc.cpp @@ -374,7 +374,7 @@ bool CFileAssoc::SetFileAssociation(CString strExt, CString strProgID, bool bReg bool CFileAssoc::IsRegistered(CString ext)
{
- BOOL bIsDefault = FALSE;
+ BOOL bIsDefault = FALSE;
CString strProgID = PROGID + ext;
if (!m_pAAR) {
@@ -754,7 +754,7 @@ UINT CFileAssoc::RunCheckIconsAssocThread(LPVOID pParam) config.pszMainIcon = TD_SHIELD_ICON;
config.pszWindowTitle = MAKEINTRESOURCE(IDS_ICONS_REASSOC_DLG_TITLE);
config.pszMainInstruction = MAKEINTRESOURCE(IDS_ICONS_REASSOC_DLG_INSTR);
- config.pszContent = MAKEINTRESOURCE(IDS_ICONS_REASSOC_DLG_CONTENT);;
+ config.pszContent = MAKEINTRESOURCE(IDS_ICONS_REASSOC_DLG_CONTENT);
config.pfCallback = TaskDialogCallbackProc;
typedef HRESULT(_stdcall * pfTaskDialogIndirect)(const TASKDIALOGCONFIG*, int*, int*, BOOL*);
diff --git a/src/mpc-hc/MainFrm.cpp b/src/mpc-hc/MainFrm.cpp index 0f1f0a8df..baa979aef 100644 --- a/src/mpc-hc/MainFrm.cpp +++ b/src/mpc-hc/MainFrm.cpp @@ -1426,8 +1426,8 @@ void CMainFrame::OnDisplayChange() // untested, not sure if it's working... MONITORINFO MonitorInfo;
HMONITOR hMonitor;
ZeroMemory(&MonitorInfo, sizeof(MonitorInfo));
- MonitorInfo.cbSize = sizeof(MonitorInfo);
- hMonitor = MonitorFromWindow(m_pFullscreenWnd->m_hWnd, 0);
+ MonitorInfo.cbSize = sizeof(MonitorInfo);
+ hMonitor = MonitorFromWindow(m_pFullscreenWnd->m_hWnd, 0);
if (GetMonitorInfo(hMonitor, &MonitorInfo)) {
CRect MonitorRect = CRect(MonitorInfo.rcMonitor);
m_fullWndSize.cx = MonitorRect.Width();
@@ -1936,7 +1936,7 @@ void CMainFrame::OnTimer(UINT_PTR nIDEvent) pBRIs.AddTail(pBRI);
}
}
- EndEnumPins
+ EndEnumPins;
if (!pBRIs.IsEmpty()) {
CAtlList<CString> sl;
@@ -1968,7 +1968,7 @@ void CMainFrame::OnTimer(UINT_PTR nIDEvent) break;
}
}
- EndEnumFilters
+ EndEnumFilters;
if (GetPlaybackMode() == PM_FILE) {
SetupChapters();
@@ -2376,7 +2376,7 @@ LRESULT CMainFrame::OnGraphNotify(WPARAM wParam, LPARAM lParam) switch (m_iDVDDomain) {
case DVD_DOMAIN_FirstPlay:
- ULONGLONG llDVDGuid;
+ ULONGLONG llDVDGuid;
Domain = _T("First Play");
@@ -3423,7 +3423,7 @@ void CMainFrame::OnUpdatePlayerStatus(CCmdUI* pCmdUI) break;
}
}
- EndEnumFilters
+ EndEnumFilters;
} else if (pAMOP) {
__int64 t = 0, c = 0;
if (SUCCEEDED(pAMOP->QueryProgress(&t, &c)) && t > 0 && c < t) {
@@ -7102,7 +7102,7 @@ void CMainFrame::OnPlayStop() break;
}
}
- EndEnumFilters
+ EndEnumFilters;
} else if (GetPlaybackMode() == PM_DVD) {
pDVDC->SetOption(DVD_ResetOnStop, TRUE);
pMC->Stop();
@@ -7245,9 +7245,9 @@ void CMainFrame::OnPlayFramestep(UINT nID) rtAvgTime = ((VIDEOINFOHEADER2*)mt.pbFormat)->AvgTimePerFrame;
}
}
- EndEnumPins
+ EndEnumPins;
}
- EndEnumFilters
+ EndEnumFilters;
// Exit of framestep forward : calculate the initial position
if (m_nStepForwardCount != 0) {
@@ -7455,9 +7455,9 @@ void CMainFrame::OnPlayGoto() atpf = (REFTIME)((VIDEOINFOHEADER2*)mt.pbFormat)->AvgTimePerFrame / 10000000i64;
}
}
- EndEnumPins
+ EndEnumPins;
}
- EndEnumFilters
+ EndEnumFilters;
}
REFERENCE_TIME start, dur = -1;
@@ -8765,7 +8765,7 @@ void CMainFrame::OnFavoritesAdd() break;
}
}
- EndEnumFilters
+ EndEnumFilters;
if (fn.IsEmpty()) {
return;
}
@@ -8897,7 +8897,7 @@ void CMainFrame::OnFavoritesQuickAddFavorite() break;
}
}
- EndEnumFilters
+ EndEnumFilters;
if (fn.IsEmpty()) {
return;
}
@@ -9760,9 +9760,9 @@ void CMainFrame::AutoChangeMonitorMode() m_rtTimePerFrame = 1;
}
}
- EndEnumPins
+ EndEnumPins;
}
- EndEnumFilters
+ EndEnumFilters;
MediaFPS = 10000000.0 / m_rtTimePerFrame;
} else if (GetPlaybackMode() == PM_DVD) {
DVD_PLAYBACK_LOCATION2 Location;
@@ -10327,7 +10327,7 @@ bool CMainFrame::IsRealEngineCompatible(CString strFilename) const {
// Real Media engine didn't support Unicode filename (nor filenames with # characters)
for (int i = 0; i < strFilename.GetLength(); i++) {
- WCHAR Char = strFilename[i];
+ WCHAR Char = strFilename[i];
if (Char < 32 || Char > 126 || Char == 35) {
return false;
}
@@ -10509,7 +10509,7 @@ void CMainFrame::OpenFile(OpenFileData* pOFD) HRESULT hr = pGB->RenderFile(CStringW(fn), NULL);
if (s.fKeepHistory && s.fRememberFilePos && !s.NewFile(fn)) {
- REFERENCE_TIME rtPos = s.CurrentFilePosition()->llPosition;
+ REFERENCE_TIME rtPos = s.CurrentFilePosition()->llPosition;
if (pMS) {
pMS->SetPositions(&rtPos, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning);
}
@@ -10596,11 +10596,11 @@ void CMainFrame::OpenFile(OpenFileData* pOFD) }
if (!(pAMOP = pGB)) {
- BeginEnumFilters(pGB, pEF, pBF)
+ BeginEnumFilters(pGB, pEF, pBF);
if (pAMOP = pBF) {
break;
}
- EndEnumFilters
+ EndEnumFilters;
}
if (FindFilter(__uuidof(CShoutcastSource), pGB)) {
@@ -10610,11 +10610,11 @@ void CMainFrame::OpenFile(OpenFileData* pOFD) SetupChapters();
CComQIPtr<IKeyFrameInfo> pKFI;
- BeginEnumFilters(pGB, pEF, pBF)
+ BeginEnumFilters(pGB, pEF, pBF);
if (pKFI = pBF) {
break;
}
- EndEnumFilters
+ EndEnumFilters;
UINT nKFs = 0;
if (pKFI && S_OK == pKFI->GetKeyFrameCount(nKFs) && nKFs > 0) {
UINT k = nKFs;
@@ -10633,9 +10633,9 @@ void CMainFrame::SetupChapters() m_pCB->ChapRemoveAll();
CInterfaceList<IBaseFilter> pBFs;
- BeginEnumFilters(pGB, pEF, pBF)
+ BeginEnumFilters(pGB, pEF, pBF);
pBFs.AddTail(pBF);
- EndEnumFilters
+ EndEnumFilters;
POSITION pos;
@@ -10761,7 +10761,7 @@ void CMainFrame::SetupChapters() }
}
}
- EndEnumPins
+ EndEnumPins;
}
m_pCB->ChapSort();
@@ -10785,7 +10785,7 @@ void CMainFrame::OpenDVD(OpenDVDData* pODD) break;
}
}
- EndEnumFilters
+ EndEnumFilters;
if (hr == E_INVALIDARG) {
throw(UINT)IDS_MAINFRM_93;
@@ -10975,7 +10975,7 @@ void CMainFrame::OpenCapture(OpenDeviceData* pODD) if (CComQIPtr<IAMAudioInputMixer> pAIM = pPin)
pAMAIM.Add(pAIM);
}
- EndEnumPins
+ EndEnumPins;
if (pAMASC)
{
@@ -11045,7 +11045,7 @@ void CMainFrame::OpenCustomizeGraph() pDVS2->AdviseSubClock(m_pSubClock);
}
}
- EndEnumFilters
+ EndEnumFilters;
}
BeginEnumFilters(pGB, pEF, pBF) {
@@ -11099,7 +11099,7 @@ void CMainFrame::OpenCustomizeGraph() }
}
}
- EndEnumFilters
+ EndEnumFilters;
CleanGraph();
}
@@ -11145,7 +11145,7 @@ void CMainFrame::OpenSetupVideo() break;
}
}
- EndEnumFilters
+ EndEnumFilters;
}
}
@@ -11218,7 +11218,7 @@ void CMainFrame::OpenSetupCaptureBar() pAMAIM.Add(pAIM);
}
}
- EndEnumPins
+ EndEnumPins;
m_wndCaptureBar.m_capdlg.SetupAudioControls(m_AudDispName, pAMASC, pAMAIM);
}
@@ -11277,7 +11277,7 @@ void CMainFrame::OpenSetupInfoBar() }
}
}
- EndEnumFilters
+ EndEnumFilters;
} else if (GetPlaybackMode() == PM_DVD) {
CString info('-');
m_wndInfoBar.SetLine(ResStr(IDS_INFOBAR_DOMAIN), info);
@@ -11310,7 +11310,7 @@ void CMainFrame::OpenSetupStatsBar() RecalcLayout();
}
}
- EndEnumFilters
+ EndEnumFilters;
}
void CMainFrame::OpenSetupStatusBar()
@@ -11352,13 +11352,13 @@ void CMainFrame::OpenSetupStatusBar() }
}
}
- EndEnumPins
+ EndEnumPins;
if (id != IDB_NOAUDIO) {
break;
}
}
- EndEnumFilters
+ EndEnumFilters;
m_wndStatusBar.SetStatusBitmap(id);
}
@@ -11407,7 +11407,7 @@ void CMainFrame::OpenSetupWindowTitle(CString fn) }
}
}
- EndEnumFilters
+ EndEnumFilters;
}
} else if (GetPlaybackMode() == PM_DVD) {
fn = _T("DVD");
@@ -11743,7 +11743,7 @@ bool CMainFrame::OpenMediaPrivate(CAutoPtr<OpenMediaData> pOMD) break;
}
}
- EndEnumFilters
+ EndEnumFilters;
if (m_fOpeningAborted) {
throw(UINT)IDS_AG_ABORTED;
@@ -12388,7 +12388,7 @@ void CMainFrame::SetupFiltersSubMenu() }
}
}
- EndEnumPins
+ EndEnumPins;
CComQIPtr<IAMStreamSelect> pSS = pBF;
if (pSS) {
@@ -12465,7 +12465,7 @@ void CMainFrame::SetupFiltersSubMenu() ids += nPPages;
idf++;
}
- EndEnumFilters
+ EndEnumFilters;
}
}
@@ -13525,9 +13525,9 @@ void CMainFrame::AddTextPassThruFilter() InsertSubStream(&m_pSubStreams, CComQIPtr<ISubStream>(pTPTF));
}
}
- EndEnumPins
+ EndEnumPins;
}
- EndEnumFilters
+ EndEnumFilters;
}
bool CMainFrame::LoadSubtitle(CString fn, ISubStream** actualStream)
@@ -13865,7 +13865,7 @@ void CMainFrame::CleanGraph() pEF->Reset();
}
}
- EndEnumFilters
+ EndEnumFilters;
}
#define AUDIOBUFFERLEN 500
@@ -13882,7 +13882,7 @@ static void SetLatency(IBaseFilter* pBF, int cbBuffer) pAMBN->SuggestAllocatorProperties(&ap);
}
}
- EndEnumPins
+ EndEnumPins;
}
HRESULT CMainFrame::BuildCapture(IPin* pPin, IBaseFilter* pBF[3], const GUID& majortype, AM_MEDIA_TYPE* pmt)
@@ -14519,7 +14519,7 @@ void CMainFrame::DisplayCurrentChannelInfo() }
osd = NowNext.cPresent + _T(". ") + NowNext.StartTime + _T(" - ") + NowNext.Duration + _T(". ") + NowNext.SummaryDesc + _T(" ");
- int i = osd.Find(_T("\n"));
+ int i = osd.Find(_T("\n"));
if (i > 0) {
osd.Delete(i, osd.GetLength() - i);
@@ -14710,9 +14710,9 @@ LPCTSTR CMainFrame::GetDVDAudioFormatName(DVD_AudioAttributes& ATR) const afx_msg void CMainFrame::OnGotoSubtitle(UINT nID)
{
OnPlayPause();
- m_rtCurSubPos = m_wndSeekBar.GetPosReal();
+ m_rtCurSubPos = m_wndSeekBar.GetPosReal();
m_lSubtitleShift = 0;
- m_nCurSubtitle = m_wndSubresyncBar.FindNearestSub(m_rtCurSubPos, (nID == ID_GOTO_NEXT_SUB));
+ m_nCurSubtitle = m_wndSubresyncBar.FindNearestSub(m_rtCurSubPos, (nID == ID_GOTO_NEXT_SUB));
if ((m_nCurSubtitle != -1) && pMS) {
pMS->SetPositions(&m_rtCurSubPos, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning);
}
@@ -15177,9 +15177,9 @@ void CMainFrame::JumpOfNSeconds(int nSeconds) long lPosition = tcCur.bHours * 60 * 60 + tcCur.bMinutes * 60 + tcCur.bSeconds + nSeconds;
// revert the update position to REFERENCE_TIME format
- tcCur.bHours = (BYTE)(lPosition / 3600);
- tcCur.bMinutes = (lPosition / 60) % 60;
- tcCur.bSeconds = lPosition % 60;
+ tcCur.bHours = (BYTE)(lPosition / 3600);
+ tcCur.bMinutes = (lPosition / 60) % 60;
+ tcCur.bSeconds = lPosition % 60;
rtCur = HMSF2RT(tcCur);
// quick and dirty trick:
@@ -15250,8 +15250,8 @@ void CMainFrame::JumpOfNSeconds(int nSeconds) // }
// else if (GetPlaybackMode() == PM_DVD)
// {
-// ULONG ulStreamsAvailable, ulCurrentStream;
-// BOOL bIsDisabled;
+// ULONG ulStreamsAvailable, ulCurrentStream;
+// BOOL bIsDisabled;
//
// if (SUCCEEDED(pDVDI->GetCurrentSubpicture(&ulStreamsAvailable, &ulCurrentStream, &bIsDisabled)))
// {
diff --git a/src/mpc-hc/MiniDump.cpp b/src/mpc-hc/MiniDump.cpp index 760a8013d..13c0c09bb 100644 --- a/src/mpc-hc/MiniDump.cpp +++ b/src/mpc-hc/MiniDump.cpp @@ -30,7 +30,7 @@ CMiniDump _Singleton;
-bool CMiniDump::m_bMiniDumpEnabled = true;
+bool CMiniDump::m_bMiniDumpEnabled = true;
typedef BOOL (WINAPI* MINIDUMPWRITEDUMP)(HANDLE hProcess, DWORD dwPid, HANDLE hFile, MINIDUMP_TYPE DumpType,
diff --git a/src/mpc-hc/Mpeg2SectionData.cpp b/src/mpc-hc/Mpeg2SectionData.cpp index 56ecb1bcf..83ea405a2 100644 --- a/src/mpc-hc/Mpeg2SectionData.cpp +++ b/src/mpc-hc/Mpeg2SectionData.cpp @@ -238,11 +238,11 @@ HRESULT CMpeg2DataParser::ParseSDT(ULONG ulFreq) TRACE("%15S %d\n", Channel.GetName(), Channel.GetSID());
break;
default :
- SkipDescriptor(gb, nType, nLength) // descriptor()
+ SkipDescriptor(gb, nType, nLength); // descriptor()
break;
}
}
- EndEnumDescriptors
+ EndEnumDescriptors;
if (!Channels.Lookup(Channel.GetSID())) {
@@ -307,16 +307,16 @@ HRESULT CMpeg2DataParser::ParsePMT(CDVBChannel& Channel) Channel.SetPCR((ULONG)gb.BitRead(13)); // PCR_PID
gb.BitRead(4); // reserved
BeginEnumDescriptors(gb, nType, nLength) { // for (i=0;i<N;i++) {
- SkipDescriptor(gb, nType, nLength) // descriptor()
+ SkipDescriptor(gb, nType, nLength); // descriptor()
}
- EndEnumDescriptors
+ EndEnumDescriptors;
while (gb.GetSize() - gb.GetPos() > 4) {
PES_STREAM_TYPE pes_stream_type;
DVB_STREAM_TYPE dvb_stream_type;
- WORD wPID;
- CString strLanguage;
+ WORD wPID;
+ CString strLanguage;
pes_stream_type = (PES_STREAM_TYPE)gb.BitRead(8); // stream_type
gb.BitRead(3); // reserved
@@ -331,11 +331,11 @@ HRESULT CMpeg2DataParser::ParsePMT(CDVBChannel& Channel) break;
case DT_AC3_AUDIO :
pes_stream_type = AUDIO_STREAM_AC3;
- SkipDescriptor(gb, nType, nLength)
+ SkipDescriptor(gb, nType, nLength);
break;
case DT_EXTENDED_AC3_AUDIO :
pes_stream_type = AUDIO_STREAM_AC3_PLUS;
- SkipDescriptor(gb, nType, nLength)
+ SkipDescriptor(gb, nType, nLength);
break;
case DT_SUBTITLING : {
gb.ReadBuffer(DescBuffer, nLength);
@@ -344,11 +344,11 @@ HRESULT CMpeg2DataParser::ParsePMT(CDVBChannel& Channel) }
break;
default :
- SkipDescriptor(gb, nType, nLength)
+ SkipDescriptor(gb, nType, nLength);
break;
}
}
- EndEnumDescriptors
+ EndEnumDescriptors;
if ((dvb_stream_type = ConvertToDVBType(pes_stream_type)) != DVB_UNKNOWN) {
Channel.AddStreamInfo(wPID, dvb_stream_type, pes_stream_type, strLanguage);
}
@@ -500,11 +500,11 @@ HRESULT CMpeg2DataParser::ParseEIT(ULONG ulSID, PresentFollowing& NowNext) }
break;
default:
- SkipDescriptor(gb, nType, nLength)
+ SkipDescriptor(gb, nType, nLength);
break;
}
}
- EndEnumDescriptors
+ EndEnumDescriptors;
}
m_Filter.SectionNumber++;
pSectionList.Release();
@@ -542,16 +542,16 @@ HRESULT CMpeg2DataParser::ParseNIT() gb.BitRead(4); // reserved_future_use
BeginEnumDescriptors(gb, nType, nLength) { // for (i=0;i<N;i++) {
- SkipDescriptor(gb, nType, nLength) // descriptor()
+ SkipDescriptor(gb, nType, nLength); // descriptor()
}
- EndEnumDescriptors
+ EndEnumDescriptors;
gb.BitRead(4); // reserved_future_use
transport_stream_loop_length = (WORD)gb.BitRead(12); // network_descriptors_length
while (gb.GetSize() - gb.GetPos() > 4) {
- WORD transport_stream_id = (WORD)gb.BitRead(16); // transport_stream_id
+ WORD transport_stream_id = (WORD)gb.BitRead(16); // transport_stream_id
UNREFERENCED_PARAMETER(transport_stream_id);
- WORD original_network_id = (WORD)gb.BitRead(16); // original_network_id
+ WORD original_network_id = (WORD)gb.BitRead(16); // original_network_id
UNREFERENCED_PARAMETER(original_network_id);
gb.BitRead(4); // reserved_future_use
BeginEnumDescriptors(gb, nType, nLength) {
@@ -568,11 +568,11 @@ HRESULT CMpeg2DataParser::ParseNIT() }
break;
default :
- SkipDescriptor(gb, nType, nLength)
+ SkipDescriptor(gb, nType, nLength);
break;
}
}
- EndEnumDescriptors
+ EndEnumDescriptors;
}
return S_OK;
diff --git a/src/mpc-hc/OpenFileDlg.cpp b/src/mpc-hc/OpenFileDlg.cpp index 6a4481427..a056a72bb 100644 --- a/src/mpc-hc/OpenFileDlg.cpp +++ b/src/mpc-hc/OpenFileDlg.cpp @@ -63,7 +63,7 @@ END_MESSAGE_MAP() LRESULT CALLBACK COpenFileDlg::WindowProcNew(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{
- if (message == WM_COMMAND && HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDOK
+ if (message == WM_COMMAND && HIWORD(wParam) == BN_CLICKED && LOWORD(wParam) == IDOK
&& m_fAllowDirSelection) {
CAutoVectorPtr<TCHAR> path;
path.Allocate(_MAX_PATH + 1); // _MAX_PATH should be bigger for multiple selection, but we are only interested if it's zero length
diff --git a/src/mpc-hc/PPageAccelTbl.cpp b/src/mpc-hc/PPageAccelTbl.cpp index e549ab75b..f988a2a81 100644 --- a/src/mpc-hc/PPageAccelTbl.cpp +++ b/src/mpc-hc/PPageAccelTbl.cpp @@ -27,8 +27,8 @@ struct APP_COMMAND {
- UINT appcmd;
- LPCTSTR cmdname;
+ UINT appcmd;
+ LPCTSTR cmdname;
};
APP_COMMAND g_CommandList[] = {
diff --git a/src/mpc-hc/PPageCapture.cpp b/src/mpc-hc/PPageCapture.cpp index ca9679a37..aa67715b0 100644 --- a/src/mpc-hc/PPageCapture.cpp +++ b/src/mpc-hc/PPageCapture.cpp @@ -360,7 +360,7 @@ void CPPageCapture::FindAnalogDevices() CoTaskMemFree(strName);
}
}
- EndEnumSysDev
+ EndEnumSysDev;
{
int i = m_cbAnalogAudio.AddString(_T("<Video Capture Device>"));
@@ -393,7 +393,7 @@ void CPPageCapture::FindAnalogDevices() CoTaskMemFree(strName);
}
}
- EndEnumSysDev
+ EndEnumSysDev;
if (m_cbAnalogAudio.GetCount()) {
m_cbAnalogAudio.SetCurSel(iSel);
}
@@ -502,7 +502,7 @@ void CPPageCapture::FindDigitalDevices() CoTaskMemFree(strName);
}
}
- EndEnumSysDev
+ EndEnumSysDev;
if (m_cbDigitalNetworkProvider.GetCount()) {
m_cbDigitalNetworkProvider.SetCurSel(iSel);
}
@@ -526,7 +526,7 @@ void CPPageCapture::FindDigitalDevices() CoTaskMemFree(strName);
}
}
- EndEnumSysDev
+ EndEnumSysDev;
if (m_cbDigitalTuner.GetCount()) {
m_cbDigitalTuner.SetCurSel(iSel);
}
@@ -549,7 +549,7 @@ void CPPageCapture::FindDigitalDevices() CoTaskMemFree(strName);
}
}
- EndEnumSysDev
+ EndEnumSysDev;
if (m_cbDigitalReceiver.GetCount()) {
m_cbDigitalReceiver.SetCurSel(iSel);
}
@@ -564,13 +564,13 @@ BOOL CPPageCapture::OnApply() s.iDefaultCaptureDevice = m_iDefaultDevice;
if (m_cbAnalogVideo.GetCurSel() >= 0) {
- s.strAnalogVideo = m_vidnames[m_cbAnalogVideo.GetCurSel()];
+ s.strAnalogVideo = m_vidnames[m_cbAnalogVideo.GetCurSel()];
}
if (m_cbAnalogAudio.GetCurSel() >= 0) {
- s.strAnalogAudio = m_audnames[m_cbAnalogAudio.GetCurSel()];
+ s.strAnalogAudio = m_audnames[m_cbAnalogAudio.GetCurSel()];
}
if (m_cbAnalogCountry.GetCurSel() >= 0) {
- s.iAnalogCountry = ((cc_t*)m_cbAnalogCountry.GetItemDataPtr(m_cbAnalogCountry.GetCurSel()))->code;
+ s.iAnalogCountry = ((cc_t*)m_cbAnalogCountry.GetItemDataPtr(m_cbAnalogCountry.GetCurSel()))->code;
}
if (m_cbDigitalNetworkProvider.GetCurSel() >= 0) {
diff --git a/src/mpc-hc/PPageFileInfoClip.cpp b/src/mpc-hc/PPageFileInfoClip.cpp index 687f5ad5e..a6769a949 100644 --- a/src/mpc-hc/PPageFileInfoClip.cpp +++ b/src/mpc-hc/PPageFileInfoClip.cpp @@ -112,7 +112,7 @@ BOOL CPPageFileInfoClip::OnInitDialog() break;
}
}
- EndEnumFilters
+ EndEnumFilters;
}
m_hIcon = LoadIcon(m_fn, false);
@@ -161,7 +161,7 @@ BOOL CPPageFileInfoClip::OnInitDialog() }
}
}
- EndEnumFilters
+ EndEnumFilters;
m_tooltip.Create(this, TTS_NOPREFIX | TTS_ALWAYSTIP);
diff --git a/src/mpc-hc/PPageFileInfoDetails.cpp b/src/mpc-hc/PPageFileInfoDetails.cpp index d6006eb05..0fde61e62 100644 --- a/src/mpc-hc/PPageFileInfoDetails.cpp +++ b/src/mpc-hc/PPageFileInfoDetails.cpp @@ -85,7 +85,7 @@ static bool GetProperty(IFilterGraph* pFG, LPCOLESTR propName, VARIANT* vt) return true;
}
}
- EndEnumFilters
+ EndEnumFilters;
return false;
}
@@ -120,7 +120,7 @@ BOOL CPPageFileInfoDetails::OnInitDialog() break;
}
}
- EndEnumFilters
+ EndEnumFilters;
}
CString ext = m_fn.Left(m_fn.Find(_T("://")) + 1).TrimRight(':');
@@ -207,7 +207,7 @@ BOOL CPPageFileInfoDetails::OnInitDialog() break;
}
}
- EndEnumFilters
+ EndEnumFilters;
}
}
@@ -309,9 +309,9 @@ void CPPageFileInfoDetails::InitEncoding() }
}
}
- EndEnumPins
+ EndEnumPins;
}
- EndEnumFilters
+ EndEnumFilters;
CString text = Implode(sl, '\n');
text.Replace(_T("\n"), _T("\r\n"));
diff --git a/src/mpc-hc/PPageFileMediaInfo.cpp b/src/mpc-hc/PPageFileMediaInfo.cpp index b3488b420..9f68cedad 100644 --- a/src/mpc-hc/PPageFileMediaInfo.cpp +++ b/src/mpc-hc/PPageFileMediaInfo.cpp @@ -106,7 +106,7 @@ BOOL CPPageFileMediaInfo::OnInitDialog() break;
}
}
- EndEnumFilters
+ EndEnumFilters;
}
#ifdef USE_MEDIAINFO_STATIC
diff --git a/src/mpc-hc/PPageFullscreen.cpp b/src/mpc-hc/PPageFullscreen.cpp index 08e2c790f..4e39c2453 100644 --- a/src/mpc-hc/PPageFullscreen.cpp +++ b/src/mpc-hc/PPageFullscreen.cpp @@ -362,7 +362,7 @@ void CPPageFullscreen::OnUpdateFullScrCombo() {
CMonitors monitors;
m_f_hmonitor = m_MonitorDisplayNames[m_iMonitorTypeCtrl.GetCurSel()];
- if (AfxGetAppSettings().strFullScreenMonitor != m_f_hmonitor) {
+ if (AfxGetAppSettings().strFullScreenMonitor != m_f_hmonitor) {
m_AutoChangeFullscrRes.bEnabled = false;
}
diff --git a/src/mpc-hc/PPageMisc.cpp b/src/mpc-hc/PPageMisc.cpp index 7304ac9be..89c5b8e55 100644 --- a/src/mpc-hc/PPageMisc.cpp +++ b/src/mpc-hc/PPageMisc.cpp @@ -114,8 +114,8 @@ BOOL CPPageMisc::OnInitDialog() m_SliSaturation.SetPos(m_iSaturation);
m_iBrightness ? m_sBrightness.Format(_T("%+d"), m_iBrightness) : m_sBrightness = _T("0");
- m_iContrast ? m_sContrast.Format(_T("%+d"), m_iContrast) : m_sContrast = _T("0");
- m_iHue ? m_sHue.Format(_T("%+d"), m_iHue) : m_sHue = _T("0");
+ m_iContrast ? m_sContrast.Format(_T("%+d"), m_iContrast) : m_sContrast = _T("0");
+ m_iHue ? m_sHue.Format(_T("%+d"), m_iHue) : m_sHue = _T("0");
m_iSaturation ? m_sSaturation.Format(_T("%+d"), m_iSaturation) : m_sSaturation = _T("0");
m_nUpdaterAutoCheck = s.nUpdaterAutoCheck;
@@ -133,10 +133,10 @@ BOOL CPPageMisc::OnApply() CAppSettings& s = AfxGetAppSettings();
- s.iBrightness = m_iBrightness;
- s.iContrast = m_iContrast;
- s.iHue = m_iHue;
- s.iSaturation = m_iSaturation;
+ s.iBrightness = m_iBrightness;
+ s.iContrast = m_iContrast;
+ s.iHue = m_iHue;
+ s.iSaturation = m_iSaturation;
s.nUpdaterAutoCheck = m_nUpdaterAutoCheck;
s.nUpdaterDelay = m_nUpdaterDelay;
@@ -174,10 +174,10 @@ void CPPageMisc::OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar) void CPPageMisc::OnBnClickedReset()
{
- m_iBrightness = AfxGetMyApp()->GetColorControl(ProcAmp_Brightness)->DefaultValue;
- m_iContrast = AfxGetMyApp()->GetColorControl(ProcAmp_Contrast)->DefaultValue;
- m_iHue = AfxGetMyApp()->GetColorControl(ProcAmp_Hue)->DefaultValue;
- m_iSaturation = AfxGetMyApp()->GetColorControl(ProcAmp_Saturation)->DefaultValue;
+ m_iBrightness = AfxGetMyApp()->GetColorControl(ProcAmp_Brightness)->DefaultValue;
+ m_iContrast = AfxGetMyApp()->GetColorControl(ProcAmp_Contrast)->DefaultValue;
+ m_iHue = AfxGetMyApp()->GetColorControl(ProcAmp_Hue)->DefaultValue;
+ m_iSaturation = AfxGetMyApp()->GetColorControl(ProcAmp_Saturation)->DefaultValue;
m_SliBrightness.SetPos(m_iBrightness);
m_SliContrast.SetPos(m_iContrast);
@@ -185,8 +185,8 @@ void CPPageMisc::OnBnClickedReset() m_SliSaturation.SetPos(m_iSaturation);
m_iBrightness ? m_sBrightness.Format(_T("%+d"), m_iBrightness) : m_sBrightness = _T("0");
- m_iContrast ? m_sContrast.Format(_T("%+d"), m_iContrast) : m_sContrast = _T("0");
- m_iHue ? m_sHue.Format(_T("%+d"), m_iHue) : m_sHue = _T("0");
+ m_iContrast ? m_sContrast.Format(_T("%+d"), m_iContrast) : m_sContrast = _T("0");
+ m_iHue ? m_sHue.Format(_T("%+d"), m_iHue) : m_sHue = _T("0");
m_iSaturation ? m_sSaturation.Format(_T("%+d"), m_iSaturation) : m_sSaturation = _T("0");
((CMainFrame*)AfxGetMyApp()->GetMainWnd())->SetColorControl(ProcAmp_All, m_iBrightness, m_iContrast, m_iHue, m_iSaturation);
diff --git a/src/mpc-hc/PPageOutput.cpp b/src/mpc-hc/PPageOutput.cpp index e971dc4d0..1795a9d0b 100644 --- a/src/mpc-hc/PPageOutput.cpp +++ b/src/mpc-hc/PPageOutput.cpp @@ -105,7 +105,7 @@ BOOL CPPageOutput::OnInitDialog() SetHandCursor(m_hWnd, IDC_COMBO1);
const CAppSettings& s = AfxGetAppSettings();
- const CRenderersSettings& renderersSettings = s.m_RenderersSettings;
+ const CRenderersSettings& renderersSettings = s.m_RenderersSettings;
m_iDSVideoRendererType = s.iDSVideoRendererType;
m_iRMVideoRendererType = s.iRMVideoRendererType;
@@ -163,7 +163,7 @@ BOOL CPPageOutput::OnInitDialog() }
i++;
}
- EndEnumSysDev
+ EndEnumSysDev;
Cbstr.Format(_T("%d: %s"), i++, AUDRNDT_NULL_COMP);
m_AudioRendererDisplayNames.Add(AUDRNDT_NULL_COMP);
@@ -192,7 +192,7 @@ BOOL CPPageOutput::OnInitDialog() //
IDirect3D9* pD3D = Direct3DCreate9(D3D_SDK_VERSION);
if (pD3D) {
- TCHAR strGUID[50];
+ TCHAR strGUID[50];
CString cstrGUID;
CString d3ddevice_str = _T("");
CStringArray adapterList;
@@ -302,13 +302,13 @@ BOOL CPPageOutput::OnApply() s.iDSVideoRendererType = m_iDSVideoRendererType;
s.iRMVideoRendererType = m_iRMVideoRendererType;
s.iQTVideoRendererType = m_iQTVideoRendererType;
- renderersSettings.iAPSurfaceUsage = m_iAPSurfaceUsage;
- renderersSettings.iDX9Resizer = m_iDX9Resizer;
- renderersSettings.fVMR9MixerMode = !!m_fVMR9MixerMode;
- renderersSettings.fVMR9MixerYUV = !!m_fVMR9MixerYUV;
+ renderersSettings.iAPSurfaceUsage = m_iAPSurfaceUsage;
+ renderersSettings.iDX9Resizer = m_iDX9Resizer;
+ renderersSettings.fVMR9MixerMode = !!m_fVMR9MixerMode;
+ renderersSettings.fVMR9MixerYUV = !!m_fVMR9MixerYUV;
renderersSettings.m_RenderSettings.fVMR9AlterativeVSync = m_fVMR9AlterativeVSync != 0;
s.strAudioRendererDisplayName = m_AudioRendererDisplayNames[m_iAudioRendererType];
- s.fD3DFullscreen = m_fD3DFullscreen ? true : false;
+ s.fD3DFullscreen = m_fD3DFullscreen ? true : false;
renderersSettings.fResetDevice = !!m_fResetDevice;
diff --git a/src/mpc-hc/PlayerCaptureDialog.cpp b/src/mpc-hc/PlayerCaptureDialog.cpp index 28369dbcb..ab6c45bdd 100644 --- a/src/mpc-hc/PlayerCaptureDialog.cpp +++ b/src/mpc-hc/PlayerCaptureDialog.cpp @@ -467,7 +467,7 @@ static void InitCodecList(CAtlArray<Codec>& codecs, CComboBox& box, const GUID& box.AddString(c.FriendlyName),
(DWORD_PTR)codecs.Add(c));
}
- EndEnumSysDev
+ EndEnumSysDev;
box.EnableWindow(box.GetCount() > 1);
diff --git a/src/mpc-hc/PlayerPlaylistBar.cpp b/src/mpc-hc/PlayerPlaylistBar.cpp index df32a4b56..bad36c702 100644 --- a/src/mpc-hc/PlayerPlaylistBar.cpp +++ b/src/mpc-hc/PlayerPlaylistBar.cpp @@ -328,8 +328,8 @@ static CString CombinePath(CPath p, CString fn) bool CPlayerPlaylistBar::ParseBDMVPlayList(CString fn)
{
- CHdmvClipInfo ClipInfo;
- CString strPlaylistFile;
+ CHdmvClipInfo ClipInfo;
+ CString strPlaylistFile;
CAtlList<CHdmvClipInfo::PlaylistItem> MainPlaylist;
CPath Path(fn);
@@ -337,7 +337,7 @@ bool CPlayerPlaylistBar::ParseBDMVPlayList(CString fn) Path.RemoveFileSpec();
if (SUCCEEDED(ClipInfo.FindMainMovie(Path + L"\\", strPlaylistFile, MainPlaylist, ((CMainFrame*)GetParentFrame())->m_MPLSPlaylist))) {
- CAtlList<CString> strFiles;
+ CAtlList<CString> strFiles;
strFiles.AddHead(strPlaylistFile);
Append(strFiles, MainPlaylist.GetCount() > 1, NULL);
}
diff --git a/src/mpc-hc/PlayerStatusBar.cpp b/src/mpc-hc/PlayerStatusBar.cpp index da8520456..067d137aa 100644 --- a/src/mpc-hc/PlayerStatusBar.cpp +++ b/src/mpc-hc/PlayerStatusBar.cpp @@ -190,7 +190,7 @@ void CPlayerStatusBar::SetStatusMessage(CString str) CString CPlayerStatusBar::GetStatusTimer()
{
- CString strResult;
+ CString strResult;
m_time.GetWindowText(strResult);
diff --git a/src/mpc-hc/PnSPresetsDlg.cpp b/src/mpc-hc/PnSPresetsDlg.cpp index 805105d6c..794c7e7eb 100644 --- a/src/mpc-hc/PnSPresetsDlg.cpp +++ b/src/mpc-hc/PnSPresetsDlg.cpp @@ -170,7 +170,7 @@ void CPnSPresetsDlg::OnBnClickedButton6() // del int i = m_list.GetCurSel();
m_list.DeleteString(i);
m_pnspresets.RemoveAt(i);
- if (i == m_list.GetCount()) {
+ if (i == m_list.GetCount()) {
i--;
}
m_list.SetCurSel(i);
diff --git a/src/mpc-hc/RegFilterChooserDlg.cpp b/src/mpc-hc/RegFilterChooserDlg.cpp index b20eba29b..6ad5bcdb7 100644 --- a/src/mpc-hc/RegFilterChooserDlg.cpp +++ b/src/mpc-hc/RegFilterChooserDlg.cpp @@ -84,17 +84,17 @@ BOOL CRegFilterChooserDlg::OnInitDialog() BeginEnumSysDev(CLSID_LegacyAmFilterCategory, pMoniker) {
AddToList(pMoniker);
}
- EndEnumSysDev
+ EndEnumSysDev;
BeginEnumSysDev(DMOCATEGORY_VIDEO_EFFECT, pMoniker) {
AddToList(pMoniker);
}
- EndEnumSysDev
+ EndEnumSysDev;
BeginEnumSysDev(DMOCATEGORY_AUDIO_EFFECT, pMoniker) {
AddToList(pMoniker);
}
- EndEnumSysDev
+ EndEnumSysDev;
AddAnchor(IDC_LIST2, TOP_LEFT, BOTTOM_RIGHT);
AddAnchor(IDC_BUTTON1, BOTTOM_LEFT);
diff --git a/src/mpc-hc/StaticLink.cpp b/src/mpc-hc/StaticLink.cpp index 266a58993..c478169fb 100644 --- a/src/mpc-hc/StaticLink.cpp +++ b/src/mpc-hc/StaticLink.cpp @@ -28,7 +28,7 @@ // CStaticLink
-COLORREF CStaticLink::g_colorUnvisited = RGB(0, 0, 255); // blue
+COLORREF CStaticLink::g_colorUnvisited = RGB( 0, 0, 255); // blue
COLORREF CStaticLink::g_colorVisited = RGB(128, 0, 128); // purple
IMPLEMENT_DYNAMIC(CStaticLink, CStatic)
diff --git a/src/mpc-hc/mplayerc.cpp b/src/mpc-hc/mplayerc.cpp index aa67b4bad..73a114cc1 100644 --- a/src/mpc-hc/mplayerc.cpp +++ b/src/mpc-hc/mplayerc.cpp @@ -283,14 +283,14 @@ CMPlayerCApp::CMPlayerCApp() ResetColorControlRange();
memset(&m_VMR9ColorControl, 0, sizeof(m_VMR9ColorControl));
- m_VMR9ColorControl[0].dwSize = sizeof(VMR9ProcAmpControlRange);
- m_VMR9ColorControl[0].dwProperty = ProcAmpControl9_Brightness;
- m_VMR9ColorControl[1].dwSize = sizeof(VMR9ProcAmpControlRange);
- m_VMR9ColorControl[1].dwProperty = ProcAmpControl9_Contrast;
- m_VMR9ColorControl[2].dwSize = sizeof(VMR9ProcAmpControlRange);
- m_VMR9ColorControl[2].dwProperty = ProcAmpControl9_Hue;
- m_VMR9ColorControl[3].dwSize = sizeof(VMR9ProcAmpControlRange);
- m_VMR9ColorControl[3].dwProperty = ProcAmpControl9_Saturation;
+ m_VMR9ColorControl[0].dwSize = sizeof(VMR9ProcAmpControlRange);
+ m_VMR9ColorControl[0].dwProperty = ProcAmpControl9_Brightness;
+ m_VMR9ColorControl[1].dwSize = sizeof(VMR9ProcAmpControlRange);
+ m_VMR9ColorControl[1].dwProperty = ProcAmpControl9_Contrast;
+ m_VMR9ColorControl[2].dwSize = sizeof(VMR9ProcAmpControlRange);
+ m_VMR9ColorControl[2].dwProperty = ProcAmpControl9_Hue;
+ m_VMR9ColorControl[3].dwSize = sizeof(VMR9ProcAmpControlRange);
+ m_VMR9ColorControl[3].dwProperty = ProcAmpControl9_Saturation;
memset(&m_EVRColorControl, 0, sizeof(m_EVRColorControl));
@@ -678,11 +678,11 @@ HANDLE WINAPI Mine_CreateFileA(LPCSTR p1, DWORD p2, DWORD p3, LPSECURITY_ATTRIBU BOOL CreateFakeVideoTS(LPCWSTR strIFOPath, LPWSTR strFakeFile, size_t nFakeFileSize)
{
- BOOL bRet = FALSE;
- WCHAR szTempPath[_MAX_PATH];
- WCHAR strFileName[_MAX_PATH];
- WCHAR strExt[_MAX_EXT];
- CIfo Ifo;
+ BOOL bRet = FALSE;
+ WCHAR szTempPath[_MAX_PATH];
+ WCHAR strFileName[_MAX_PATH];
+ WCHAR strExt[_MAX_EXT];
+ CIfo Ifo;
if (!GetTempPathW(_MAX_PATH, szTempPath)) {
return FALSE;
@@ -1167,10 +1167,10 @@ UINT CMPlayerCApp::GetRemoteControlCodeSRM7500(UINT nInputcode, HRAWINPUT hRawIn void CMPlayerCApp::RegisterHotkeys()
{
- RAWINPUTDEVICELIST InputDeviceList[50];
- UINT nInputDeviceCount = _countof(InputDeviceList);
- RID_DEVICE_INFO DevInfo;
- RAWINPUTDEVICE MCEInputDevice[] = {
+ RAWINPUTDEVICELIST InputDeviceList[50];
+ UINT nInputDeviceCount = _countof(InputDeviceList);
+ RID_DEVICE_INFO DevInfo;
+ RAWINPUTDEVICE MCEInputDevice[] = {
// usUsagePage usUsage dwFlags hwndTarget
{ 0xFFBC, 0x88, 0, NULL},
{ 0x000C, 0x01, 0, NULL},
@@ -1184,7 +1184,7 @@ void CMPlayerCApp::RegisterHotkeys() nInputDeviceCount = GetRawInputDeviceList(InputDeviceList, &nInputDeviceCount, sizeof(RAWINPUTDEVICELIST));
for (UINT i = 0; i < nInputDeviceCount; i++) {
- UINT nTemp = sizeof(DevInfo);
+ UINT nTemp = sizeof(DevInfo);
if (GetRawInputDeviceInfo(InputDeviceList[i].hDevice, RIDI_DEVICEINFO, &DevInfo, &nTemp) > 0) {
if (DevInfo.hid.dwVendorId == 0x00000471 && // Philips HID vendor id
@@ -1558,7 +1558,7 @@ void SetAudioRenderer(int AudioDevNo) m_AudioRendererDisplayNames.Add(CString(str));
i++;
}
- EndEnumSysDev
+ EndEnumSysDev;
m_AudioRendererDisplayNames.Add(AUDRNDT_NULL_COMP);
m_AudioRendererDisplayNames.Add(AUDRNDT_NULL_UNCOMP);
@@ -2104,9 +2104,9 @@ LRESULT CALLBACK RTLWindowsLayoutCbtFilterHook(int code, WPARAM wParam, LPARAM l bool CMPlayerCApp::SetLanguage(const LanguageResource& languageResource, bool showErrorMsg /*= true*/)
{
- CAppSettings& s = AfxGetAppSettings();
- HMODULE hMod = NULL;
- bool success = false;
+ CAppSettings& s = AfxGetAppSettings();
+ HMODULE hMod = NULL;
+ bool success = false;
// Try to load the resource dll if any
if (languageResource.dllPath) {
@@ -2168,12 +2168,12 @@ void CMPlayerCApp::RunAsAdministrator(LPCTSTR strCommand, LPCTSTR strArgs, bool {
SHELLEXECUTEINFO execinfo;
memset(&execinfo, 0, sizeof(execinfo));
- execinfo.lpFile = strCommand;
- execinfo.cbSize = sizeof(execinfo);
- execinfo.lpVerb = _T("runas");
- execinfo.fMask = SEE_MASK_NOCLOSEPROCESS;
- execinfo.nShow = SW_SHOWDEFAULT;
- execinfo.lpParameters = strArgs;
+ execinfo.lpFile = strCommand;
+ execinfo.cbSize = sizeof(execinfo);
+ execinfo.lpVerb = _T("runas");
+ execinfo.fMask = SEE_MASK_NOCLOSEPROCESS;
+ execinfo.nShow = SW_SHOWDEFAULT;
+ execinfo.lpParameters = strArgs;
ShellExecuteEx(&execinfo);
|