diff options
| author | Underground78 <underground78@users.sourceforge.net> | 2013-01-25 02:58:22 +0400 |
|---|---|---|
| committer | Underground78 <underground78@users.sourceforge.net> | 2013-01-25 02:59:15 +0400 |
| commit | 4709ce868f7d4c21296f4f13cba851744985cb0e (patch) | |
| tree | 71b52d528298f17de0faf9f1b854a7c4b5cc5575 /src/filters/transform/MPCVideoDec | |
| parent | c87609f354011fd6ce46f16a2f865d8b814d47df (diff) | |
Fix compilation after fe65610d8367d1ff614d941d02f5e0710239e47f.
Last minute changes are bad... Also rename Sample Aspect Ratio to Pixel Aspect Ratio to avoid possible confusions.
Diffstat (limited to 'src/filters/transform/MPCVideoDec')
| -rw-r--r-- | src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp | 24 | ||||
| -rw-r--r-- | src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp index 940aa8e15..cbc623f55 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp @@ -595,7 +595,7 @@ CMPCVideoDecFilter::CMPCVideoDecFilter(LPUNKNOWN lpunk, HRESULT* phr) m_nARMode = 1;
m_nDXVACheckCompatibility = 1; // skip level check by default
m_nDXVA_SD = 0;
- m_sar.SetSize(1, 1);
+ m_par.SetSize(1, 1);
m_interlacedFlag = MPCVC_INTERLACED_AUTO;
@@ -1244,14 +1244,14 @@ HRESULT CMPCVideoDecFilter::SetMediaType(PIN_DIRECTION direction, const CMediaTy HRESULT hr = __super::SetMediaType(direction, pmt);
- if (dir == PINDIR_INPUT) {
- // Compute the expected Sample AR
- m_sar.cx = m_arx * m_h;
- m_sar.cy = m_ary * m_w;
- int lnko = LNKO(m_sar.cx, m_sar.cy);
+ if (direction == PINDIR_INPUT) {
+ // Compute the expected Pixel AR
+ m_par.cx = m_arx * m_h;
+ m_par.cy = m_ary * m_w;
+ int lnko = LNKO(m_par.cx, m_par.cy);
if (lnko > 1) {
- m_sar.cx /= lnko;
- m_sar.cy /= lnko;
+ m_par.cx /= lnko;
+ m_par.cy /= lnko;
}
}
@@ -2073,10 +2073,10 @@ HRESULT CMPCVideoDecFilter::Transform(IMediaSample* pIn) void CMPCVideoDecFilter::UpdateAspectRatio()
{
if (((m_nARMode) && (m_pAVCtx)) && ((m_pAVCtx->sample_aspect_ratio.num > 0) && (m_pAVCtx->sample_aspect_ratio.den > 0))) {
- CSize SAR(m_pAVCtx->sample_aspect_ratio.num, m_pAVCtx->sample_aspect_ratio.den);
- if (m_sar != SAR) {
- m_sar = SAR;
- CSize aspect(m_nWidth * SAR.cx, m_nHeight * SAR.cy);
+ CSize PAR(m_pAVCtx->sample_aspect_ratio.num, m_pAVCtx->sample_aspect_ratio.den);
+ if (m_par != PAR) {
+ m_par = PAR;
+ CSize aspect(m_nWidth * PAR.cx, m_nHeight * PAR.cy);
int lnko = LNKO(aspect.cx, aspect.cy);
if (lnko > 1) {
aspect.cx /= lnko, aspect.cy /= lnko;
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h index fe6a823f3..f8d6c82fd 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h @@ -147,7 +147,7 @@ protected: bool m_bUseDXVA;
bool m_bUseFFmpeg;
- CSize m_sar;
+ CSize m_par;
SwsContext* m_pSwsContext;
unsigned __int64 m_nOutCsp;
CSize m_pOutSize; // Picture size on output pin
|