Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import dev.twango.jetplay.media.MediaInfo
import dev.twango.jetplay.media.Spectrogram
import dev.twango.jetplay.transcode.FfmpegAvailability
import dev.twango.jetplay.transcode.MediaInfoExtractor
import dev.twango.jetplay.transcode.MediaTranscoder
import dev.twango.jetplay.transcode.SpectrogramExtractor
import dev.twango.jetplay.transcode.TranscodeRunner
import dev.twango.jetplay.transcode.WaveformExtractor
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.Flow
Expand Down Expand Up @@ -84,7 +84,7 @@ class MediaAccessorImpl : MediaAccessor {
val output = try {
withContext(Dispatchers.IO) {
// onProgress fires synchronously inside ffmpeg, so trySend (non-suspending) bridges it.
TranscodeRunner.transcode(input) { pct -> trySend(TranscodeEvent.Progress(pct)) }
MediaTranscoder.transcode(input) { pct -> trySend(TranscodeEvent.Progress(pct)) }
}
} catch (e: Exception) {
send(TranscodeEvent.Failed(e.message ?: "unknown"))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ object MediaTranscoder {
/** Must stay in sync with the shared classifier. */
internal val rawAudioExtensions: Set<String> get() = RAW_AUDIO_HINTS.keys

/** Runs ffmpeg, invoking onProgress(percent). Returns the transcoded File; throws on failure. */
fun transcode(inputFile: File, onProgress: (Double) -> Unit = {}): File {
val outputFile = Files.createTempFile("jetplay-", ".webm").toFile().apply { deleteOnExit() }

Expand Down

This file was deleted.

Loading