Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/mpc-hc.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnderground78 <underground78@users.sourceforge.net>2015-08-22 20:00:02 +0300
committerUnderground78 <underground78@users.sourceforge.net>2015-09-24 22:57:35 +0300
commitfd03847055171aa4d6d58f515c5a143fe77fd3a9 (patch)
tree6f41dacff0c5b558d68f33313febe858806223a9
parent8a4ea8d96c78b3266699328b0d2a157808a8507c (diff)
Updated LAV Filters to 0.66-4-0745609 (custom build based on stable version 0.66.0).
Important changes: - LAV Video Decoder: Enable decoding of 10-bit HEVC using DXVA native. - LAV Audio Decoder: Improve handling of 5.1 audio for some renderers. - LAV Audio Decoder: Add an option to revert to the old 5.1 layout. - LAV Splitter: Add an option to specify the maximum number of packets in the queue. - Updated ffmpeg library. Due to the new options, the version check has been bumped to check for version 0.66.0.
-rw-r--r--docs/Changelog.txt2
-rw-r--r--src/mpc-hc/FGFilterLAV.cpp26
-rw-r--r--src/mpc-hc/FGFilterLAV.h6
m---------src/thirdparty/LAVFilters/src0
4 files changed, 26 insertions, 8 deletions
diff --git a/docs/Changelog.txt b/docs/Changelog.txt
index 935f23af7..340f4fa97 100644
--- a/docs/Changelog.txt
+++ b/docs/Changelog.txt
@@ -28,7 +28,7 @@ next version - not released yet
* Ticket #5472, Make it easier to input value to the "Audio time shift" field in options
* Updated MediaInfoLib to v0.7.75
* Updated Little CMS to v2.7 (git 07da965)
-* Updated LAV Filters to v0.65.0.38:
+* Updated LAV Filters to stable version 0.66.0:
- LAV Splitter: New ASF/WMV demuxer
- Ticket #5548, LAV Splitter: Fix some rare deadlocks at startup
- LAV Video Decoder: Allow hardware decoding of UHD video with AMD cards
diff --git a/src/mpc-hc/FGFilterLAV.cpp b/src/mpc-hc/FGFilterLAV.cpp
index c24937c30..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)
@@ -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);
@@ -883,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);
@@ -935,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);
@@ -986,6 +998,8 @@ bool CFGFilterLAVAudio::Settings::GetSettings(CComQIPtr<ILAVAudioSettings> pLAVF
bOutputStandardLayout = pLAVFSettings->GetOutputStandardLayout();
+ bOutput51Legacy = pLAVFSettings->GetOutput51LegacyLayout();
+
bMixingEnabled = pLAVFSettings->GetMixingEnabled();
dwMixingLayout = pLAVFSettings->GetMixingLayout();
@@ -1031,6 +1045,8 @@ bool CFGFilterLAVAudio::Settings::SetSettings(CComQIPtr<ILAVAudioSettings> pLAVF
pLAVFSettings->SetOutputStandardLayout(bOutputStandardLayout);
+ pLAVFSettings->SetOutput51LegacyLayout(bOutput51Legacy);
+
pLAVFSettings->SetMixingEnabled(bMixingEnabled);
pLAVFSettings->SetMixingLayout(dwMixingLayout);
diff --git a/src/mpc-hc/FGFilterLAV.h b/src/mpc-hc/FGFilterLAV.h
index dd5a708de..c6b312950 100644
--- a/src/mpc-hc/FGFilterLAV.h
+++ b/src/mpc-hc/FGFilterLAV.h
@@ -1,5 +1,5 @@
/*
- * (C) 2013-2014 see Authors.txt
+ * (C) 2013-2015 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -115,7 +115,8 @@ public:
BOOL bStreamSwitchRemoveAudio;
BOOL bImpairedAudio;
BOOL bPreferHighQualityAudio;
- DWORD dwQueueMaxSize;
+ DWORD dwQueueMaxPackets;
+ DWORD dwQueueMaxMemSize;
DWORD dwNetworkAnalysisDuration;
void LoadSettings();
@@ -204,6 +205,7 @@ public:
BOOL bExpandMono;
BOOL bExpand61;
BOOL bOutputStandardLayout;
+ BOOL bOutput51Legacy;
BOOL bAllowRawSPDIF;
BOOL bSampleFormats[SampleFormat_NB];
BOOL bSampleConvertDither;
diff --git a/src/thirdparty/LAVFilters/src b/src/thirdparty/LAVFilters/src
-Subproject 0e577b791e1ceebce8532898e88da25f495cf2d
+Subproject 0745609aaa98fcbbe744b53296b9afe2d159d4d