Permalink
Browse files

Merge remote-tracking branch 'remotes/origin/master' into BUG-4360-Po…

…st_Processing_filter_for_DVD_are_not_handled_correctly
  • Loading branch information...
2 parents 1b46f37 + 02e265a commit 2be0b25ab6bb7c8b8c30ca02615f32a39c90dd6a @Sebastiii Sebastiii committed May 1, 2013
Showing 436 changed files with 29,394 additions and 29,306 deletions.
@@ -378,7 +378,8 @@ public static bool IsPluginCompatible(System.Xml.XmlElement rootNode)
static readonly Dictionary<Version, string> MpReleaseApi = new Dictionary<Version, string>()
{
{ new Version("1.1.6.27644"), "1.2.0 Beta" },
- { new Version("1.2.100.0"), "1.3.0 Alpha" }
+ { new Version("1.2.100.0"), "1.3.0 Alpha" },
+ { new Version("1.3.100.0"), "1.4.0 Pre-Release" }
};
public static string MediaPortalReleaseForApiVersion(Version apiVersion)
@@ -27,9 +27,9 @@
// MediaPortal subsystems' breaking versions
[assembly: SubsystemVersion("MP", "1.1.6.27644")]
-[assembly: SubsystemVersion("MP.SkinEngine", "1.2.100.0")] // MP 1.3.0 Alpha 1
+[assembly: SubsystemVersion("MP.SkinEngine", "1.3.100.0")] // MP 1.4.0 Pre-Release
[assembly: SubsystemVersion("MP.SkinEngine.Core", "1.1.6.27644")]
-[assembly: SubsystemVersion("MP.SkinEngine.Controls", "1.1.6.27644")]
+[assembly: SubsystemVersion("MP.SkinEngine.Controls", "1.3.100.0")]
[assembly: SubsystemVersion("MP.SkinEngine.Dialogs", "1.1.6.27644")]
[assembly: SubsystemVersion("MP.Input", "1.1.6.27644")]
@@ -41,7 +41,7 @@
[assembly: SubsystemVersion("MP.Players.DVD", "1.1.6.27644")]
[assembly: SubsystemVersion("MP.Players.Video", "1.1.6.27644")]
[assembly: SubsystemVersion("MP.Players.TV", "1.1.6.27644")]
-[assembly: SubsystemVersion("MP.Players.Music", "1.1.6.27644")]
+[assembly: SubsystemVersion("MP.Players.Music", "1.3.100.0")]
[assembly: SubsystemVersion("MP.DB", "1.1.6.27644")]
[assembly: SubsystemVersion("MP.DB.Music", "1.1.6.27644")]
@@ -60,7 +60,9 @@
[assembly: SubsystemVersion("MP.Externals", "1.1.6.27644")]
[assembly: SubsystemVersion("MP.Externals.MediaInfo", "1.1.6.27644")]
[assembly: SubsystemVersion("MP.Externals.SQLite", "1.1.6.27644")]
-[assembly: SubsystemVersion("MP.Externals.Gentle", "1.1.6.27644")]
+[assembly: SubsystemVersion("MP.Externals.Gentle", "1.3.100.0")]
+[assembly: SubsystemVersion("MP.Externals.Log4Net", "1.3.100.0")]
+[assembly: SubsystemVersion("MP.Externals.BASS", "1.3.100.0")]
[assembly: SubsystemVersion("MP.Config", "1.1.6.27644")]
[assembly: SubsystemVersion("MP.Config.DefaultSections", "1.1.6.27644")]
@@ -73,6 +73,7 @@ private void WriteDefaultConfig(string logFile)
tw.WriteLine(" <maxSizeRollBackups value=\"4\" />");
tw.WriteLine(" <maximumFileSize value=\"1MB\" />");
tw.WriteLine(" <staticLogFileName value=\"true\" />");
+ tw.WriteLine(" <PreserveLogFileNameExtension value=\"true\" />");
tw.WriteLine(" <layout type=\"log4net.Layout.PatternLayout\">");
tw.WriteLine(" <conversionPattern value=\"[%date] [%-7logger] [%-9thread] [%-5level] - %message%newline\" />");
tw.WriteLine(" </layout>");
@@ -85,6 +86,7 @@ private void WriteDefaultConfig(string logFile)
tw.WriteLine(" <maxSizeRollBackups value=\"4\" />");
tw.WriteLine(" <maximumFileSize value=\"1MB\" />");
tw.WriteLine(" <staticLogFileName value=\"true\" />");
+ tw.WriteLine(" <PreserveLogFileNameExtension value=\"true\" />");
tw.WriteLine(" <layout type=\"log4net.Layout.PatternLayout\">");
tw.WriteLine(" <conversionPattern value=\"[%date] [%-7logger] [%-9thread] [%-5level] - %message%newline\" />");
tw.WriteLine(" </layout>");
@@ -21,7 +21,7 @@
[assembly: AssemblyCopyright( "Morten Mertner" )]
[assembly: AssemblyTrademark( "" )]
[assembly: AssemblyCulture( "" )]
-[assembly: AssemblyVersion( "1.5.0.29112" )]
+[assembly: AssemblyVersion( "1.5.0.29113" )]
[assembly: CLSCompliant( true )]
[assembly: ComVisible( false )]
@@ -51,8 +51,8 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly: AssemblyVersion("1.3.0.0")]
-[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyVersion("1.3.100.0")]
+[assembly: AssemblyFileVersion("1.3.100.0")]
//[assembly: AssemblyInformationalVersion("")]
//[assembly: CompatibleVersion("1.1.8.*", "1.1.8.*")]
@@ -717,6 +717,11 @@ STDMETHODIMP CBDReaderFilter::GetDuration(REFERENCE_TIME* pDuration)
return NOERROR;
}
+STDMETHODIMP CBDReaderFilter::GetAudioChannelCount(long lIndex)
+{
+ return m_demultiplexer.GetAudioChannelCount((int)lIndex);
+}
+
STDMETHODIMP CBDReaderFilter::Load(LPCOLESTR pszFileName, const AM_MEDIA_TYPE *pmt)
{
LogDebug("CBDReaderFilter::Load()");
@@ -94,6 +94,7 @@ IBDReader : public IUnknown
virtual HRESULT STDMETHODCALLTYPE MouseMove(UINT16 x, UINT16 y) = 0;
virtual HRESULT STDMETHODCALLTYPE SetVideoDecoder(int format, GUID* decoder) = 0;
virtual HRESULT STDMETHODCALLTYPE SetVC1Override(GUID* subtype) = 0;
+ virtual HRESULT STDMETHODCALLTYPE GetAudioChannelCount(long lIndex) = 0;
};
enum DS_CMD_ID
@@ -167,6 +168,7 @@ class CBDReaderFilter : public CSource,
STDMETHODIMP MouseMove(UINT16 x, UINT16 y);
STDMETHODIMP SetVideoDecoder(int format, GUID* decoder);
STDMETHODIMP SetVC1Override(GUID* subtype);
+ STDMETHODIMP GetAudioChannelCount(long lIndex);
void STDMETHODCALLTYPE OnGraphRebuild(int info);
void STDMETHODCALLTYPE ForceTitleBasedPlayback(bool force, UINT32 pTitle);
@@ -235,6 +235,14 @@ int CDeMultiplexer::GetAudioStreamType(int stream)
return m_audioStreams[stream].audioType;
}
+int CDeMultiplexer::GetAudioChannelCount(int stream)
+{
+ if (stream < 0 || stream >= (int)m_audioStreams.size())
+ return 0;
+ else
+ return m_audioStreams[stream].audioChannelCount;
+}
+
int CDeMultiplexer::GetCurrentAudioStreamType()
{
if (m_iAudioStream >= m_audioStreams.size())
@@ -1787,7 +1795,8 @@ void CDeMultiplexer::ParseAudioStreams(BLURAY_CLIP_INFO* clip)
audio.audioType = clip->audio_streams[i].coding_type;
audio.pid = clip->audio_streams[i].pid;
-
+ audio.audioChannelCount = clip->audio_streams[i].format;
+
if(m_filter.lib.ForceTitleBasedPlayback())
{
if (strncmp(audio.language, settings.audioLang, 3) == 0 && m_iAudioIdx < 0)
@@ -1797,7 +1806,8 @@ void CDeMultiplexer::ParseAudioStreams(BLURAY_CLIP_INFO* clip)
m_iAudioIdx = i;
}
}
- LogDebug(" Audio #%d:[%4d] %s %s", i, audio.pid, audio.language, StreamFormatAsString(audio.audioType));
+
+ LogDebug(" Audio #%d:[%4d] %s %s %s", i, audio.pid, audio.language, StreamFormatAsString(audio.audioType), StreamAudioFormatAsString(audio.audioChannelCount));
m_audioStreams.push_back(audio);
}
@@ -1942,3 +1952,20 @@ LPCTSTR CDeMultiplexer::StreamFormatAsString(int pStreamType)
}
}
+LPCTSTR CDeMultiplexer::StreamAudioFormatAsString(int pStreamAudioChannel)
+{
+ switch (pStreamAudioChannel)
+ {
+ case BLURAY_AUDIO_FORMAT_MONO:
+ return _T("1.0");
+ case BLURAY_AUDIO_FORMAT_STEREO:
+ return _T("2.0");
+ case BLURAY_AUDIO_FORMAT_MULTI_CHAN:
+ return _T("5.1");
+ case BLURAY_AUDIO_FORMAT_COMBO:
+ return _T("7.1");
+ default:
+ return _T("Unknown");
+ }
+}
+
@@ -82,6 +82,7 @@ class CDeMultiplexer : public BDEventObserver
void GetAudioStreamInfo(int stream, char* szName);
int GetAudioStreamType(int stream);
+ int GetAudioChannelCount(int stream);
int GetCurrentAudioStreamType();
void GetAudioStreamPMT(CMediaType& pmt);
void GetVideoStreamPMT(CMediaType &pmt);
@@ -132,12 +133,14 @@ class CDeMultiplexer : public BDEventObserver
bool AudioStreamsAvailable(BLURAY_CLIP_INFO* pClip);
LPCTSTR StreamFormatAsString(int pStreamType);
+ LPCTSTR StreamAudioFormatAsString(int pStreamAudioChannel);
struct stAudioStream
{
int pid;
int audioType;
char language[7];
+ int audioChannelCount;
};
struct stSubtitleStream
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -147,11 +147,15 @@
<ClInclude Include="source\StatsRenderer.h" />
<ClInclude Include="source\StdAfx.h" />
<ClInclude Include="source\TimeSource.h" />
+ <ClInclude Include="source\version.h" />
</ItemGroup>
<ItemGroup>
<None Include="source\dshowhelper.def" />
</ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="source\dshowhelper.rc" />
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
Oops, something went wrong.

0 comments on commit 2be0b25

Please sign in to comment.