Merge pull request #1122 from croneter/fix-transcoding

Fix PKC not burning in (and thus not showing) subtitles when transcoding
This commit is contained in:
croneter 2020-02-23 16:27:51 +01:00 committed by GitHub
commit a1d32447ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions

View file

@ -1088,7 +1088,7 @@ def transcoding_arguments(path, media, part, playmethod, args=None):
# none, embedded, sidecar # none, embedded, sidecar
# Essentially indicating what you want to do with subtitles and state # Essentially indicating what you want to do with subtitles and state
# you arent want it to burn them into the video (requires transcoding) # you arent want it to burn them into the video (requires transcoding)
'subtitles': 'none', # 'subtitles': 'none',
# 'subtitleSize': utils.settings('subtitleSize') # 'subtitleSize': utils.settings('subtitleSize')
'copyts': 1 'copyts': 1
} }

View file

@ -484,8 +484,13 @@ STREAMING_HEADERS = {
'container=mpegts&' 'container=mpegts&'
'videoCodec=h264,hevc,mpeg4,mpeg2video&' 'videoCodec=h264,hevc,mpeg4,mpeg2video&'
'audioCodec=aac,flac,vorbis,opus,ac3,eac3,mp3,mp2,pcm&' 'audioCodec=aac,flac,vorbis,opus,ac3,eac3,mp3,mp2,pcm&'
'subtitleCodec=ass,pgs,vobsub&'
'replace=true)' 'replace=true)'
# '+add-transcode-target('
# 'type=subtitleProfile&'
# 'context=all&'
# 'container=ass&'
# 'codec=ass&'
# 'replace=true)'
'+add-direct-play-profile(' '+add-direct-play-profile('
'type=videoProfile&' 'type=videoProfile&'
'container=*&' 'container=*&'