Merge pull request #828 from croneter/fix-4k

Fix 4k H265 not being transcoded
This commit is contained in:
croneter 2019-04-14 14:55:35 +02:00 committed by GitHub
commit 203edf90f0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -124,8 +124,11 @@ class PlayUtils():
try: try:
resolution = int(videoCodec['resolution']) resolution = int(videoCodec['resolution'])
except (TypeError, ValueError): except (TypeError, ValueError):
LOG.info('No video resolution from PMS, not transcoding.') if videoCodec['resolution'] == '4k':
return False resolution = 2160
else:
LOG.info('No video resolution from PMS, not transcoding.')
return False
if 'h265' in codec or 'hevc' in codec: if 'h265' in codec or 'hevc' in codec:
if resolution >= self.getH265(): if resolution >= self.getH265():
LOG.info('Option to transcode h265/HEVC enabled. Resolution ' LOG.info('Option to transcode h265/HEVC enabled. Resolution '