diff options
Diffstat (limited to 'src/mpc-hc/FGFilterLAV.cpp')
| -rw-r--r-- | src/mpc-hc/FGFilterLAV.cpp | 50 |
1 files changed, 35 insertions, 15 deletions
diff --git a/src/mpc-hc/FGFilterLAV.cpp b/src/mpc-hc/FGFilterLAV.cpp index d5cd8cc20..7301e95c2 100644 --- a/src/mpc-hc/FGFilterLAV.cpp +++ b/src/mpc-hc/FGFilterLAV.cpp @@ -34,7 +34,7 @@ #include "../filters/PinInfoWnd.h"
#define LAV_FILTERS_VERSION_MAJOR 0
-#define LAV_FILTERS_VERSION_MINOR 62
+#define LAV_FILTERS_VERSION_MINOR 66
#define LAV_FILTERS_VERSION_REVISION 0
#define LAV_FILTERS_VERSION_COMMIT_NUM 0
#define LAV_FILTERS_VERSION ((QWORD)LAV_FILTERS_VERSION_MAJOR << 48 | (QWORD)LAV_FILTERS_VERSION_MINOR << 32 | (QWORD)LAV_FILTERS_VERSION_REVISION << 16 | LAV_FILTERS_VERSION_COMMIT_NUM)
@@ -231,14 +231,14 @@ HRESULT CFGFilterLAV::PropertyPageCallback(IBaseFilter* pBF) if (settings.GetSettings(pLAVFSettings)) { // Get current settings from LAVSplitter
settings.SaveSettings(); // Save them to the registry/ini
}
- } else if (CComQIPtr<ILAVVideoSettings> pLAVFSettings = pBF) {
+ } else if (CComQIPtr<ILAVVideoSettings> pLAVVideoSettings = pBF) {
CFGFilterLAVVideo::Settings settings;
- if (settings.GetSettings(pLAVFSettings)) { // Get current settings from LAVVideo
+ if (settings.GetSettings(pLAVVideoSettings)) { // Get current settings from LAVVideo
settings.SaveSettings(); // Save them to the registry/ini
}
- } else if (CComQIPtr<ILAVAudioSettings> pLAVFSettings = pBF) {
+ } else if (CComQIPtr<ILAVAudioSettings> pLAVAudioSettings = pBF) {
CFGFilterLAVAudio::Settings settings;
- if (settings.GetSettings(pLAVFSettings)) { // Get current settings from LAVAudio
+ if (settings.GetSettings(pLAVAudioSettings)) { // Get current settings from LAVAudio
settings.SaveSettings(); // Save them to the registry/ini
}
}
@@ -356,7 +356,9 @@ void CFGFilterLAVSplitterBase::Settings::LoadSettings() bImpairedAudio = pApp->GetProfileInt(IDS_R_INTERNAL_LAVSPLITTER, _T("ImpairedAudio"), bImpairedAudio);
- dwQueueMaxSize = pApp->GetProfileInt(IDS_R_INTERNAL_LAVSPLITTER, _T("QueueMaxSize"), dwQueueMaxSize);
+ dwQueueMaxMemSize = pApp->GetProfileInt(IDS_R_INTERNAL_LAVSPLITTER, _T("QueueMaxSize"), dwQueueMaxMemSize);
+
+ dwQueueMaxPackets = pApp->GetProfileInt(IDS_R_INTERNAL_LAVSPLITTER, _T("QueueMaxPackets"), dwQueueMaxPackets);
dwNetworkAnalysisDuration = pApp->GetProfileInt(IDS_R_INTERNAL_LAVSPLITTER, _T("NetworkAnalysisDuration"), dwNetworkAnalysisDuration);
}
@@ -390,7 +392,9 @@ void CFGFilterLAVSplitterBase::Settings::SaveSettings() pApp->WriteProfileInt(IDS_R_INTERNAL_LAVSPLITTER, _T("ImpairedAudio"), bImpairedAudio);
- pApp->WriteProfileInt(IDS_R_INTERNAL_LAVSPLITTER, _T("QueueMaxSize"), dwQueueMaxSize);
+ pApp->WriteProfileInt(IDS_R_INTERNAL_LAVSPLITTER, _T("QueueMaxSize"), dwQueueMaxMemSize);
+
+ pApp->WriteProfileInt(IDS_R_INTERNAL_LAVSPLITTER, _T("QueueMaxPackets"), dwQueueMaxPackets);
pApp->WriteProfileInt(IDS_R_INTERNAL_LAVSPLITTER, _T("NetworkAnalysisDuration"), dwNetworkAnalysisDuration);
}
@@ -441,7 +445,9 @@ bool CFGFilterLAVSplitterBase::Settings::GetSettings(CComQIPtr<ILAVFSettings> pL bPreferHighQualityAudio = pLAVFSettings->GetPreferHighQualityAudioStreams();
- dwQueueMaxSize = pLAVFSettings->GetMaxQueueMemSize();
+ dwQueueMaxMemSize = pLAVFSettings->GetMaxQueueMemSize();
+
+ dwQueueMaxPackets = pLAVFSettings->GetMaxQueueSize();
dwNetworkAnalysisDuration = pLAVFSettings->GetNetworkStreamAnalysisDuration();
@@ -478,7 +484,9 @@ bool CFGFilterLAVSplitterBase::Settings::SetSettings(CComQIPtr<ILAVFSettings> pL pLAVFSettings->SetPreferHighQualityAudioStreams(bPreferHighQualityAudio);
- pLAVFSettings->SetMaxQueueMemSize(dwQueueMaxSize);
+ pLAVFSettings->SetMaxQueueMemSize(dwQueueMaxMemSize);
+
+ pLAVFSettings->SetMaxQueueSize(dwQueueMaxPackets);
pLAVFSettings->SetNetworkStreamAnalysisDuration(dwNetworkAnalysisDuration);
@@ -556,12 +564,12 @@ void CFGFilterLAVVideo::ShowPropertyPages(CWnd* pParendWnd) LPCTSTR CFGFilterLAVVideo::GetUserFriendlyDecoderName(const CString& decoderName)
{
static std::pair<LPCTSTR, LPCTSTR> userFriendlyDecoderNames[] = {
- make_pair(_T("avcodec"), _T("FFmpeg")),
- make_pair(_T("dxva2n"), _T("DXVA2 Native")),
- make_pair(_T("dxva2cb"), _T("DXVA2 Copy-back")),
- make_pair(_T("dxva2cb direct"), _T("DXVA2 Copy-back (Direct)")),
- make_pair(_T("cuvid"), _T("NVIDIA CUVID")),
- make_pair(_T("quicksync"), _T("Intel QuickSync"))
+ std::make_pair(_T("avcodec"), _T("FFmpeg")),
+ std::make_pair(_T("dxva2n"), _T("DXVA2 Native")),
+ std::make_pair(_T("dxva2cb"), _T("DXVA2 Copy-back")),
+ std::make_pair(_T("dxva2cb direct"), _T("DXVA2 Copy-back (Direct)")),
+ std::make_pair(_T("cuvid"), _T("NVIDIA CUVID")),
+ std::make_pair(_T("quicksync"), _T("Intel QuickSync"))
};
for (int i = 0; i < _countof(userFriendlyDecoderNames); i++) {
@@ -801,6 +809,10 @@ bool CFGFilterLAVVideo::Settings::SetSettings(CComQIPtr<ILAVVideoSettings> pLAVF pLAVFSettingsMPCHCCustom->SetPropertyPageCallback(PropertyPageCallback);
}
+ if (AfxGetAppSettings().iLAVGPUDevice != DWORD_MAX) {
+ pLAVFSettings->SetGPUDeviceIndex(AfxGetAppSettings().iLAVGPUDevice);
+ }
+
return true;
}
@@ -879,6 +891,8 @@ void CFGFilterLAVAudio::Settings::LoadSettings() bOutputStandardLayout = pApp->GetProfileInt(IDS_R_INTERNAL_LAVAUDIO, _T("OutputStandardLayout"), bOutputStandardLayout);
+ bOutput51Legacy = pApp->GetProfileInt(IDS_R_INTERNAL_LAVAUDIO, _T("Output51Legacy"), bOutput51Legacy);
+
bMixingEnabled = pApp->GetProfileInt(IDS_R_INTERNAL_LAVAUDIO, _T("Mixing"), bMixingEnabled);
dwMixingLayout = pApp->GetProfileInt(IDS_R_INTERNAL_LAVAUDIO, _T("MixingLayout"), dwMixingLayout);
@@ -931,6 +945,8 @@ void CFGFilterLAVAudio::Settings::SaveSettings() pApp->WriteProfileInt(IDS_R_INTERNAL_LAVAUDIO, _T("OutputStandardLayout"), bOutputStandardLayout);
+ pApp->WriteProfileInt(IDS_R_INTERNAL_LAVAUDIO, _T("Output51Legacy"), bOutput51Legacy);
+
pApp->WriteProfileInt(IDS_R_INTERNAL_LAVAUDIO, _T("Mixing"), bMixingEnabled);
pApp->WriteProfileInt(IDS_R_INTERNAL_LAVAUDIO, _T("MixingLayout"), dwMixingLayout);
@@ -982,6 +998,8 @@ bool CFGFilterLAVAudio::Settings::GetSettings(CComQIPtr<ILAVAudioSettings> pLAVF bOutputStandardLayout = pLAVFSettings->GetOutputStandardLayout();
+ bOutput51Legacy = pLAVFSettings->GetOutput51LegacyLayout();
+
bMixingEnabled = pLAVFSettings->GetMixingEnabled();
dwMixingLayout = pLAVFSettings->GetMixingLayout();
@@ -1027,6 +1045,8 @@ bool CFGFilterLAVAudio::Settings::SetSettings(CComQIPtr<ILAVAudioSettings> pLAVF pLAVFSettings->SetOutputStandardLayout(bOutputStandardLayout);
+ pLAVFSettings->SetOutput51LegacyLayout(bOutput51Legacy);
+
pLAVFSettings->SetMixingEnabled(bMixingEnabled);
pLAVFSettings->SetMixingLayout(dwMixingLayout);
|