From bbb82ddc12f0f226f36b409df33b1694d7d498b5 Mon Sep 17 00:00:00 2001 From: dtrexler <82474555+dtrexler@users.noreply.github.com> Date: Sun, 19 Jan 2025 10:02:59 -0500 Subject: [PATCH] Fix codec keys in new playback module (#4411) * Fix codec names in mime type maps * Update CONTRIBUTORS.md --- CONTRIBUTORS.md | 1 + playback/media3/exoplayer/src/main/kotlin/mapping/audio.kt | 6 +++--- playback/media3/exoplayer/src/main/kotlin/mapping/video.kt | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 02aaade31..9ea6ef48c 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -15,6 +15,7 @@ - [3l0w](https://github.com/3l0w) - [MajMongoose](https://github.com/majmongoose) - [Olaren15](https://github.com/Olaren15) + - [dtrexler](https://github.com/dtrexler) # Emby Contributors diff --git a/playback/media3/exoplayer/src/main/kotlin/mapping/audio.kt b/playback/media3/exoplayer/src/main/kotlin/mapping/audio.kt index 3bd1b0886..425e5bf8b 100644 --- a/playback/media3/exoplayer/src/main/kotlin/mapping/audio.kt +++ b/playback/media3/exoplayer/src/main/kotlin/mapping/audio.kt @@ -15,9 +15,9 @@ val ffmpegAudioMimeTypes = mapOf( "aac" to MimeTypes.AUDIO_AAC, "ac3" to MimeTypes.AUDIO_AC3, "alac" to MimeTypes.AUDIO_ALAC, - "amrnb" to MimeTypes.AUDIO_AMR_NB, - "amrwb" to MimeTypes.AUDIO_AMR_WB, - "dca" to MimeTypes.AUDIO_DTS, + "amr_nb" to MimeTypes.AUDIO_AMR_NB, + "amr_wb" to MimeTypes.AUDIO_AMR_WB, + "dts" to MimeTypes.AUDIO_DTS, "eac3" to MimeTypes.AUDIO_E_AC3, "flac" to MimeTypes.AUDIO_FLAC, "mp1" to MimeTypes.AUDIO_MPEG_L1, diff --git a/playback/media3/exoplayer/src/main/kotlin/mapping/video.kt b/playback/media3/exoplayer/src/main/kotlin/mapping/video.kt index 0c0c3d3e7..4a956c7c1 100644 --- a/playback/media3/exoplayer/src/main/kotlin/mapping/video.kt +++ b/playback/media3/exoplayer/src/main/kotlin/mapping/video.kt @@ -17,8 +17,8 @@ val ffmpegVideoMimeTypes = mapOf( "mkv" to MimeTypes.VIDEO_MATROSKA, "webm" to MimeTypes.VIDEO_WEBM, "h263" to MimeTypes.VIDEO_H263, - "h254" to MimeTypes.VIDEO_H264, - "h265" to MimeTypes.VIDEO_H265, + "h264" to MimeTypes.VIDEO_H264, + "hevc" to MimeTypes.VIDEO_H265, "vp8" to MimeTypes.VIDEO_VP8, "vp9" to MimeTypes.VIDEO_VP9, "av1" to MimeTypes.VIDEO_AV1,