Merge pull request #13 from svt/more-props

Added property "extra" to media info tracks.
svt · Sep 5, 2024 · 2ff495b · 2ff495b
2 parents db2df5d + bf3ef2c
commit 2ff495b
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 6 deletions.
diff --git a/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/AudioTrack.kt b/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/AudioTrack.kt
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class AudioTrack(
     override val format: String,
+    override val extra: Map<String, Any> = emptyMap(),
     @JsonProperty("Duration")
     val duration: Double,
     @JsonProperty("BitRate")

diff --git a/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/GeneralTrack.kt b/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/GeneralTrack.kt
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class GeneralTrack(
     override val format: String = "UNKNOWN",
+    override val extra: Map<String, Any> = emptyMap(),
     @JsonProperty("FileSize")
     val fileSize: Long,
     @JsonProperty("Duration")

diff --git a/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/ImageTrack.kt b/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/ImageTrack.kt
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class ImageTrack(
     override val format: String,
+    override val extra: Map<String, Any> = emptyMap(),
     @JsonProperty("Width")
     val width: Int,
     @JsonProperty("Height")

diff --git a/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/OtherTrack.kt b/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/OtherTrack.kt
@@ -7,4 +7,7 @@ package se.svt.oss.mediaanalyzer.mediainfo
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-data class OtherTrack(override val format: String) : Track
+data class OtherTrack(
+    override val format: String,
+    override val extra: Map<String, Any> = emptyMap()
+) : Track
diff --git a/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/TextTrack.kt b/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/TextTrack.kt
@@ -7,4 +7,7 @@ package se.svt.oss.mediaanalyzer.mediainfo
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 
 @JsonIgnoreProperties(ignoreUnknown = true)
-data class TextTrack(override val format: String) : Track
+data class TextTrack(
+    override val format: String,
+    override val extra: Map<String, Any> = emptyMap()
+) : Track
diff --git a/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/Track.kt b/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/Track.kt
@@ -45,4 +45,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo
 interface Track {
     @get:JsonProperty("Format")
     val format: String
+    @get:JsonProperty("extra")
+    val extra: Map<String, Any>
 }
diff --git a/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/VideoTrack.kt b/src/main/kotlin/se/svt/oss/mediaanalyzer/mediainfo/VideoTrack.kt
@@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class VideoTrack(
     override val format: String,
+    override val extra: Map<String, Any> = emptyMap(),
     @JsonProperty("Duration")
     val duration: Double,
     @JsonProperty("BitRate")
@@ -24,6 +25,10 @@ data class VideoTrack(
     val displayAspectRatio: Double,
     @JsonProperty("FrameRate")
     val frameRate: Double,
+    @JsonProperty("FrameRate_Num")
+    val frameRateNum: Int?,
+    @JsonProperty("FrameRate_Den")
+    val frameRateDen: Int?,
     @JsonProperty("FrameCount")
     val frameCount: Int,
     @JsonProperty("ColorSpace")
@@ -73,9 +78,7 @@ data class VideoTrack(
     @JsonProperty("MasteringDisplay_Luminance")
     val masteringDisplayLuminance: String?,
     @JsonProperty("MasteringDisplay_Luminance_Source")
-    val masteringDisplayLuminanceSource: String?,
-    val extra: Map<String, String> = emptyMap()
-
+    val masteringDisplayLuminanceSource: String?
 ) : Track {
     val isInterlaced: Boolean?
         get() = scanType?.let { it != "Progressive" }

diff --git a/src/test/kotlin/se/svt/oss/mediaanalyzer/MediaAnalyzerIntegrationTest.kt b/src/test/kotlin/se/svt/oss/mediaanalyzer/MediaAnalyzerIntegrationTest.kt
@@ -125,7 +125,6 @@ class MediaAnalyzerIntegrationTest {
                 file,
                 ffprobeInputParams = linkedMapOf(
                     "f" to "s16le",
-                    "ac" to "1",
                     "ar" to "22050",
                 )
             )

diff --git a/src/test/kotlin/se/svt/oss/mediaanalyzer/MediaAnalyzerTest.kt b/src/test/kotlin/se/svt/oss/mediaanalyzer/MediaAnalyzerTest.kt
@@ -106,6 +106,15 @@ internal class MediaAnalyzerTest {
             )
     }
 
+    @Test
+    fun testMediaInfoSource() {
+        mockMediaInfo("/mediainfo-hls.json")
+        val videoTrack = MediaInfoAnalyzer().analyze(file, true).videoTracks.firstOrNull()
+        assertThat(videoTrack?.extra?.get("Source") as? String)
+            .describedAs("extra.Source")
+            .isEqualTo("hls-video1/hls-video1.m3u8")
+    }
+
     @Test
     fun testMediaInfoNoAudio() {
         mockMediaInfo("/mediainfo-audio-corrupt.json")