mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-20 01:42:50 +01:00
Indicate filesize
approximated from tbr
better
This commit is contained in:
parent
1e75d97db2
commit
0dff8e4d1e
@ -2666,7 +2666,8 @@ def is_wellformed(f):
|
|||||||
format['dynamic_range'] = 'SDR'
|
format['dynamic_range'] = 'SDR'
|
||||||
if format.get('aspect_ratio') is None:
|
if format.get('aspect_ratio') is None:
|
||||||
format['aspect_ratio'] = try_call(lambda: round(format['width'] / format['height'], 2))
|
format['aspect_ratio'] = try_call(lambda: round(format['width'] / format['height'], 2))
|
||||||
if (info_dict.get('duration') and format.get('tbr')
|
if (not format.get('manifest_url') # For fragmented formats, "tbr" is often max bitrate and not average
|
||||||
|
and info_dict.get('duration') and format.get('tbr')
|
||||||
and not format.get('filesize') and not format.get('filesize_approx')):
|
and not format.get('filesize') and not format.get('filesize_approx')):
|
||||||
format['filesize_approx'] = int(info_dict['duration'] * format['tbr'] * (1024 / 8))
|
format['filesize_approx'] = int(info_dict['duration'] * format['tbr'] * (1024 / 8))
|
||||||
format['http_headers'] = self._calc_headers(collections.ChainMap(format, info_dict))
|
format['http_headers'] = self._calc_headers(collections.ChainMap(format, info_dict))
|
||||||
@ -3707,8 +3708,11 @@ def simplified_codec(f, field):
|
|||||||
format_field(f, 'fps', '\t%d', func=round),
|
format_field(f, 'fps', '\t%d', func=round),
|
||||||
format_field(f, 'dynamic_range', '%s', ignore=(None, 'SDR')).replace('HDR', ''),
|
format_field(f, 'dynamic_range', '%s', ignore=(None, 'SDR')).replace('HDR', ''),
|
||||||
format_field(f, 'audio_channels', '\t%s'),
|
format_field(f, 'audio_channels', '\t%s'),
|
||||||
delim,
|
delim, (
|
||||||
format_field(f, 'filesize', ' \t%s', func=format_bytes) + format_field(f, 'filesize_approx', '~\t%s', func=format_bytes),
|
format_field(f, 'filesize', ' \t%s', func=format_bytes)
|
||||||
|
or format_field(f, 'filesize_approx', '≈\t%s', func=format_bytes)
|
||||||
|
or format_field(try_call(lambda: format_bytes(int(info_dict['duration'] * f['tbr'] * (1024 / 8)))),
|
||||||
|
None, self._format_out('~\t%s', self.Styles.SUPPRESS))),
|
||||||
format_field(f, 'tbr', '\t%dk', func=round),
|
format_field(f, 'tbr', '\t%dk', func=round),
|
||||||
shorten_protocol_name(f.get('protocol', '')),
|
shorten_protocol_name(f.get('protocol', '')),
|
||||||
delim,
|
delim,
|
||||||
|
Loading…
Reference in New Issue
Block a user