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

Fixed naming

Browse Source
This commit is contained in:
Brage 2023-07-17 00:13:26 +02:00
parent 663506cd76
commit ce111571b6
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeArgumentSelector.kt
View File

@ -11,19 +11,19 @@ import no.iktdev.streamit.content.reader.analyzer.encoding.VideoEncodeArguments
import no.iktdev.streamit.content.reader.preference
class EncodeArgumentSelector(val inputFile: String, val streams: MediaStreams, val outFileName: String) {
var defaultSelectedVideo: VideoStream? = getDefaultSelectedVideo()
var defaultSelectedAudio: AudioStream? = getDefaultSelectedAudio()
var defaultSelectedVideo: VideoStream? = defaultSelectedVideo()
var defaultSelectedAudio: AudioStream? = defaultSelectedAudio()
private fun getAudioStreams() = streams.streams.filterIsInstance<AudioStream>()
private fun getVideoStreams() = streams.streams.filterIsInstance<VideoStream>()
private fun obtainAudioStreams() = streams.streams.filterIsInstance<AudioStream>()
private fun obtainVideoStreams() = streams.streams.filterIsInstance<VideoStream>()
private fun getDefaultSelectedVideo(): VideoStream? {
return getVideoStreams().filter { (it.duration_ts ?: 0) > 0 }.maxByOrNull { it.duration_ts!! } ?: getVideoStreams().minByOrNull { it.index }
private fun defaultSelectedVideo(): VideoStream? {
return obtainVideoStreams().filter { (it.duration_ts ?: 0) > 0 }.maxByOrNull { it.duration_ts!! } ?: obtainVideoStreams().minByOrNull { it.index }
}
private fun getDefaultSelectedAudio(): AudioStream? {
return getAudioStreams().filter { (it.duration_ts ?: 0) > 0 }.maxByOrNull { it.duration_ts!! } ?: getAudioStreams().minByOrNull { it.index }
private fun defaultSelectedAudio(): AudioStream? {
return obtainAudioStreams().filter { (it.duration_ts ?: 0) > 0 }.maxByOrNull { it.duration_ts!! } ?: obtainAudioStreams().minByOrNull { it.index }
}
/**
@ -37,7 +37,7 @@ class EncodeArgumentSelector(val inputFile: String, val streams: MediaStreams, v
* @return AudioStrem based on preference or defaultSelectedAudio
*/
private fun getSelectedAudioBasedOnPreference(): AudioStream? {
val languageFiltered = getAudioStreams().filter { it.tags.language == preference.audio.language }
val languageFiltered = obtainAudioStreams().filter { it.tags.language == preference.audio.language }
val channeledAndCodec = languageFiltered.find { it.channels >= (preference.audio.channels ?: 2) && it.codec_name == preference.audio.codec.lowercase() }
return channeledAndCodec ?: return languageFiltered.minByOrNull { it.index } ?: defaultSelectedAudio
}

7
UI/src/main/java/no/iktdev/streamit/content/Main.java
View File

@ -1,7 +0,0 @@
package no.iktdev.streamit.content;
public class Main {
public static void main(String[] args) {
System.out.println("Hello world!");
}
}