iktdev/MediaProcessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated ffmpeg stuff

Browse Source
This commit is contained in:
bskjon 2024-07-02 23:11:54 +02:00
parent c39354da09
commit 78518514b8
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateEncodeWorkTask.kt
View File

@ -42,9 +42,6 @@ class CreateEncodeWorkTask(@Autowired override var coordinator: EventCoordinator
log.warn { "Cannot continue until permitted event is present" } log.warn { "Cannot continue until permitted event is present" }
} }
val batchEvents = createMessagesByArgs(event)
val forwardEvent = if (event.event != KafkaEvents.EventMediaParameterEncodeCreated) { val forwardEvent = if (event.event != KafkaEvents.EventMediaParameterEncodeCreated) {
val sevent = events.findLast { it.event == KafkaEvents.EventMediaParameterEncodeCreated } val sevent = events.findLast { it.event == KafkaEvents.EventMediaParameterEncodeCreated }
@ -56,6 +53,9 @@ class CreateEncodeWorkTask(@Autowired override var coordinator: EventCoordinator
sevent ?: event sevent ?: event
} else event } else event
val batchEvents = createMessagesByArgs(forwardEvent)
batchEvents.forEach { e -> batchEvents.forEach { e ->
val createdTask = if (e is FfmpegWorkRequestCreated) { val createdTask = if (e is FfmpegWorkRequestCreated) {
FfmpegTaskData( FfmpegTaskData(

8
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/CreateExtractWorkTask.kt
View File

@ -18,6 +18,7 @@ import no.iktdev.mediaprocessing.shared.kafka.dto.events_result.FfmpegWorkerArgu
import no.iktdev.mediaprocessing.shared.kafka.dto.isSuccess import no.iktdev.mediaprocessing.shared.kafka.dto.isSuccess
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Service import org.springframework.stereotype.Service
import java.util.*
@Service @Service
class CreateExtractWorkTask(@Autowired override var coordinator: EventCoordinator) : CreateProcesserWorkTask(coordinator) { class CreateExtractWorkTask(@Autowired override var coordinator: EventCoordinator) : CreateProcesserWorkTask(coordinator) {
@ -34,6 +35,7 @@ class CreateExtractWorkTask(@Autowired override var coordinator: EventCoordinato
if (events.lastOrNull { it.isOfEvent(KafkaEvents.EventMediaParameterExtractCreated) }?.isSuccess() != true) { if (events.lastOrNull { it.isOfEvent(KafkaEvents.EventMediaParameterExtractCreated) }?.isSuccess() != true) {
log.warn { "Last instance of ${KafkaEvents.EventMediaParameterExtractCreated} was unsuccessful or null. Skipping.." }
return null return null
} }
@ -41,8 +43,6 @@ class CreateExtractWorkTask(@Autowired override var coordinator: EventCoordinato
log.warn { "Cannot continue until permitted event is present" } log.warn { "Cannot continue until permitted event is present" }
} }
val batchEvents = createMessagesByArgs(event)
val forwardEvent = if (event.event != KafkaEvents.EventMediaParameterExtractCreated) { val forwardEvent = if (event.event != KafkaEvents.EventMediaParameterExtractCreated) {
val sevent = events.findLast { it.event == KafkaEvents.EventMediaParameterExtractCreated } val sevent = events.findLast { it.event == KafkaEvents.EventMediaParameterExtractCreated }
if (sevent != null) { if (sevent != null) {
@ -53,6 +53,8 @@ class CreateExtractWorkTask(@Autowired override var coordinator: EventCoordinato
sevent ?: event sevent ?: event
} else event } else event
val batchEvents = createMessagesByArgs(forwardEvent)
batchEvents.forEach { e -> batchEvents.forEach { e ->
val createdTask = if (e is FfmpegWorkRequestCreated) { val createdTask = if (e is FfmpegWorkRequestCreated) {
FfmpegTaskData( FfmpegTaskData(
@ -60,7 +62,7 @@ class CreateExtractWorkTask(@Autowired override var coordinator: EventCoordinato
outFile = e.outFile, outFile = e.outFile,
arguments = e.arguments arguments = e.arguments
).let { task -> ).let { task ->
val status = taskManager.createTask(referenceId = event.referenceId, derivedFromEventId = event.eventId, task= TaskType.Encode, data = Gson().toJson(task)) val status = taskManager.createTask(referenceId = event.referenceId, eventId = UUID.randomUUID().toString(), derivedFromEventId = event.eventId, task= TaskType.Encode, data = Gson().toJson(task))
if (!status) { if (!status) {
log.error { "Failed to create Extract task on ${forwardEvent.referenceId}@${forwardEvent.eventId}" } log.error { "Failed to create Extract task on ${forwardEvent.referenceId}@${forwardEvent.eventId}" }
} }

2
shared/common/src/main/kotlin/no/iktdev/mediaprocessing/shared/common/persistance/tasks.kt
View File

@ -21,6 +21,6 @@ object tasks: IntIdTable() {
val integrity: Column<String> = varchar("integrity", 100) val integrity: Column<String> = varchar("integrity", 100)
init { init {
uniqueIndex(referenceId, task, integrity) uniqueIndex(referenceId, task, eventId)
} }
} }