diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-05-01 13:30:57 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-05-01 13:30:57 +0400 |
commit | 9db31347f9345a43463f0f6922009ba4a900e282 (patch) | |
tree | 6da7e98b800acc55c72289ca0a87f01fb567a8ef /src/filters/transform/Mpeg2DecFilter | |
parent | 3e8dee8a14ac1c54db3a8aa0314786a2a63e048d (diff) |
move the defines for the filters' names to their headers for the rest of the filters
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@4561 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/Mpeg2DecFilter')
-rw-r--r-- | src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp | 18 | ||||
-rw-r--r-- | src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h | 6 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp index afc6df0a3..f601e63ec 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp @@ -66,11 +66,7 @@ const AMOVIESETUP_PIN sudpPins[] = { };
const AMOVIESETUP_FILTER sudFilter[] = {
-#ifdef MPEG2ONLY
- {&__uuidof(CMpeg2DecFilter), L"MPC MPEG-2 Video Decoder", 0x00600001, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},
-#else
- {&__uuidof(CMpeg2DecFilter), L"MPC MPEG Video Decoder", 0x00600001, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},
-#endif
+ {&__uuidof(CMpeg2DecFilter), Mpeg2DecFilterName, 0x00600001, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},
};
CFactoryTemplate g_Templates[] = {
@@ -1066,7 +1062,7 @@ HRESULT CMpeg2DecFilter::AlterQuality(Quality q) m_fDropFrames = false;
}
- // TRACE(_T("CMpeg2DecFilter::AlterQuality: Type=%d, Proportion=%d, Late=%I64d, TimeStamp=%I64d\n"), q.Type, q.Proportion, q.Late, q.TimeStamp);
+ //TRACE(_T("CMpeg2DecFilter::AlterQuality: Type=%d, Proportion=%d, Late=%I64d, TimeStamp=%I64d\n"), q.Type, q.Proportion, q.Late, q.TimeStamp);
return S_OK;
}
@@ -1123,7 +1119,7 @@ void CMpeg2DecFilter::CalcBrCont(BYTE* YTbl, float bright, float cont) for (int i = 0; i < 256; i++) {
int y = ((Cont * (i - 16)) >> 9) + Bright + 16;
YTbl[i] = min(max(y, 0), 255);
- // YTbl[i] = min(max(y, 16), 235);
+ //YTbl[i] = min(max(y, 16), 235);
}
}
@@ -1755,7 +1751,7 @@ HRESULT CSubpicInputPin::Transform(IMediaSample* pSample) }
if (fRefresh) {
- // ((CMpeg2DecFilter*)m_pFilter)->Deliver(true);
+ //((CMpeg2DecFilter*)m_pFilter)->Deliver(true);
}
return S_FALSE;
@@ -1895,7 +1891,7 @@ static __inline void DrawPixel(BYTE** yuv, CPoint pt, int pitch, AM_DVD_YUV& c) }
BYTE* p = &yuv[0][pt.y*pitch + pt.x];
- // *p = (*p*(15-contrast) + sppal[color].Y*contrast)>>4;
+ //*p = (*p*(15-contrast) + sppal[color].Y*contrast)>>4;
*p -= (*p - c.Y) * c.Reserved >> 4;
if (pt.y&1) {
@@ -1909,11 +1905,11 @@ static __inline void DrawPixel(BYTE** yuv, CPoint pt, int pitch, AM_DVD_YUV& c) // U/V is exchanged? wierd but looks true when comparing the outputted colors from other decoders
p = &yuv[1][pt.y*pitch + pt.x];
- // *p = (BYTE)(((((int)*p-0x80)*(15-contrast) + ((int)sppal[color].V-0x80)*contrast) >> 4) + 0x80);
+ //*p = (BYTE)(((((int)*p-0x80)*(15-contrast) + ((int)sppal[color].V-0x80)*contrast) >> 4) + 0x80);
*p -= (*p - c.V) * c.Reserved >> 4;
p = &yuv[2][pt.y*pitch + pt.x];
- // *p = (BYTE)(((((int)*p-0x80)*(15-contrast) + ((int)sppal[color].U-0x80)*contrast) >> 4) + 0x80);
+ //*p = (BYTE)(((((int)*p-0x80)*(15-contrast) + ((int)sppal[color].U-0x80)*contrast) >> 4) + 0x80);
*p -= (*p - c.U) * c.Reserved >> 4;
// Neighter of the blending formulas are accurate (">>4" should be "/15").
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h index 3aaa9c16d..f5b4a88a2 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h @@ -30,6 +30,12 @@ #include "IMpeg2DecFilter.h"
#include "Mpeg2DecSettingsWnd.h"
+#ifdef MPEG2ONLY
+#define Mpeg2DecFilterName L"MPC MPEG-2 Video Decoder"
+#else
+#define Mpeg2DecFilterName L"MPC MPEG Video Decoder"
+#endif
+
class CSubpicInputPin;
class CClosedCaptionOutputPin;
class CMpeg2Dec;
|