Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fallthrough to media3 MimeTypes in codec->mime type mapping #3410

Merged
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
7 changes: 6 additions & 1 deletion playback/exoplayer/src/main/kotlin/mapping/audio.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
package org.jellyfin.playback.exoplayer.mapping

import androidx.annotation.OptIn
import androidx.media3.common.MimeTypes
import androidx.media3.common.util.UnstableApi

@OptIn(UnstableApi::class)
fun getFfmpegAudioMimeType(codec: String): String {
return ffmpegAudioMimeTypes.getOrDefault(codec, codec)
return ffmpegAudioMimeTypes[codec]
?: MimeTypes.getAudioMediaMimeType(codec)
?: codec
}

val ffmpegAudioMimeTypes = mapOf(
Expand Down
14 changes: 6 additions & 8 deletions playback/exoplayer/src/main/kotlin/mapping/container.kt
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ import androidx.annotation.OptIn
import androidx.media3.common.MimeTypes
import androidx.media3.common.util.UnstableApi

@OptIn(UnstableApi::class)
fun getFfmpegContainerMimeType(codec: String): String {
// Find in container mime type list
return ffmpegContainerMimeTypes.getOrElse(codec) {
// Find in audio mime type list
ffmpegAudioMimeTypes.getOrElse(codec) {
// Return input
codec
}
}
return ffmpegContainerMimeTypes[codec]
?: ffmpegVideoMimeTypes[codec]
?: ffmpegAudioMimeTypes[codec]
?: MimeTypes.getMediaMimeType(codec)
?: codec
}

@OptIn(UnstableApi::class)
Expand Down
16 changes: 16 additions & 0 deletions playback/exoplayer/src/main/kotlin/mapping/video.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package org.jellyfin.playback.exoplayer.mapping

import androidx.annotation.OptIn
import androidx.media3.common.MimeTypes
import androidx.media3.common.util.UnstableApi

@OptIn(UnstableApi::class)
fun getFfmpegVideoMimeType(codec: String): String {
return ffmpegVideoMimeTypes[codec]
?: MimeTypes.getVideoMediaMimeType(codec)
?: codec
}

val ffmpegVideoMimeTypes = mapOf<String, String>(
// TODO: Add map

Check warning

Code scanning / detekt

Flags a forbidden comment. Warning

Forbidden TODO todo marker in comment, please do the changes.
)