claunia/cuetools.net
1
0
Fork 0
mirror of https://github.com/claunia/cuetools.net.git synced 2025-12-16 18:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Open multistream files with ffdshow

Browse Source
This commit is contained in:
Grigory Chudov
2018-04-07 13:55:01 -04:00
parent 6f79ab7ebe
commit bfcbd825b2
13 changed files with 136 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
CUETools.Codecs.BDLPCM/BDLPCMReader.cs
View File

@@ -7,13 +7,12 @@ namespace CUETools.Codecs.BDLPCM
{
public class AudioDecoder : IAudioSource
{
public unsafe AudioDecoder(string path, Stream IO, ushort pid)
: this(path, IO)
public unsafe AudioDecoder(string path, Stream IO, int pid)
: this(new DecoderSettings() { StreamId = pid }, path, IO)
{
settings.Pid = pid;
}
public unsafe AudioDecoder(string path, Stream IO)
public unsafe AudioDecoder(DecoderSettings settings, string path, Stream IO)
{
_path = path;
_IO = IO != null ? IO : new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 0x10000);
@@ -23,10 +22,10 @@ namespace CUETools.Codecs.BDLPCM
_samplePos = 0;
_sampleLen = -1;
demux_ts_packets(null, 0);
settings = new DecoderSettings();
m_settings = settings;
}
public IAudioDecoderSettings Settings => settings;
public IAudioDecoderSettings Settings => m_settings;
public void Close()
{
@@ -88,11 +87,11 @@ namespace CUETools.Codecs.BDLPCM
get {
if (chosenStream == null)
{
if (settings.Pid.HasValue)
if (m_settings.StreamId.HasValue)
{
if (streams.ContainsKey(settings.Pid.Value))
if (streams.ContainsKey((ushort)m_settings.StreamId.Value))
{
var s = streams[settings.Pid.Value];
var s = streams[(ushort)m_settings.StreamId.Value];
if (s.is_opened)
{
chosenStream = s;
@@ -103,14 +102,14 @@ namespace CUETools.Codecs.BDLPCM
return chosenStream.pcm;
}
}
throw new Exception("Pid can be " +
throw new Exception("StreamId can be " +
string.Join(", ", (new List<ushort>(streams.Keys)).FindAll(pid => streams[pid].is_opened).ConvertAll(pid => pid.ToString()).ToArray()));
}
if (settings.Stream.HasValue)
if (m_settings.Stream.HasValue)
{
foreach (var s in streams)
{
if (s.Value.is_opened && s.Value.streamId == settings.Stream.Value)
if (s.Value.is_opened && s.Value.streamId == m_settings.Stream.Value)
{
chosenStream = s.Value;
if (chosenStream.pcm == null)
@@ -124,7 +123,7 @@ namespace CUETools.Codecs.BDLPCM
string.Join(", ", (new List<TsStream>(streams.Values)).FindAll(s => s.is_opened).ConvertAll(s => s.streamId.ToString()).ToArray()));
}
throw new Exception("multiple streams present, please specify Pid or Stream");
throw new Exception("multiple streams present, please specify StreamId or Stream");
}
return chosenStream.pcm;
}
@@ -735,6 +734,6 @@ namespace CUETools.Codecs.BDLPCM
int demuxer_channel;
TsStream chosenStream;
long _samplePos, _sampleLen;
DecoderSettings settings;
DecoderSettings m_settings;
}
}

2
CUETools.Codecs.BDLPCM/BDLPCMReaderSettings.cs
View File

@@ -40,6 +40,6 @@ namespace CUETools.Codecs.BDLPCM
public int? Stream { get; set; }
[Browsable(false)]
public ushort? Pid { get; set; }
public int? StreamId { get; set; }
}
}

41
CUETools.Codecs.BDLPCM/MPLSReader.cs
View File

@@ -9,14 +9,13 @@ namespace CUETools.Codecs.BDLPCM
public class MPLSDecoder : IAudioSource
{
public unsafe MPLSDecoder(string path, Stream IO, ushort pid)
: this(path, IO)
: this(new MPLS.DecoderSettings() { StreamId = pid }, path, IO)
{
settings.Pid = pid;
}
public unsafe MPLSDecoder(string path, Stream IO)
public unsafe MPLSDecoder(MPLS.DecoderSettings settings, string path, Stream IO)
{
settings = new DecoderSettings();
m_settings = settings;
_path = path;
_IO = IO != null ? IO : new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read, 0x10000);
int length = (int)_IO.Length;
@@ -36,33 +35,33 @@ namespace CUETools.Codecs.BDLPCM
void openEntries()
{
readers = new List<AudioDecoder>();
var pids = new List<ushort>();
var pids = new List<int>();
foreach (var item in hdr_m.play_item)
foreach (var audio in item.audio)
{
if (audio.coding_type != 0x80 /* LPCM */) continue;
pids.Add(audio.pid);
}
ushort chosenPid;
if (settings.Pid.HasValue)
int chosenPid;
if (m_settings.StreamId.HasValue)
{
if (!pids.Contains(settings.Pid.Value))
throw new Exception("Pid can be " +
if (!pids.Contains(m_settings.StreamId.Value))
throw new Exception("StreamId can be " +
string.Join(", ", pids.ConvertAll(pid => pid.ToString()).ToArray()));
chosenPid = settings.Pid.Value;
chosenPid = m_settings.StreamId.Value;
}
else if (settings.Stream.HasValue)
else if (m_settings.Stream.HasValue)
{
if (settings.Stream.Value < 0 || settings.Stream.Value >= pids.Count)
if (m_settings.Stream.Value < 0 || m_settings.Stream.Value >= pids.Count)
throw new Exception("Stream can be 0.." + (pids.Count - 1).ToString());
chosenPid = pids[settings.Stream.Value];
chosenPid = pids[m_settings.Stream.Value];
}
else throw new Exception("multiple streams present, please specify Pid or Stream");
else throw new Exception("multiple streams present, please specify StreamId or Stream");
foreach (var item in hdr_m.play_item)
foreach (var audio in item.audio)
{
if (audio.coding_type != 0x80 /* LPCM */) continue;
if (settings.IgnoreShortItems && item.out_time - item.in_time < shortItemDuration) continue;
if (m_settings.IgnoreShortItems && item.out_time - item.in_time < shortItemDuration) continue;
if (audio.pid == chosenPid)
{
var parent = Directory.GetParent(System.IO.Path.GetDirectoryName(System.IO.Path.GetFullPath(_path)));
@@ -277,7 +276,7 @@ namespace CUETools.Codecs.BDLPCM
return mark;
}
public IAudioDecoderSettings Settings => settings;
public IAudioDecoderSettings Settings => m_settings;
public void Close()
{
@@ -308,7 +307,7 @@ namespace CUETools.Codecs.BDLPCM
{
if (item.num_audio == 0) continue;
uint item_duration = item.out_time - item.in_time;
if (settings.IgnoreShortItems && item_duration < shortItemDuration) continue;
if (m_settings.IgnoreShortItems && item_duration < shortItemDuration) continue;
totalLength += item_duration;
}
@@ -403,13 +402,13 @@ namespace CUETools.Codecs.BDLPCM
ushort mark_item = hdr_m.play_mark[i].play_item_ref;
uint item_in_time = hdr_m.play_item[mark_item].in_time;
uint item_out_time = hdr_m.play_item[mark_item].out_time;
if (settings.IgnoreShortItems && item_out_time - item_in_time < shortItemDuration) continue;
if (m_settings.IgnoreShortItems && item_out_time - item_in_time < shortItemDuration) continue;
uint item_offset = 0;
for (int j = 0; j < mark_item; j++)
{
if (hdr_m.play_item[j].num_audio == 0) continue;
uint item_duration = hdr_m.play_item[j].out_time - hdr_m.play_item[j].in_time;
if (settings.IgnoreShortItems && item_duration < shortItemDuration) continue;
if (m_settings.IgnoreShortItems && item_duration < shortItemDuration) continue;
item_offset += item_duration;
}
res.Add(hdr_m.play_mark[i].time - item_in_time + item_offset);
@@ -419,7 +418,7 @@ namespace CUETools.Codecs.BDLPCM
{
if (hdr_m.play_item[j].num_audio == 0) continue;
uint item_duration = hdr_m.play_item[j].out_time - hdr_m.play_item[j].in_time;
if (settings.IgnoreShortItems && item_duration < shortItemDuration) continue;
if (m_settings.IgnoreShortItems && item_duration < shortItemDuration) continue;
end_offset += hdr_m.play_item[j].out_time - hdr_m.play_item[j].in_time;
}
res.Add(end_offset);
@@ -439,7 +438,7 @@ namespace CUETools.Codecs.BDLPCM
List<AudioDecoder> readers;
AudioDecoder currentReader;
MPLSHeader hdr_m;
DecoderSettings settings;
MPLS.DecoderSettings m_settings;
}
public struct MPLSPlaylistMark

2
CUETools.Codecs.BDLPCM/MPLSReaderSettings.cs
View File

@@ -40,6 +40,6 @@ namespace CUETools.Codecs.MPLS
public int? Stream { get; set; }
[Browsable(false)]
public ushort? Pid { get; set; }
public int? StreamId { get; set; }
}
}