MPCVideoDec: fixed saving option "Set DXVA for SD (H.264)", cosmetics.

3 files changed, 41 insertions, 38 deletions

diff --git a/src/filters/transform/MPCVideoDec/FfmpegContext.cpp b/src/filters/transform/MPCVideoDec/FfmpegContext.cpp
index 88bab37a4..43210eac3 100644
--- a/src/filters/transform/MPCVideoDec/FfmpegContext.cpp
+++ b/src/filters/transform/MPCVideoDec/FfmpegContext.cpp
@@ -80,44 +80,44 @@ const byte ZZ_SCAN8[64] = {
 static const WORD PCID_NVIDIA_VP5[] = {

     // http://us.download.nvidia.com/XFree86/Linux-x86_64/304.51/README/supportedchips.html

     // Nvidia VDPAU Feature Set D

-    0x0FC6, // GeForce GTX 650
-    0x0FCE, // GeForce GT 640M LE
-    0x0FD1, // GeForce GT 650M
-    0x0FD2, // GeForce GT 640M
-    0x0FD3, // GeForce GT 640M LE
-    0x0FD4, // GeForce GTX 660M
-    0x0FD5, // GeForce GT 650M
-    0x0FD8, // GeForce GT 640M
-    0x0FD9, // GeForce GT 645M
-    0x0FE0, // GeForce GTX 660M
-    0x0FFB, // Quadro K2000M
-    0x0FFC, // Quadro K1000M
-    0x0FFD, // NVS 510
-    0x0FFF, // Quadro 410
-    0x1042, // GeForce 510
-    0x1048, // GeForce 605
-    0x104A, // GeForce GT 610
-    0x1051, // GeForce GT 520MX
-    0x1054, // GeForce 410M
-    0x1055, // GeForce 410M
-    0x1056, // NVS 4200M
-    0x1057, // NVS 4200M
-    0x107D, // NVS 310
-    0x1180, // GeForce GTX 680
-    0x1183, // GeForce GTX 660 Ti
-    0x1185, // GeForce GTX 660
-    0x1188, // GeForce GTX 690
-    0x1189, // GeForce GTX 670
-    0x118F, // Tesla K10
-    0x11A0, // GeForce GTX 680M
-    0x11A1, // GeForce GTX 670MX
-    0x11A7, // GeForce GTX 675MX
-    0x11BA, // Quadro K5000
-    0x11BC, // Quadro K5000M
-    0x11BD, // Quadro K4000M
-    0x11BE, // Quadro K3000M
-    0x11C0, // GeForce GTX 660
-    0x11C6, // GeForce GTX 650 Ti
+    0x0FC6, // GeForce GTX 650

+    0x0FCE, // GeForce GT 640M LE

+    0x0FD1, // GeForce GT 650M

+    0x0FD2, // GeForce GT 640M

+    0x0FD3, // GeForce GT 640M LE

+    0x0FD4, // GeForce GTX 660M

+    0x0FD5, // GeForce GT 650M

+    0x0FD8, // GeForce GT 640M

+    0x0FD9, // GeForce GT 645M

+    0x0FE0, // GeForce GTX 660M

+    0x0FFB, // Quadro K2000M

+    0x0FFC, // Quadro K1000M

+    0x0FFD, // NVS 510

+    0x0FFF, // Quadro 410

+    0x1042, // GeForce 510

+    0x1048, // GeForce 605

+    0x104A, // GeForce GT 610

+    0x1051, // GeForce GT 520MX

+    0x1054, // GeForce 410M

+    0x1055, // GeForce 410M

+    0x1056, // NVS 4200M

+    0x1057, // NVS 4200M

+    0x107D, // NVS 310

+    0x1180, // GeForce GTX 680

+    0x1183, // GeForce GTX 660 Ti

+    0x1185, // GeForce GTX 660

+    0x1188, // GeForce GTX 690

+    0x1189, // GeForce GTX 670

+    0x118F, // Tesla K10

+    0x11A0, // GeForce GTX 680M

+    0x11A1, // GeForce GTX 670MX

+    0x11A7, // GeForce GTX 675MX

+    0x11BA, // Quadro K5000

+    0x11BC, // Quadro K5000M

+    0x11BD, // Quadro K4000M

+    0x11BE, // Quadro K3000M

+    0x11C0, // GeForce GTX 660

+    0x11C6, // GeForce GTX 650 Ti

 };

 

 bool CheckPCID(WORD pcid, const WORD* pPCIDs, size_t len)

diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
index c9c9812ea..78973a5f7 100644
--- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
+++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp
@@ -2512,6 +2512,7 @@ STDMETHODIMP CMPCVideoDecFilter::Apply()
     AfxGetApp()->WriteProfileInt(_T("Filters\\MPC Video Decoder"), _T("DiscardMode"), m_nDiscardMode);

     AfxGetApp()->WriteProfileInt(_T("Filters\\MPC Video Decoder"), _T("ARMode"), m_nARMode);

     AfxGetApp()->WriteProfileInt(_T("Filters\\MPC Video Decoder"), _T("DXVACheckCompatibility"), m_nDXVACheckCompatibility);

+    AfxGetApp()->WriteProfileInt(_T("Filters\\MPC Video Decoder"), _T("DisableDXVA_SD"), m_nDXVA_SD);

     AfxGetApp()->WriteProfileInt(_T("Filters\\MPC Video Decoder"), _T("InterlacedFlag"), m_interlacedFlag);

 #endif

 

diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp
index bbaeb9fca..e2cb4b7dc 100644
--- a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp
+++ b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp
@@ -129,6 +129,7 @@ bool CMPCVideoDecSettingsWnd::OnActivate()
 #endif /* INTERNAL_DECODER_H264 */

     p.y += h25;

 

+    // Read AR from stream

     m_cbARMode.Create(ResStr(IDS_VDF_AR_MODE), dwStyle | BS_AUTOCHECKBOX | BS_LEFTTEXT, CRect(p, CSize(IPP_SCALE(340), m_fontheight)), this, IDC_PP_AR);

     m_cbARMode.SetCheck(FALSE);

     p.y += h25;

@@ -155,6 +156,7 @@ bool CMPCVideoDecSettingsWnd::OnActivate()
     m_cbDXVACompatibilityCheck.AddString(ResStr(IDS_VDF_DXVA_SKIP_ALLCHECK));

     p.y += h25;

 

+    // Set DXVA for SD (H.264)

     m_cbDXVA_SD.Create(ResStr(IDS_VDF_DXVA_SD), dwStyle | BS_AUTOCHECKBOX | BS_LEFTTEXT, CRect(p, CSize(IPP_SCALE(340), m_fontheight)), this, IDC_PP_DXVA_SD);

     m_cbDXVA_SD.SetCheck(FALSE);

     p.y += h20;