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

Fixed filename out

Browse Source
This commit is contained in:
Brage 2024-03-20 20:32:56 +01:00
parent 6c9d1da854
commit 4acc058038
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/ffmpeg/EncodeArgumentCreatorTask.kt
View File

@ -46,12 +46,21 @@ class EncodeArgumentCreatorTask(@Autowired override var coordinator: Coordinator
val baseInfo = events.findLast { it.data is BaseInfoPerformed }?.data as BaseInfoPerformed val baseInfo = events.findLast { it.data is BaseInfoPerformed }?.data as BaseInfoPerformed
val readStreamsEvent = events.find { it.data is MediaStreamsParsePerformed }?.data as MediaStreamsParsePerformed val readStreamsEvent = events.find { it.data is MediaStreamsParsePerformed }?.data as MediaStreamsParsePerformed
val serializedParsedStreams = readStreamsEvent.streams val serializedParsedStreams = readStreamsEvent.streams
val videoInfoWrapper: VideoInfoPerformed? = events.findLast { it.data is VideoInfoPerformed }?.data as VideoInfoPerformed?
val videoInfo = videoInfoWrapper?.toValueObject()
val outDir = SharedConfig.outgoingContent.using(baseInfo.title) if (videoInfoWrapper == null || videoInfo == null) {
log.error { "${KafkaEvents.EVENT_MEDIA_READ_OUT_NAME_AND_TYPE} result is read as null" }
return null
}
//val outDir = SharedConfig.outgoingContent.using(baseInfo.title)
return getFfmpegVideoArguments( return getFfmpegVideoArguments(
inputFile = inputFile.file, inputFile = inputFile.file,
outDir = outDir, outFullName = videoInfo.fullName,
outDir = File(videoInfoWrapper.outDirectory),
preference = preference.encodePreference, preference = preference.encodePreference,
baseInfo = baseInfo, baseInfo = baseInfo,
serializedParsedStreams = serializedParsedStreams serializedParsedStreams = serializedParsedStreams
@ -60,12 +69,13 @@ class EncodeArgumentCreatorTask(@Autowired override var coordinator: Coordinator
private fun getFfmpegVideoArguments( private fun getFfmpegVideoArguments(
inputFile: String, inputFile: String,
outFullName: String,
outDir: File, outDir: File,
preference: EncodingPreference, preference: EncodingPreference,
baseInfo: BaseInfoPerformed, baseInfo: BaseInfoPerformed,
serializedParsedStreams: ParsedMediaStreams serializedParsedStreams: ParsedMediaStreams
): MessageDataWrapper { ): MessageDataWrapper {
val outVideoFile = outDir.using("${baseInfo.sanitizedName}.mp4").absolutePath val outVideoFile = outDir.using("${outFullName}.mp4").absolutePath
val vaas = VideoAndAudioSelector(serializedParsedStreams, preference) val vaas = VideoAndAudioSelector(serializedParsedStreams, preference)

13
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/tasks/event/ffmpeg/ExtractArgumentCreatorTask.kt
View File

@ -53,12 +53,18 @@ class ExtractArgumentCreatorTask(@Autowired override var coordinator: Coordinato
val baseInfo = events.findLast { it.data is BaseInfoPerformed }?.data as BaseInfoPerformed val baseInfo = events.findLast { it.data is BaseInfoPerformed }?.data as BaseInfoPerformed
val readStreamsEvent = events.find { it.data is MediaStreamsParsePerformed }?.data as MediaStreamsParsePerformed val readStreamsEvent = events.find { it.data is MediaStreamsParsePerformed }?.data as MediaStreamsParsePerformed
val serializedParsedStreams = readStreamsEvent.streams val serializedParsedStreams = readStreamsEvent.streams
val videoInfoWrapper: VideoInfoPerformed? = events.findLast { it.data is VideoInfoPerformed }?.data as VideoInfoPerformed?
val videoInfo = videoInfoWrapper?.toValueObject()
val outDir = SharedConfig.outgoingContent.using(baseInfo.title) if (videoInfoWrapper == null || videoInfo == null) {
log.error { "${KafkaEvents.EVENT_MEDIA_READ_OUT_NAME_AND_TYPE} result is read as null" }
return null
}
return getFfmpegSubtitleArguments( return getFfmpegSubtitleArguments(
inputFile = inputFile.file, inputFile = inputFile.file,
outDir = outDir, outFullName = videoInfo.fullName,
outDir = File(videoInfoWrapper.outDirectory),
baseInfo = baseInfo, baseInfo = baseInfo,
serializedParsedStreams = serializedParsedStreams serializedParsedStreams = serializedParsedStreams
) )
@ -66,6 +72,7 @@ class ExtractArgumentCreatorTask(@Autowired override var coordinator: Coordinato
private fun getFfmpegSubtitleArguments( private fun getFfmpegSubtitleArguments(
inputFile: String, inputFile: String,
outFullName: String,
outDir: File, outDir: File,
baseInfo: BaseInfoPerformed, baseInfo: BaseInfoPerformed,
serializedParsedStreams: ParsedMediaStreams serializedParsedStreams: ParsedMediaStreams
@ -76,7 +83,7 @@ class ExtractArgumentCreatorTask(@Autowired override var coordinator: Coordinato
val entries = sArg.map { val entries = sArg.map {
FfmpegWorkerArgument( FfmpegWorkerArgument(
arguments = it.codecParameters + it.optionalParameters + listOf("-map", "0:s:${it.index}"), arguments = it.codecParameters + it.optionalParameters + listOf("-map", "0:s:${it.index}"),
outputFile = subRootDir.using(it.language, "${baseInfo.sanitizedName}.${it.format}").absolutePath outputFile = subRootDir.using(it.language, "${outFullName}.${it.format}").absolutePath
) )
} }
return FfmpegWorkerArgumentsCreated( return FfmpegWorkerArgumentsCreated(

4
shared/kafka/src/main/kotlin/no/iktdev/mediaprocessing/shared/kafka/dto/events_result/VideoInfoPerformed.kt
View File

@ -2,9 +2,12 @@ package no.iktdev.mediaprocessing.shared.kafka.dto.events_result
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.JsonObject import com.google.gson.JsonObject
import no.iktdev.mediaprocessing.shared.kafka.core.KafkaBelongsToEvent
import no.iktdev.mediaprocessing.shared.kafka.core.KafkaEvents
import no.iktdev.mediaprocessing.shared.kafka.dto.MessageDataWrapper import no.iktdev.mediaprocessing.shared.kafka.dto.MessageDataWrapper
import no.iktdev.mediaprocessing.shared.kafka.dto.Status import no.iktdev.mediaprocessing.shared.kafka.dto.Status
@KafkaBelongsToEvent(KafkaEvents.EVENT_MEDIA_READ_OUT_NAME_AND_TYPE)
data class VideoInfoPerformed( data class VideoInfoPerformed(
override val status: Status, override val status: Status,
val info: JsonObject, val info: JsonObject,
@ -43,6 +46,7 @@ data class SubtitleInfo(
val language: String val language: String
) )
@KafkaBelongsToEvent(KafkaEvents.EVENT_MEDIA_READ_OUT_NAME_AND_TYPE)
open class VideoInfo( open class VideoInfo(
@Transient open val type: String, @Transient open val type: String,
@Transient open val fullName: String @Transient open val fullName: String