eac3to display issues

This commit is contained in:
Grigory Chudov
2018-02-17 22:52:22 -05:00
parent e35aa22a65
commit 774e732f04
4 changed files with 21 additions and 6 deletions

View File

@@ -445,7 +445,7 @@ namespace CUETools.Codecs.BDLPCM
{ {
switch (rate) switch (rate)
{ {
case 1: return 23; case 1: return 24;
case 2: return 24; case 2: return 24;
case 3: return 25; case 3: return 25;
case 4: return 30; case 4: return 30;
@@ -492,8 +492,10 @@ namespace CUETools.Codecs.BDLPCM
case 3: return "reserved3"; case 3: return "reserved3";
case 4: return "96KHz"; case 4: return "96KHz";
case 5: return "192KHz"; case 5: return "192KHz";
case 12: return "48/192KHz"; //case 12: return "48/192KHz"; (core/hd)
case 14: return "48/96KHz"; case 12: return "192KHz";
//case 14: return "48/96KHz"; (core/hd)
case 14: return "96KHz";
default: return rate.ToString(); default: return rate.ToString();
} }
} }
@@ -516,7 +518,8 @@ namespace CUETools.Codecs.BDLPCM
case 0x83: return "TrueHD"; case 0x83: return "TrueHD";
case 0x84: return "AC-3 Plus"; case 0x84: return "AC-3 Plus";
case 0x85: return "DTS-HD"; case 0x85: return "DTS-HD";
case 0x86: return "DTS-HD Master"; //case 0x86: return "DTS-HD Master";
case 0x86: return "DTS Master Audio";
case 0xea: return "VC-1"; case 0xea: return "VC-1";
case 0x1b: return "h264/AVC"; case 0x1b: return "h264/AVC";
case 0x90: return "Presentation Graphics"; case 0x90: return "Presentation Graphics";

View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="plugins"/>
</assemblyBinding>
</runtime>
</configuration>

View File

@@ -68,6 +68,7 @@
<ProjectReference Include="..\CUETools.Codecs.BDLPCM\CUETools.Codecs.BDLPCM.csproj"> <ProjectReference Include="..\CUETools.Codecs.BDLPCM\CUETools.Codecs.BDLPCM.csproj">
<Project>{E75F7CCD-4266-42E1-A039-DC7EB5EDD8F6}</Project> <Project>{E75F7CCD-4266-42E1-A039-DC7EB5EDD8F6}</Project>
<Name>CUETools.Codecs.BDLPCM</Name> <Name>CUETools.Codecs.BDLPCM</Name>
<Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj"> <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
<Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project> <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
@@ -103,6 +104,9 @@
<Install>true</Install> <Install>true</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

View File

@@ -128,6 +128,7 @@ namespace CUETools.eac3to
Console.ForegroundColor = ConsoleColor.White; Console.ForegroundColor = ConsoleColor.White;
int maxVideo = 0, maxAudio = 0, frameRate = 0; int maxVideo = 0, maxAudio = 0, frameRate = 0;
bool interlaced = false; bool interlaced = false;
var chapters = audioSource.MPLSHeader.Chapters;
audioSource.MPLSHeader.play_item.ForEach(i => maxVideo = Math.Max(maxVideo, i.video.Count)); audioSource.MPLSHeader.play_item.ForEach(i => maxVideo = Math.Max(maxVideo, i.video.Count));
audioSource.MPLSHeader.play_item.ForEach(i => maxAudio = Math.Max(maxAudio, i.audio.Count)); audioSource.MPLSHeader.play_item.ForEach(i => maxAudio = Math.Max(maxAudio, i.audio.Count));
audioSource.MPLSHeader.play_item.ForEach(i => i.video.ForEach(v => frameRate = v.FrameRate)); audioSource.MPLSHeader.play_item.ForEach(i => i.video.ForEach(v => frameRate = v.FrameRate));
@@ -145,7 +146,7 @@ namespace CUETools.eac3to
Console.Error.Write(id++); Console.Error.Write(id++);
Console.Error.Write(": "); Console.Error.Write(": ");
Console.ForegroundColor = ConsoleColor.Gray; Console.ForegroundColor = ConsoleColor.Gray;
Console.Error.WriteLine("Chapters, {0} chapters", audioSource.MPLSHeader.mark_count - 1); Console.Error.WriteLine("Chapters, {0} chapters", chapters.Count - 1);
} }
if (audioSource.MPLSHeader.play_item.Count > 0) if (audioSource.MPLSHeader.play_item.Count > 0)
{ {
@@ -175,7 +176,6 @@ namespace CUETools.eac3to
{ {
int id = 1; int id = 1;
ushort pid = 0; ushort pid = 0;
var chapters = audioSource.MPLSHeader.Chapters;
if (chapters.Count > 1) if (chapters.Count > 1)
{ {
if (stream == id) if (stream == id)