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

Fix subtitle encoder if subrip is requested #7960

Merged

Conversation

Shadowghost
Copy link
Contributor

Changes
Properly convert subtitles to subrip if requested.

Issues
Fixes #7958
Fixes jellyfin/Swiftfin#417

@crobibero
Copy link
Member

I would at least add it to the consts that already exist

@Shadowghost
Copy link
Contributor Author

Shadowghost commented Jun 17, 2022

I thought about this too and didn't do it because technically srt and subrip are equivalent and having both of them in the enum would imply they aren't...

@nyanmisaka
Copy link
Member

Can you also take a look at the external ass/ssa subtitle? It doesn’t work for me either.

@crobibero crobibero added the stable backport Backport into the next stable release label Jun 17, 2022
@crobibero crobibero added this to Active PRs in Release 10.8.0 via automation Jun 17, 2022
Release 10.8.0 automation moved this from Active PRs to Approved PRs Jun 17, 2022
@Shadowghost
Copy link
Contributor Author

Shadowghost commented Jun 17, 2022

Can you also take a look at the external ass/ssa subtitle? It doesn’t work for me either.

Pass-through should already be supported:

if (string.Equals(inputFormat, outputFormat, StringComparison.OrdinalIgnoreCase))

I added barebone writers for SSA and ASS too, so in theory any text sub can be converted to both now if client requests it.
I'm not sure if the latter should be in this PR though.

@joshuaboniface joshuaboniface merged commit ae79bbc into jellyfin:release-10.8.z Jun 20, 2022
Release 10.8.0 automation moved this from Approved PRs to Completed PRs Jun 20, 2022
@Shadowghost Shadowghost deleted the subrip-encoder-fix branch June 20, 2022 16:06
jellyfin-bot pushed a commit that referenced this pull request Jun 29, 2022
(cherry picked from commit ae79bbc)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
@jellyfin-bot jellyfin-bot moved this from Completed PRs to Jellyfinished in Release 10.8.0 Jun 29, 2022
@jellyfin-bot jellyfin-bot removed the stable backport Backport into the next stable release label Jun 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Release 10.8.0
  
Jellyfinished
Development

Successfully merging this pull request may close these issues.

None yet

5 participants