diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-05-18 00:14:34 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2013-05-18 00:14:34 +0400 |
| commit | 95fec94b49d2e00437a3541584ac3fc943fde530 (patch) | |
| tree | 79ed39dafb96e8a4baba7da02d24e336cb0fc5ef /decoder | |
| parent | 1f6e3af2c83a766d7d658007fdf5edc6168108b1 (diff) | |
quicksync: activate GPU deinterlacing
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/LAVVideo/LAVVideo.rc | 2 | ||||
| -rw-r--r-- | decoder/LAVVideo/VideoSettingsProp.cpp | 2 | ||||
| -rw-r--r-- | decoder/LAVVideo/decoders/quicksync.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/decoder/LAVVideo/LAVVideo.rc b/decoder/LAVVideo/LAVVideo.rc index 88574eb8..3ef2ee0d 100644 --- a/decoder/LAVVideo/LAVVideo.rc +++ b/decoder/LAVVideo/LAVVideo.rc @@ -124,7 +124,7 @@ BEGIN CONTROL "SD",IDC_HWRES_SD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,343,70,40,10 CONTROL "HD",IDC_HWRES_HD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,343,84,40,10 CONTROL "UHD (4K)",IDC_HWRES_UHD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,343,98,40,10 - GROUPBOX "Hardware/GPU Deinterlacing (CUVID only)",IDC_GROUP_HWDEINT,238,116,156,63 + GROUPBOX "Hardware/GPU Deinterlacing (CUVID/QS only)",IDC_GROUP_HWDEINT,238,116,156,63 CONTROL "Enable Adaptive HW Deinterlacing",IDC_HWDEINT_ENABLE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,244,128,139,10 LTEXT "Output Mode",IDC_LBL_HWDEINT_MODE,243,140,62,8 diff --git a/decoder/LAVVideo/VideoSettingsProp.cpp b/decoder/LAVVideo/VideoSettingsProp.cpp index e3c91dab..af2b2f9b 100644 --- a/decoder/LAVVideo/VideoSettingsProp.cpp +++ b/decoder/LAVVideo/VideoSettingsProp.cpp @@ -314,7 +314,7 @@ HRESULT CLAVVideoSettingsProp::UpdateHWOptions() DWORD dwSupport = m_pVideoSettings->CheckHWAccelSupport(hwAccel); BOOL bEnabled = (hwAccel != HWAccel_None) && dwSupport; - BOOL bHWDeint = bEnabled && (hwAccel == HWAccel_CUDA); // || hwAccel == HWAccel_QuickSync); + BOOL bHWDeint = bEnabled && (hwAccel == HWAccel_CUDA || hwAccel == HWAccel_QuickSync); BOOL bHWDeintEnabled = bHWDeint && (BOOL)SendDlgItemMessage(m_Dlg, IDC_HWDEINT_ENABLE, BM_GETCHECK, 0, 0); BOOL bCUDAOnly = bEnabled && (hwAccel == HWAccel_CUDA); BOOL bDVD = bEnabled && (BOOL)SendDlgItemMessage(m_Dlg, IDC_HWACCEL_MPEG2, BM_GETCHECK, 0, 0); diff --git a/decoder/LAVVideo/decoders/quicksync.cpp b/decoder/LAVVideo/decoders/quicksync.cpp index 4fd05898..b7054b3d 100644 --- a/decoder/LAVVideo/decoders/quicksync.cpp +++ b/decoder/LAVVideo/decoders/quicksync.cpp @@ -465,7 +465,7 @@ STDMETHODIMP CDecQuickSync::InitDecoder(AVCodecID codec, const CMediaType *pmt) // Configure video processing qsConfig.vpp = 0; - m_bDI = FALSE; //m_pSettings->GetHWAccelDeintMode() == HWDeintMode_Hardware && !m_pSettings->GetDeintTreatAsProgressive(); + m_bDI = m_pSettings->GetHWAccelDeintMode() == HWDeintMode_Hardware && !m_pSettings->GetDeintTreatAsProgressive(); qsConfig.bEnableVideoProcessing = m_bDI; qsConfig.bVppEnableDeinterlacing = m_bDI; qsConfig.bVppEnableFullRateDI = m_pSettings->GetHWAccelDeintOutput() == DeintOutput_FramePerField; |