* Use input params when performing analysis.

fhermansson · fhermansson · commit 47f929527c05 · 2024-03-20T11:02:14.000+01:00
* Prevent thumbnails from in some cases being detected as video.
* Add joinSegmentParams to Profile to be applied when joining segments.
* When running tests, redis is started in a docker container.
diff --git a/encore-common/build.gradle.kts b/encore-common/build.gradle.kts
@@ -1,10 +1,11 @@
 plugins {
     id("encore.kotlin-conventions")
+    `java-test-fixtures`
 }
 
 dependencies {
 
-    api("se.svt.oss:media-analyzer:2.0.3")
+    api("se.svt.oss:media-analyzer:2.0.4")
     implementation(kotlin("reflect"))
 
     compileOnly("org.springdoc:springdoc-openapi-starter-webmvc-api:2.2.0")
@@ -16,28 +17,14 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-slf4j:1.7.3")
 
     testImplementation(project(":encore-web"))
-    testImplementation("se.svt.oss:junit5-redis-extension:3.0.0")
     testImplementation("org.springframework.security:spring-security-test")
     testImplementation("org.awaitility:awaitility")
     testImplementation("com.github.tomakehurst:wiremock-jre8-standalone:2.35.0")
     testImplementation("org.springframework.boot:spring-boot-starter-webflux")
     testImplementation("org.springframework.boot:spring-boot-starter-data-rest")
-}
-
-
-val integrationTestsPreReq = setOf("mediainfo", "ffmpeg", "ffprobe").map {
-
-    tasks.create("Verify $it is in path, required for integration tests", Exec::class.java) {
-        isIgnoreExitValue = true
-        executable = it
-
-        if (!it.equals("mediainfo")) {
-            args("-hide_banner")
-        }
-    }
-}
-
-tasks.test {
-    dependsOn(integrationTestsPreReq)
+    testFixturesImplementation(platform("org.springframework.boot:spring-boot-dependencies:3.1.3"))
+    testFixturesImplementation("com.redis:testcontainers-redis:2.2.0")
+    testFixturesImplementation("io.github.microutils:kotlin-logging:3.0.5")
+    testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")
 }
 
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/ClientConfiguration.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/ClientConfiguration.kt
@@ -13,7 +13,7 @@ import org.springframework.web.reactive.function.client.support.WebClientAdapter
 import org.springframework.web.service.invoker.HttpServiceProxyFactory
 import se.svt.oss.encore.service.callback.CallbackClient
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class ClientConfiguration {
 
     @Bean
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/MediaAnalyzerConfiguration.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/MediaAnalyzerConfiguration.kt
@@ -9,7 +9,7 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import se.svt.oss.mediaanalyzer.MediaAnalyzer
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class MediaAnalyzerConfiguration {
 
     @Bean
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/RedisConfiguration.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/RedisConfiguration.kt
@@ -29,7 +29,7 @@ import se.svt.oss.mediaanalyzer.file.ImageFile
 import se.svt.oss.mediaanalyzer.file.SubtitleFile
 import se.svt.oss.mediaanalyzer.file.VideoFile
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 @RegisterReflectionForBinding(
     EncoreJob::class,
     AudioVideoInput::class,
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/model/input/Input.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/model/input/Input.kt
@@ -36,7 +36,7 @@ sealed interface Input {
     val uri: String
 
     @get:Schema(description = "Input params required to properly decode input", example = """{ "ac": "2" }""")
-    val params: LinkedHashMap<String, String>
+    val params: LinkedHashMap<String, String?>
 
     @get:Schema(
         description = "Type of input",
@@ -152,7 +152,7 @@ sealed interface VideoIn : Input {
 data class AudioInput(
     override val uri: String,
     override val audioLabel: String = DEFAULT_AUDIO_LABEL,
-    override val params: LinkedHashMap<String, String> = linkedMapOf(),
+    override val params: LinkedHashMap<String, String?> = linkedMapOf(),
     override val audioFilters: List<String> = emptyList(),
     override var analyzed: MediaFile? = null,
     override val audioStream: Int? = null,
@@ -177,7 +177,7 @@ data class AudioInput(
 data class VideoInput(
     override val uri: String,
     override val videoLabel: String = DEFAULT_VIDEO_LABEL,
-    override val params: LinkedHashMap<String, String> = linkedMapOf(),
+    override val params: LinkedHashMap<String, String?> = linkedMapOf(),
     override val dar: FractionString? = null,
     override val cropTo: FractionString? = null,
     override val padTo: FractionString? = null,
@@ -206,7 +206,7 @@ data class AudioVideoInput(
     override val uri: String,
     override val videoLabel: String = DEFAULT_VIDEO_LABEL,
     override val audioLabel: String = DEFAULT_AUDIO_LABEL,
-    override val params: LinkedHashMap<String, String> = linkedMapOf(),
+    override val params: LinkedHashMap<String, String?> = linkedMapOf(),
     override val dar: FractionString? = null,
     override val cropTo: FractionString? = null,
     override val padTo: FractionString? = null,
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/model/output/Output.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/model/output/Output.kt
@@ -13,6 +13,7 @@ data class Output(
     val format: String = "mp4",
     val postProcessor: PostProcessor = PostProcessor { outputFolder -> listOf(outputFolder.resolve(output)) },
     val id: String,
+    val isImage: Boolean = false
 )
 
 fun interface PostProcessor {
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/model/profile/Profile.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/model/profile/Profile.kt
@@ -9,5 +9,6 @@ data class Profile(
     val description: String,
     val encodes: List<OutputProducer>,
     val scaling: String? = "bicubic",
-    val deinterlaceFilter: String = "yadif"
+    val deinterlaceFilter: String = "yadif",
+    val joinSegmentParams: LinkedHashMap<String, Any?> = linkedMapOf()
 )
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/model/profile/ThumbnailEncode.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/model/profile/ThumbnailEncode.kt
@@ -63,7 +63,8 @@ data class ThumbnailEncode(
             output = "${job.baseName}$suffix%0${suffixZeroPad}d.jpg",
             postProcessor = { outputFolder ->
                 outputFolder.listFiles().orEmpty().filter { it.name.matches(fileRegex) }
-            }
+            },
+            isImage = true
         )
     }
 
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/model/profile/ThumbnailMapEncode.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/model/profile/ThumbnailMapEncode.kt
@@ -80,6 +80,7 @@ data class ThumbnailMapEncode(
                     val targetFile = outputFolder.resolve("${job.baseName}$suffix.$format")
                     val process = ProcessBuilder(
                         "ffmpeg",
+                        "-y",
                         "-i",
                         "${job.baseName}$suffix%04d.$format",
                         "-vf",
@@ -100,7 +101,8 @@ data class ThumbnailMapEncode(
                     logOrThrow("Error creating thumbnail map! ${e.message}")
                     emptyList()
                 }
-            }
+            },
+            isImage = true
         )
     }
 
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/model/profile/VideoEncode.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/model/profile/VideoEncode.kt
@@ -65,7 +65,7 @@ interface VideoEncode : OutputProducer {
     fun passParams(pass: Int): Map<String, String> =
         mapOf("pass" to pass.toString(), "passlogfile" to "log$suffix")
 
-    private fun videoFilter(
+    fun videoFilter(
         debugOverlay: Boolean,
         encodingProperties: EncodingProperties,
         videoInput: VideoIn
@@ -75,7 +75,8 @@ interface VideoEncode : OutputProducer {
         var scaleToHeight = height
         val videoStream = videoInput.analyzedVideo.highestBitrateVideoStream
         val outputDar = (videoInput.padTo ?: videoInput.cropTo ?: videoStream.displayAspectRatio)?.toFractionOrNull()
-        val outputIsPortrait = outputDar != null && outputDar < Fraction.ONE
+            ?: Fraction(videoStream.width, videoStream.height)
+        val outputIsPortrait = outputDar < Fraction.ONE
         val isScalingWithinLandscape =
             scaleToWidth != null && scaleToHeight != null && Fraction(scaleToWidth, scaleToHeight) > Fraction.ONE
         if (encodingProperties.flipWidthHeightIfPortrait && outputIsPortrait && isScalingWithinLandscape) {
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/service/EncoreService.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/service/EncoreService.kt
@@ -139,7 +139,7 @@ class EncoreService(
                     val targetName = encoreJob.baseName + it
                     log.info { "Joining segments for $targetName" }
                     val targetFile = outputFolder.resolve(targetName)
-                    ffmpegExecutor.joinSegments(outWorkDir.resolve("$it.txt"), targetFile)
+                    ffmpegExecutor.joinSegments(encoreJob, outWorkDir.resolve("$it.txt"), targetFile)
                 }
                 outputFiles
             }
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/service/FfmpegExecutor.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/service/FfmpegExecutor.kt
@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service
 import se.svt.oss.encore.config.EncoreProperties
 import se.svt.oss.encore.model.EncoreJob
 import se.svt.oss.encore.model.input.maxDuration
+import se.svt.oss.encore.model.mediafile.toParams
 import se.svt.oss.encore.process.CommandBuilder
 import se.svt.oss.encore.service.profile.ProfileService
 import se.svt.oss.mediaanalyzer.MediaAnalyzer
@@ -69,7 +70,7 @@ class FfmpegExecutor(
             progressChannel?.close()
             outputs.flatMap { out ->
                 out.postProcessor.process(File(outputFolder))
-                    .map { mediaAnalyzer.analyze(it.toString()) }
+                    .map { mediaAnalyzer.analyze(it.toString(), disableImageSequenceDetection = out.isImage) }
             }
         } catch (e: CancellationException) {
             log.info { "Job was cancelled" }
@@ -167,7 +168,8 @@ class FfmpegExecutor(
         }
     }
 
-    fun joinSegments(segmentList: File, targetFile: File): MediaFile {
+    fun joinSegments(encoreJob: EncoreJob, segmentList: File, targetFile: File): MediaFile {
+        val joinParams = profileService.getProfile(encoreJob).joinSegmentParams.toParams()
         val command = listOf(
             "ffmpeg",
             "-hide_banner",
@@ -185,8 +187,9 @@ class FfmpegExecutor(
             "-ignore_unknown",
             "-c",
             "copy",
-            "$targetFile"
-        )
+            "-metadata",
+            "comment=Transcoded using Encore",
+        ) + joinParams + "$targetFile"
         runFfmpeg(command, segmentList.parentFile, null) {}
         return mediaAnalyzer.analyze(targetFile.absolutePath)
     }
diff --git a/encore-common/src/main/kotlin/se/svt/oss/encore/service/mediaanalyzer/MediaAnalyzerService.kt b/encore-common/src/main/kotlin/se/svt/oss/encore/service/mediaanalyzer/MediaAnalyzerService.kt
@@ -51,7 +51,11 @@ class MediaAnalyzerService(private val mediaAnalyzer: MediaAnalyzer) {
         val probeInterlaced = input is VideoIn && input.probeInterlaced
         val useFirstAudioStreams = (input as? AudioIn)?.channelLayout?.channels?.size
 
-        input.analyzed = mediaAnalyzer.analyze(input.uri, probeInterlaced).let {
+        input.analyzed = mediaAnalyzer.analyze(
+            file = input.uri,
+            probeInterlaced = probeInterlaced,
+            ffprobeInputParams = input.params
+        ).let {
             val selectedVideoStream = (input as? VideoIn)?.videoStream
             val selectedAudioStream = (input as? AudioIn)?.audioStream
             when (it) {
diff --git a/encore-common/src/test/kotlin/se/svt/oss/encore/EncoreIntegrationTest.kt b/encore-common/src/test/kotlin/se/svt/oss/encore/EncoreIntegrationTest.kt
@@ -8,6 +8,7 @@ import org.awaitility.Awaitility.await
 import org.awaitility.Durations
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
+import org.springframework.core.io.ClassPathResource
 import org.springframework.test.annotation.DirtiesContext
 import org.springframework.test.context.ActiveProfiles
 import se.svt.oss.encore.Assertions.assertThat
@@ -136,6 +137,32 @@ class EncoreIntegrationTest : EncoreIntegrationTestBase() {
         )
     }
 
+    @Test
+    fun jobWithInputParamsForRawVideo(@TempDir outputDir: File) {
+        val inputFile = ClassPathResource("input/testyuv.yuv")
+        val encoreJob = job(outputDir = outputDir, file = inputFile)
+
+        successfulTest(
+            encoreJob.copy(
+                profile = "archive",
+                profileParams = linkedMapOf("suffix" to "_raw", "height" to 1080),
+                inputs = listOf(
+                    VideoInput(
+                        uri = inputFile.file.absolutePath,
+                        params = linkedMapOf(
+                            "f" to "rawvideo",
+                            "video_size" to "640x360",
+                            "framerate" to "25",
+                            "pixel_format" to "yuv420p",
+                        )
+                    )
+                )
+            ),
+
+            listOf(outputDir.resolve("testyuv_raw.mxf").absolutePath)
+        )
+    }
+
     @Test
     fun highPriorityJobIsRunInParallel(@TempDir outputDir1: File, @TempDir outputDir2: File) {
         val standardPriorityJob = createAndAwaitJob(
diff --git a/encore-common/src/test/kotlin/se/svt/oss/encore/EncoreIntegrationTestBase.kt b/encore-common/src/test/kotlin/se/svt/oss/encore/EncoreIntegrationTestBase.kt
@@ -30,13 +30,12 @@ import se.svt.oss.encore.model.Status
 import se.svt.oss.encore.model.callback.JobProgress
 import se.svt.oss.encore.model.input.AudioVideoInput
 import se.svt.oss.encore.model.profile.ChannelLayout
-import se.svt.oss.junit5.redis.EmbeddedRedisExtension
 import java.io.File
 import java.time.Duration
 import java.util.UUID
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ExtendWith(EmbeddedRedisExtension::class)
+@ExtendWith(RedisExtension::class)
 @DirtiesContext
 @Import(TestConfig::class)
 class EncoreIntegrationTestBase {
diff --git a/encore-common/src/test/kotlin/se/svt/oss/encore/repository/EncoreJobRepositoryTest.kt b/encore-common/src/test/kotlin/se/svt/oss/encore/repository/EncoreJobRepositoryTest.kt
@@ -11,14 +11,14 @@ import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.data.domain.PageRequest
 import org.springframework.test.context.ActiveProfiles
 import se.svt.oss.encore.Assertions.assertThat
+import se.svt.oss.encore.RedisExtension
 import se.svt.oss.encore.model.EncoreJob
 import se.svt.oss.encore.model.Status
-import se.svt.oss.junit5.redis.EmbeddedRedisExtension
 import java.time.OffsetDateTime
 import java.util.UUID
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-@ExtendWith(EmbeddedRedisExtension::class)
+@ExtendWith(RedisExtension::class)
 @ActiveProfiles("test")
 class EncoreJobRepositoryTest {
 
diff --git a/encore-common/src/test/resources/application-test-local.yml b/encore-common/src/test/resources/application-test-local.yml
@@ -1,7 +1,4 @@
 spring:
-  data:
-    redis:
-     port: ${embedded-redis.port}
   main:
     allow-bean-definition-overriding: true
 
diff --git a/encore-common/src/test/resources/application-test.yml b/encore-common/src/test/resources/application-test.yml
@@ -1,7 +1,4 @@
 spring:
-  data:
-    redis:
-      port: ${embedded-redis.port}
   main:
     allow-bean-definition-overriding: true
 
@@ -25,7 +22,7 @@ encore-settings:
   concurrency: 3
   local-temporary-encode: false
   poll-initial-delay: 1s
-  poll-delaly: 1s
+  poll-delay: 1s
   shared-work-dir: ${java.io.tmpdir}/encore-shared
   encoding:
     default-channel-layouts:
diff --git a/encore-common/src/test/resources/input/testyuv.yuv b/encore-common/src/test/resources/input/testyuv.yuv
diff --git a/encore-common/src/test/resources/profile/archive.yml b/encore-common/src/test/resources/profile/archive.yml
@@ -11,5 +11,6 @@ encodes:
     format: mxf
     twoPass: false
     audioEncode:
+      optional: true
       type: SimpleAudioEncode
       codec: pcm_s24le
diff --git a/encore-common/src/testFixtures/kotlin/se/svt/oss/encore/RedisExtension.kt b/encore-common/src/testFixtures/kotlin/se/svt/oss/encore/RedisExtension.kt
@@ -0,0 +1,40 @@
+package se.svt.oss.encore
+
+import com.redis.testcontainers.RedisContainer
+import mu.KotlinLogging
+import org.junit.jupiter.api.extension.BeforeAllCallback
+import org.junit.jupiter.api.extension.ExtensionContext
+import org.testcontainers.DockerClientFactory
+import org.testcontainers.utility.DockerImageName
+
+private const val DEFAULT_REDIS_DOCKER_IMAGE = "redis:6.2.13"
+
+class RedisExtension : BeforeAllCallback {
+    private val log = KotlinLogging.logger { }
+    override fun beforeAll(context: ExtensionContext?) {
+        if (isDockerAvailable()) {
+            val dockerImageName = System.getenv("ENCORE_REDIS_DOCKER_IMAGE") ?: DEFAULT_REDIS_DOCKER_IMAGE
+            val redisContainer = RedisContainer(DockerImageName.parse(dockerImageName))
+                .withKeyspaceNotifications()
+            redisContainer.start()
+            val host = redisContainer.redisHost
+            val port = redisContainer.redisPort.toString()
+            log.info { "Setting spring.data.redis.host=$host" }
+            log.info { "Setting spring.data.redis.port=$port" }
+            System.setProperty("spring.data.redis.host", host)
+            System.setProperty("spring.data.redis.port", port)
+        }
+    }
+
+    private fun isDockerAvailable(): Boolean {
+        return try {
+            log.info { "Checking for docker..." }
+            DockerClientFactory.instance().client()
+            log.info { "Docker is available" }
+            true
+        } catch (ex: Throwable) {
+            log.warn { "Docker is not available! Make sure redis is available as configured by spring.data.redis (default localhost:6379)" }
+            false
+        }
+    }
+}
diff --git a/encore-web/build.gradle.kts b/encore-web/build.gradle.kts
@@ -10,6 +10,6 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-security")
     implementation("org.springframework.boot:spring-boot-starter-actuator")
 
+    testImplementation(testFixtures(project(":encore-common")))
     testImplementation("com.ninja-squad:springmockk:4.0.2")
-    testImplementation("se.svt.oss:junit5-redis-extension:3.0.0")
 }
diff --git a/encore-web/src/main/kotlin/se/svt/oss/encore/OpenAPIConfiguration.kt b/encore-web/src/main/kotlin/se/svt/oss/encore/OpenAPIConfiguration.kt
@@ -11,7 +11,7 @@ import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import se.svt.oss.encore.config.EncoreProperties
 
-@Configuration
+@Configuration(proxyBeanMethods = false)
 class OpenAPIConfiguration {
 
     @Bean
diff --git a/encore-web/src/main/kotlin/se/svt/oss/encore/RepositoryConfiguration.kt b/encore-web/src/main/kotlin/se/svt/oss/encore/RepositoryConfiguration.kt
diff --git a/encore-web/src/main/kotlin/se/svt/oss/encore/SchedulingConfiguration.kt b/encore-web/src/main/kotlin/se/svt/oss/encore/SchedulingConfiguration.kt
diff --git a/encore-web/src/main/kotlin/se/svt/oss/encore/SecurityConfiguration.kt b/encore-web/src/main/kotlin/se/svt/oss/encore/SecurityConfiguration.kt
diff --git a/encore-web/src/test/kotlin/se/svt/oss/encore/EncoreEndpointAccessIntegrationTest.kt b/encore-web/src/test/kotlin/se/svt/oss/encore/EncoreEndpointAccessIntegrationTest.kt
diff --git a/encore-web/src/test/resources/application-test.yml b/encore-web/src/test/resources/application-test.yml
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ data class Output(`
`13`	`13`	`val format: String = "mp4",`
`14`	`14`	`val postProcessor: PostProcessor = PostProcessor { outputFolder -> listOf(outputFolder.resolve(output)) },`
`15`	`15`	`val id: String,`
	`16`	`+ val isImage: Boolean = false`
`16`	`17`	`)`
`17`	`18`
`18`	`19`	`fun interface PostProcessor {`
Original file line number	Diff line number	Diff line change
`@@ -9,5 +9,6 @@ data class Profile(`
`9`	`9`	`val description: String,`
`10`	`10`	`val encodes: List<OutputProducer>,`
`11`	`11`	`val scaling: String? = "bicubic",`
`12`		`- val deinterlaceFilter: String = "yadif"`
	`12`	`+ val deinterlaceFilter: String = "yadif",`
	`13`	`+ val joinSegmentParams: LinkedHashMap<String, Any?> = linkedMapOf()`
`13`	`14`	`)`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ data class ThumbnailEncode(`
`63`	`63`	`output = "${job.baseName}$suffix%0${suffixZeroPad}d.jpg",`
`64`	`64`	`postProcessor = { outputFolder ->`
`65`	`65`	`outputFolder.listFiles().orEmpty().filter { it.name.matches(fileRegex) }`
`66`		`- }`
	`66`	`+ },`
	`67`	`+ isImage = true`
`67`	`68`	`)`
`68`	`69`	`}`
`69`	`70`
Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ data class ThumbnailMapEncode(`
`80`	`80`	`val targetFile = outputFolder.resolve("${job.baseName}$suffix.$format")`
`81`	`81`	`val process = ProcessBuilder(`
`82`	`82`	`"ffmpeg",`
	`83`	`+ "-y",`
`83`	`84`	`"-i",`
`84`	`85`	`"${job.baseName}$suffix%04d.$format",`
`85`	`86`	`"-vf",`
`@@ -100,7 +101,8 @@ data class ThumbnailMapEncode(`
`100`	`101`	`logOrThrow("Error creating thumbnail map! ${e.message}")`
`101`	`102`	`emptyList()`
`102`	`103`	`}`
`103`		`- }`
	`104`	`+ },`
	`105`	`+ isImage = true`
`104`	`106`	`)`
`105`	`107`	`}`
`106`	`108`