Skip to content

Commit a441c3c

Browse files
v0ltv0lt
committed
Добавлена возможность управления настройкой "VPDinterlacing".
1 parent e213775 commit a441c3c

File tree

2 files changed

+36
-20
lines changed

2 files changed

+36
-20
lines changed

‎Source/MpcVideoRenderer.rc‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ END
5151
// Dialog
5252
//
5353

54-
IDD_MAINPROPPAGE DIALOGEX 0, 0, 352, 251
54+
IDD_MAINPROPPAGE DIALOGEX 0, 0, 352, 264
5555
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
5656
FONT 8, "MS Shell Dlg", 400, 0, 0x0
5757
BEGIN
@@ -60,30 +60,32 @@ BEGIN
6060
COMBOBOX IDC_COMBO1,73,18,86,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
6161
CONTROL "Show statistics",IDC_CHECK2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,178,4,65,10
6262
COMBOBOX IDC_COMBO6,178,18,97,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
63-
GROUPBOX "DXVA2 and D3D11 video processor",IDC_STATIC1,5,35,162,89
63+
GROUPBOX "DXVA2 and D3D11 video processor",IDC_STATIC1,5,35,162,101
6464
LTEXT "Use for:",IDC_STATIC2,10,47,27,8
6565
CONTROL "NV12",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,47,33,10
6666
CONTROL "P010/P016",IDC_CHECK8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,78,47,51,10
6767
CONTROL "YUY2",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,133,47,33,10
6868
CONTROL "Other supported formats",IDC_CHECK4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,41,60,97,10
69+
LTEXT "Dinterlacing:",IDC_STATIC,10,74,53,8
70+
COMBOBOX IDC_COMBO9,73,73,86,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
6971
CONTROL "Double the frame rate when deinterlacing",IDC_CHECK3,
70-
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,74,152,10
71-
CONTROL "Use for resizing",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,87,67,10
72-
LTEXT "Request Super Resolution:",IDC_STATIC7,10,100,90,8
73-
COMBOBOX IDC_COMBO8,102,99,62,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
74-
CONTROL "RTX Video HDR",IDC_CHECK19,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,111,66,10
75-
GROUPBOX "Shader video processor",IDC_STATIC,5,127,162,107
76-
LTEXT "Chroma upsampling:",IDC_STATIC,10,141,72,8
77-
COMBOBOX IDC_COMBO5,83,139,76,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
78-
LTEXT "Upscaling:",IDC_STATIC,10,157,35,8
79-
COMBOBOX IDC_COMBO2,83,155,76,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
80-
LTEXT "Downscaling:",IDC_STATIC,10,173,44,8
81-
COMBOBOX IDC_COMBO3,83,171,76,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
72+
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,86,152,10
73+
CONTROL "Use for resizing",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,99,67,10
74+
LTEXT "Request Super Resolution:",IDC_STATIC7,10,112,90,8
75+
COMBOBOX IDC_COMBO8,102,111,62,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
76+
CONTROL "RTX Video HDR",IDC_CHECK19,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,123,66,10
77+
GROUPBOX "Shader video processor",IDC_STATIC,5,139,162,107
78+
LTEXT "Chroma upsampling:",IDC_STATIC,10,153,72,8
79+
COMBOBOX IDC_COMBO5,83,151,76,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
80+
LTEXT "Upscaling:",IDC_STATIC,10,169,35,8
81+
COMBOBOX IDC_COMBO2,83,167,76,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
82+
LTEXT "Downscaling:",IDC_STATIC,10,185,44,8
83+
COMBOBOX IDC_COMBO3,83,183,76,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
8284
CONTROL "Use the ""Upscaling"" method to reducing the frame to 50%",IDC_CHECK6,
83-
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,10,187,146,15
84-
CONTROL "Use dithering",IDC_CHECK10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,206,59,10
85+
"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,10,199,146,15
86+
CONTROL "Use dithering",IDC_CHECK10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,218,59,10
8587
CONTROL "Use Blend deinterlacing for YUV 4:2:0",IDC_CHECK17,
86-
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,219,139,10
88+
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,231,139,10
8789
GROUPBOX "HDR",IDC_STATIC,171,35,176,112
8890
CONTROL "Prefer Dolby Vision over PQ and HLG",IDC_CHECK18,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,178,47,135,10
8991
CONTROL "Passthrough to display",IDC_CHECK12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,178,60,89,10
@@ -104,7 +106,7 @@ BEGIN
104106
CONTROL "Reinitialize device when changing display",IDC_CHECK16,
105107
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,178,204,151,10
106108
PUSHBUTTON "Default",IDC_BUTTON1,305,217,37,14
107-
EDITTEXT IDC_EDIT2,76,235,266,12,ES_READONLY | NOT WS_BORDER,WS_EX_RIGHT
109+
EDITTEXT IDC_EDIT2,76,248,266,12,ES_READONLY | NOT WS_BORDER,WS_EX_RIGHT
108110
END
109111

110112
IDD_INFOPROPPAGE DIALOGEX 0, 0, 318, 153
@@ -145,11 +147,12 @@ BEGIN
145147
LEFTMARGIN, 5
146148
RIGHTMARGIN, 347
147149
VERTGUIDE, 10
150+
VERTGUIDE, 73
148151
VERTGUIDE, 171
149152
VERTGUIDE, 178
150153
VERTGUIDE, 342
151154
TOPMARGIN, 4
152-
BOTTOMMARGIN, 247
155+
BOTTOMMARGIN, 260
153156
END
154157

155158
IDD_INFOPROPPAGE, DIALOG

‎Source/PropPage.cpp‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* (C) 2018-2024 see Authors.txt
2+
* (C) 2018-2025 see Authors.txt
33
*
44
* This file is part of MPC-BE.
55
*
@@ -92,6 +92,7 @@ void CVRMainPPage::SetControls()
9292
CheckDlgButton(IDC_CHECK8, m_SetsPP.VPFmts.bP01x ? BST_CHECKED : BST_UNCHECKED);
9393
CheckDlgButton(IDC_CHECK9, m_SetsPP.VPFmts.bYUY2 ? BST_CHECKED : BST_UNCHECKED);
9494
CheckDlgButton(IDC_CHECK4, m_SetsPP.VPFmts.bOther ? BST_CHECKED : BST_UNCHECKED);
95+
SendDlgItemMessageW(IDC_COMBO9, CB_SETCURSEL, m_SetsPP.iVPDinterlacing, 0);
9596
CheckDlgButton(IDC_CHECK3, m_SetsPP.bDeintDouble ? BST_CHECKED : BST_UNCHECKED);
9697
CheckDlgButton(IDC_CHECK5, m_SetsPP.bVPScaling ? BST_CHECKED : BST_UNCHECKED);
9798
SendDlgItemMessageW(IDC_COMBO8, CB_SETCURSEL, m_SetsPP.iVPSuperRes, 0);
@@ -219,6 +220,10 @@ HRESULT CVRMainPPage::OnActivate()
219220
ComboBox_AddStringData(m_hWnd, IDC_COMBO1, L"10-bit Integer", 10);
220221
ComboBox_AddStringData(m_hWnd, IDC_COMBO1, L"16-bit Floating Point", 16);
221222

223+
SendDlgItemMessageW(IDC_COMBO9, CB_ADDSTRING, 0, (LPARAM)L"Disable");
224+
SendDlgItemMessageW(IDC_COMBO9, CB_ADDSTRING, 0, (LPARAM)L"Enable");
225+
SendDlgItemMessageW(IDC_COMBO9, CB_ADDSTRING, 0, (LPARAM)L"HACK future frames");
226+
222227
SendDlgItemMessageW(IDC_COMBO8, CB_ADDSTRING, 0, (LPARAM)L"Disable");
223228
SendDlgItemMessageW(IDC_COMBO8, CB_ADDSTRING, 0, (LPARAM)L"for SD");
224229
SendDlgItemMessageW(IDC_COMBO8, CB_ADDSTRING, 0, (LPARAM)L"for \x2264 720p");
@@ -407,6 +412,14 @@ INT_PTR CVRMainPPage::OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM wParam, LPAR
407412
}
408413
return (LRESULT)1;
409414
}
415+
if (nID == IDC_COMBO9) {
416+
lValue = SendDlgItemMessageW(IDC_COMBO9, CB_GETCURSEL, 0, 0);
417+
if (lValue != m_SetsPP.iVPDinterlacing) {
418+
m_SetsPP.iVPDinterlacing = lValue;
419+
SetDirty();
420+
}
421+
return (LRESULT)1;
422+
}
410423
if (nID == IDC_COMBO8) {
411424
lValue = SendDlgItemMessageW(IDC_COMBO8, CB_GETCURSEL, 0, 0);
412425
if (lValue != m_SetsPP.iVPSuperRes) {

0 commit comments

Comments
 (0)