Optimized video metadata

usercode · Feb 11, 2024 · 5941212 · 5941212
1 parent 5eb2350
commit 5941212
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 37 deletions.
diff --git a/src/DragonFly.AspNetCore/Assets/VideoProcessing.cs b/src/DragonFly.AspNetCore/Assets/VideoProcessing.cs
@@ -30,6 +30,9 @@ public async Task<bool> OnAssetChangedAsync(IAssetProcessingContext context)
 
         VideoMetadata metadata = new VideoMetadata();
 
+        metadata.FormatName = mediaInfo.Format.FormatLongName;
+        metadata.Duration = mediaInfo.Duration;
+
         //video
         if (mediaInfo.PrimaryVideoStream != null)
         {
@@ -38,7 +41,6 @@ public async Task<bool> OnAssetChangedAsync(IAssetProcessingContext context)
                 Codec = mediaInfo.PrimaryVideoStream.CodecLongName,
                 Width = mediaInfo.PrimaryVideoStream.Width,
                 Height = mediaInfo.PrimaryVideoStream.Height,
-                Duration = mediaInfo.PrimaryVideoStream.Duration,
                 Fps = (int)mediaInfo.PrimaryVideoStream.FrameRate
             };
         }
@@ -50,8 +52,7 @@ public async Task<bool> OnAssetChangedAsync(IAssetProcessingContext context)
             {
                 Codec = mediaInfo.PrimaryAudioStream.CodecLongName,
                 ChannelLayout = mediaInfo.PrimaryAudioStream.ChannelLayout,
-                Channels = mediaInfo.PrimaryAudioStream.Channels,
-                Duration = mediaInfo.PrimaryAudioStream.Duration
+                Channels = mediaInfo.PrimaryAudioStream.Channels
             };
         }
 

diff --git a/src/DragonFly.Client/Pages/Assets/Metadata/VideoMetadataView.razor b/src/DragonFly.Client/Pages/Assets/Metadata/VideoMetadataView.razor
@@ -1,5 +1,27 @@
 @inherits AssetMetadataComponent<VideoMetadata>
 
+<div class="form-group">
+    <BSRow>
+        <BSLabel class="col-sm-2 col-form-label">
+            Format
+        </BSLabel>
+        <div class="col-sm-10">
+            <input type="text" class="form-control" @bind-value="@Metadata.FormatName" readonly />
+        </div>
+    </BSRow>
+</div>
+
+<div class="form-group">
+    <BSRow>
+        <BSLabel class="col-sm-2 col-form-label">
+            Duration
+        </BSLabel>
+        <div class="col-sm-10">
+            <input type="text" class="form-control" @bind-value="@Metadata.Duration" readonly />
+        </div>
+    </BSRow>
+</div>
+
 @if (Metadata.VideoInfo != null)
 {
     <h4>Primary video stream</h4>
@@ -12,18 +34,7 @@
                 <input type="text" class="form-control" @bind-value="@Metadata.VideoInfo.Codec" readonly />
             </div>
         </BSRow>
-    </div>
-
-    <div class="form-group">
-        <BSRow>
-            <BSLabel class="col-sm-2 col-form-label">
-                Duration
-            </BSLabel>
-            <div class="col-sm-10">
-                <input type="text" class="form-control" @bind-value="@Metadata.VideoInfo.Duration" readonly />
-            </div>
-        </BSRow>
-    </div>
+    </div>   
 
     <div class="form-group">
         <BSRow>
@@ -73,17 +84,6 @@
         </BSRow>
     </div>
 
-    <div class="form-group">
-        <BSRow>
-            <BSLabel class="col-sm-2 col-form-label">
-                Duration
-            </BSLabel>
-            <div class="col-sm-10">
-                <input type="text" class="form-control" @bind-value="@Metadata.AudioInfo.Duration" readonly />
-            </div>
-        </BSRow>
-    </div>
-
     <div class="form-group">
         <BSRow>
             <BSLabel class="col-sm-2 col-form-label">

diff --git a/src/DragonFly.Core/Modules/Assets/Metadatas/Video/AudioInfo.cs b/src/DragonFly.Core/Modules/Assets/Metadatas/Video/AudioInfo.cs
@@ -23,9 +23,4 @@ public class AudioInfo
     /// Channels
     /// </summary>
     public int? Channels { get; set; }
-
-    /// <summary>
-    /// DUration in ms.
-    /// </summary>
-    public TimeSpan? Duration { get; set; }
 }
diff --git a/src/DragonFly.Core/Modules/Assets/Metadatas/Video/VideoInfo.cs b/src/DragonFly.Core/Modules/Assets/Metadatas/Video/VideoInfo.cs
@@ -24,11 +24,6 @@ public class VideoInfo
     /// </summary>
     public int? Height { get; set; }
 
-    /// <summary>
-    /// DUration in ms.
-    /// </summary>
-    public TimeSpan? Duration { get; set; }
-
     /// <summary>
     /// Frames per Second
     /// </summary>

diff --git a/src/DragonFly.Core/Modules/Assets/Metadatas/VideoMetadata.cs b/src/DragonFly.Core/Modules/Assets/Metadatas/VideoMetadata.cs
@@ -9,6 +9,16 @@ namespace DragonFly;
 /// </summary>
 public class VideoMetadata : AssetMetadata
 {
+    /// <summary>
+    /// FormatName
+    /// </summary>
+    public string? FormatName { get; set; }
+
+    /// <summary>
+    /// Duration
+    /// </summary>
+    public TimeSpan Duration { get; set; }
+
     /// <summary>
     /// VideoInfo
     /// </summary>

diff --git a/src/DragonFly.Core/Modules/Assets/Models/AssetMetadataManager.cs b/src/DragonFly.Core/Modules/Assets/Models/AssetMetadataManager.cs
@@ -60,5 +60,4 @@ public Type GetMetadataType(string name)
 
         throw new Exception();
     }
-
 }