Fixed NoneType vbitrate error
This commit is contained in:
parent
8e1387db8e
commit
8a08433ff8
@ -404,14 +404,14 @@ def result(ctx, service, quality, closest_resolution, range_, wanted, alang, sla
|
|||||||
quality = closest_res
|
quality = closest_res
|
||||||
|
|
||||||
# Modified video track selection to choose lowest bitrate if vbitrate == min
|
# Modified video track selection to choose lowest bitrate if vbitrate == min
|
||||||
if vbitrate.lower() == "min":
|
if vbitrate and vbitrate.lower() == "min":
|
||||||
available_bitrate = [int(track.bitrate) for track in title.tracks.videos]
|
available_bitrate = [int(track.bitrate) for track in title.tracks.videos]
|
||||||
if not available_resolutions:
|
if not available_resolutions:
|
||||||
log.error(" - No video tracks available")
|
log.error(" - No video tracks available")
|
||||||
continue
|
continue
|
||||||
vbitrate = min(available_bitrate)
|
vbitrate = min(available_bitrate)
|
||||||
log.warning(f" - Choosing minimum bitrate: {vbitrate}")
|
log.warning(f" - Choosing minimum bitrate: {vbitrate}")
|
||||||
else:
|
elif vbitrate:
|
||||||
vbitrate = int(vbitrate)
|
vbitrate = int(vbitrate)
|
||||||
title.tracks.select_videos(by_quality=quality, by_vbitrate=vbitrate, by_range=range_, one_only=True)
|
title.tracks.select_videos(by_quality=quality, by_vbitrate=vbitrate, by_range=range_, one_only=True)
|
||||||
title.tracks.select_audios(by_language=alang, by_bitrate=abitrate, with_descriptive=audio_description)
|
title.tracks.select_audios(by_language=alang, by_bitrate=abitrate, with_descriptive=audio_description)
|
||||||
@ -530,7 +530,7 @@ def result(ctx, service, quality, closest_resolution, range_, wanted, alang, sla
|
|||||||
assert license
|
assert license
|
||||||
# Convert bytes to string if necessary
|
# Convert bytes to string if necessary
|
||||||
if isinstance(license, bytes):
|
if isinstance(license, bytes):
|
||||||
license_response = license_response.decode('utf-8')
|
license = license.decode('utf-8')
|
||||||
ctx.obj.cdm.parse_license(
|
ctx.obj.cdm.parse_license(
|
||||||
session_id,
|
session_id,
|
||||||
license
|
license
|
||||||
|
Binary file not shown.
@ -255,7 +255,7 @@ async def m3u8dl(uri, out, track, headers=None, proxy=None):
|
|||||||
"--write-meta-json", "False",
|
"--write-meta-json", "False",
|
||||||
"--log-level", "ERROR",
|
"--log-level", "ERROR",
|
||||||
"--thread-count", "96",
|
"--thread-count", "96",
|
||||||
"--download-retry-count", "8",
|
"--download-retry-count", "20",
|
||||||
"--ffmpeg-binary-path", ffmpeg_binary,
|
"--ffmpeg-binary-path", ffmpeg_binary,
|
||||||
"--binary-merge"
|
"--binary-merge"
|
||||||
]
|
]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user