starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-05-04 18:09:12 +03:00
Code Issues 822 Packages Projects Releases 10 Wiki Activity

[PR #12676] [MERGED] Let HLS Controller decide if subtitle should be burn in #13315

New Issue
Closed
opened 2026-02-07 07:10:48 +03:00 by OVERLORD · 0 comments
OVERLORD commented 2026-02-07 07:10:48 +03:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/jellyfin/jellyfin/pull/12676
Author: @gnattu
Created: 9/21/2024
Status: ✅ Merged
Merged: 9/22/2024
Merged by: @crobibero

Base: master ← Head: rework-burnin-during-transcoding

📝 Commits (4)

  • d944f41 Let HLS Controller decide if subtitle should be burn in
  • c3e889c Conditionally add burn in option for remote source
  • 1346ebc Don't add subtitle option to audio endpoint
  • 4502024 Remove all subtitle options from audio endpoints

📊 Changes

6 files changed (+75 additions, -50 deletions)

View changed files

📝 Jellyfin.Api/Controllers/DynamicHlsController.cs (+33 -18)
📝 Jellyfin.Api/Helpers/MediaInfoHelper.cs (+9 -0)
📝 MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs (+2 -0)
📝 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs (+22 -16)
📝 MediaBrowser.Model/Dlna/StreamBuilder.cs (+3 -15)
📝 MediaBrowser.Model/Dlna/StreamInfo.cs (+6 -1)

📄 Description

Previously, we predicted whether the subtitle should be burned in with transcode reasons, but that was not accurate because the actual transcoding codec is only determined after the client has requested the stream. This pass through the option to the DynamicHlsController to handle the subtitle burn-in during the actual transcoding process. Now the client should be responsible to conditionally load the subtitle when this option is enabled.

Changes

Issues

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/jellyfin/jellyfin/pull/12676 **Author:** [@gnattu](https://github.com/gnattu) **Created:** 9/21/2024 **Status:** ✅ Merged **Merged:** 9/22/2024 **Merged by:** [@crobibero](https://github.com/crobibero) **Base:** `master` ← **Head:** `rework-burnin-during-transcoding` --- ### 📝 Commits (4) - [`d944f41`](https://github.com/jellyfin/jellyfin/commit/d944f415f3cc0e5433d94b11a16684ca3f0131ec) Let HLS Controller decide if subtitle should be burn in - [`c3e889c`](https://github.com/jellyfin/jellyfin/commit/c3e889cd41e534b15e0930e2e76fcf12238e5f16) Conditionally add burn in option for remote source - [`1346ebc`](https://github.com/jellyfin/jellyfin/commit/1346ebc13448e4e4e4096ac31320abf7cf3a6baa) Don't add subtitle option to audio endpoint - [`4502024`](https://github.com/jellyfin/jellyfin/commit/4502024468ecd9a795cd482f4fbda30b35ee58de) Remove all subtitle options from audio endpoints ### 📊 Changes **6 files changed** (+75 additions, -50 deletions) <details> <summary>View changed files</summary> 📝 `Jellyfin.Api/Controllers/DynamicHlsController.cs` (+33 -18) 📝 `Jellyfin.Api/Helpers/MediaInfoHelper.cs` (+9 -0) 📝 `MediaBrowser.Controller/MediaEncoding/BaseEncodingJobOptions.cs` (+2 -0) 📝 `MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs` (+22 -16) 📝 `MediaBrowser.Model/Dlna/StreamBuilder.cs` (+3 -15) 📝 `MediaBrowser.Model/Dlna/StreamInfo.cs` (+6 -1) </details> ### 📄 Description Previously, we predicted whether the subtitle should be burned in with transcode reasons, but that was not accurate because the actual transcoding codec is only determined after the client has requested the stream. This pass through the option to the `DynamicHlsController` to handle the subtitle burn-in during the actual transcoding process. Now the client should be responsible to conditionally load the subtitle when this option is enabled. <!-- Ensure your title is short, descriptive, and in the imperative mood (Fix X, Change Y, instead of Fixed X, Changed Y). For a good inspiration of what to write in commit messages and PRs please review https://chris.beams.io/posts/git-commit/ and our documentation. --> **Changes** <!-- Describe your changes here in 1-5 sentences. --> **Issues** <!-- Tag any issues that this PR solves here. ex. Fixes # --> --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
OVERLORD added the pull-request label 2026-02-07 07:10:48 +03:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
EFjellyfin.db
area:database
awaiting-feedback
backend
blocked
breaking change: web api
bug
build
ci
confirmed
discussion needed
dotnet future
downstream
duplicate
enhancement
feature
future
github-actions
good first issue
hdr
help wanted
invalid
investigation
librarydb
live-tv
lyrics
media playback
music
needs testing
nuget
performance
platform
pull-request
Mirrored from GitHub Pull Request
 question
regression
release critical
requires-web
roadmap
security
security
stale
support
syncplay
ui & ux
upstream
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/jellyfin#13315
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?