Allow to play more than 1 segment

spektor56 · May 3, 2022 · 9386a3f · 9386a3f
1 parent d8ddab4
commit 9386a3f
Show file tree

Hide file tree

Showing 7 changed files with 363 additions and 93 deletions.
diff --git a/OpenpilotSdk/Hardware/OpenpilotDevice.cs b/OpenpilotSdk/Hardware/OpenpilotDevice.cs
@@ -380,7 +380,8 @@ public async Task<Bitmap> GetThumbnailAsync(DriveSegment driveSegment)
             await ConnectAsync();
 
             Bitmap thumbnail = null;
-            var drive = new DirectoryInfo(Path.GetDirectoryName(driveSegment.FrontVideo.File.FullName)).Name;
+            var videoFile = driveSegment.FrontVideoQuick ?? driveSegment.FrontVideo;
+            var drive = new DirectoryInfo(Path.GetDirectoryName(videoFile.File.FullName)).Name;
             var cachedThumbnail = Path.Combine(TempDirectory, drive + ".jpg");
 
 
@@ -389,7 +390,6 @@ public async Task<Bitmap> GetThumbnailAsync(DriveSegment driveSegment)
                 bool quickVideo = driveSegment.FrontVideoQuick != null;
                 var offset = 0;
 
-                var videoFile = driveSegment.FrontVideoQuick ?? driveSegment.FrontVideo;
                 var imageBuffer = quickVideo ? new byte[10000] : new byte[200000];
 
                 await using (var sftpFileStream = SftpClient.OpenRead(videoFile.File.FullName))
@@ -407,7 +407,7 @@ public async Task<Bitmap> GetThumbnailAsync(DriveSegment driveSegment)
                     try
                     {
                         await FFMpegArguments
-                            .FromPipeInput(new StreamPipeSource(msInput), options => options.WithFramerate(20).ForceFormat(quickVideo ? "mpegts" : "rawvideo"))
+                            .FromPipeInput(new StreamPipeSource(msInput), options => options.WithFramerate(20))
                             .OutputToPipe(new StreamPipeSink(msOutput), options =>
                                 options.WithVideoCodec(VideoCodec.Png)
                                     .WithFrameOutputCount(1)
@@ -591,9 +591,7 @@ public async Task<IEnumerable<Firmware>> GetFirmwareVersions(IProgress<int> prog
 
             var firmwares = new List<Firmware>();
 
-            var drives = GetDrives();
-
-            foreach (var drive in drives)
+            await foreach (var drive in GetDrivesAsync())
             {
                 foreach (var driveSegment in drive.Segments.OrderBy(segment => segment.Index))
                 {
@@ -668,7 +666,7 @@ public async Task<GpxFile> GenerateGpxFileAsync(Drive drive, IProgress<int> prog
 
         public async IAsyncEnumerable<Drive> GetDrivesAsync([EnumeratorCancellation]CancellationToken cancellationToken = default(CancellationToken))
         {
-            await ConnectAsync();
+            await ConnectAsync(cancellationToken);
 
             IOrderedEnumerable<IGrouping<DateTime, SftpFile>> directoryListing;
 
@@ -680,7 +678,7 @@ public async Task<GpxFile> GenerateGpxFileAsync(Drive drive, IProgress<int> prog
                     {
                         return DateTime.ParseExact(dir.Name.AsSpan().Slice(0, 20), "yyyy-MM-dd--HH-mm-ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeUniversal).ToUniversalTime(); 
                     })
-                    .OrderBy(dir =>
+                    .OrderByDescending(dir =>
                     {
                         var date = dir.Key;
                         return date;

diff --git a/OpenpilotSdk/OpenpilotSdk.csproj b/OpenpilotSdk/OpenpilotSdk.csproj
@@ -41,7 +41,7 @@
 		<PackageReference Include="NetTopologySuite" Version="2.4.0" />
 		<PackageReference Include="NetTopologySuite.IO.GPX" Version="1.1.1" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-		<PackageReference Include="Serilog" Version="2.10.0" />
+		<PackageReference Include="Serilog" Version="2.11.0" />
 		<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
 		<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
 		<PackageReference Include="SharpZipLib" Version="1.3.3" />

diff --git a/OpenpilotToolkit/Controls/Media/VideoPlayer.Designer.cs b/OpenpilotToolkit/Controls/Media/VideoPlayer.Designer.cs