From 0626ecf1ad6725db61236aaafd94a6ce4a5e78ae Mon Sep 17 00:00:00 2001 From: EvAlex Date: Thu, 18 Jan 2018 18:17:39 +0300 Subject: [PATCH] fix(mpd) parse xml (#2) --- DashTools.Samples/Program.cs | 18 +++++++++++++----- DashTools/MediaPresentationDescription.cs | 1 - 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/DashTools.Samples/Program.cs b/DashTools.Samples/Program.cs index 05ae761..2f18a7f 100644 --- a/DashTools.Samples/Program.cs +++ b/DashTools.Samples/Program.cs @@ -11,6 +11,15 @@ namespace Qoollo.MpegDash.Samples { class Program { + private static readonly string[] mpdFiles = new string[] + { + "http://ncplusgo.s43-po.live.e56-po.insyscd.net/out/u/eskatvsd.mpd", + "http://dash.edgesuite.net/envivio/EnvivioDash3/manifest.mpd", + "http://10.5.5.7/q/p/userapi/streams/32/mpd", + "http://10.5.7.207/userapi/streams/30/mpd", + "http://10.5.7.207/userapi/streams/11/mpd?start_time=1458816642&stop_time=1458819642", + }; + static void Main(string[] args) { Task.Run(async () => @@ -22,10 +31,9 @@ static void Main(string[] args) static async Task MainAsync(string[] args) { string dir = "envivio"; - string mpdUrl = "http://10.5.5.7/q/p/userapi/streams/32/mpd"; - //"http://10.5.7.207/userapi/streams/30/mpd"; - //"http://10.5.7.207/userapi/streams/11/mpd?start_time=1458816642&stop_time=1458819642"; - //"http://dash.edgesuite.net/envivio/EnvivioDash3/manifest.mpd"; + string mpdUrl = mpdFiles[0]; + var from = TimeSpan.Zero; + var to = TimeSpan.MaxValue; var stopwatch = Stopwatch.StartNew(); var downloader = new MpdDownloader(new Uri(mpdUrl), dir); @@ -38,7 +46,7 @@ static async Task MainAsync(string[] args) // ? new Mp4InitFile(Path.Combine("envivio", Path.GetFileName(f))) // : new Mp4File(Path.Combine("envivio", Path.GetFileName(f)))) // .ToArray(); - await downloader.Download(trackRepresentation, TimeSpan.FromMinutes(60), TimeSpan.FromMinutes(60 + 60 * 6 / 6)); + await downloader.Download(trackRepresentation, from, to); var downloadTime = stopwatch.Elapsed - prepareTime; var ffmpeg = new FFMpegConverter(); diff --git a/DashTools/MediaPresentationDescription.cs b/DashTools/MediaPresentationDescription.cs index 70de511..35a0241 100644 --- a/DashTools/MediaPresentationDescription.cs +++ b/DashTools/MediaPresentationDescription.cs @@ -140,7 +140,6 @@ private XElement ReadMpdTag() { using (var reader = XmlReader.Create(stream)) { - stream.Seek(0, SeekOrigin.Begin); reader.ReadToFollowing("MPD"); return XNode.ReadFrom(reader) as XElement; }