fenix/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-03-09 16:30:12 +01:00
Code Issues Projects Releases Wiki Activity

[ie/niconico] DMC: simplify extraction; rm useless function; add asr

Browse Source 
Labels are "1080p", "720p", "480p", "360p" and "144p", so the
  "extract_video_quality" function will not work.

Co-authored-by: bashonly <88596187+bashonly@users.noreply.github.com>
This commit is contained in:
Mozi 2024-02-27 15:57:08 +00:00
parent 7177148087
commit 9a986b9cf3
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
yt_dlp/extractor/niconico.py
View File

@ -19,7 +19,6 @@ from ..utils import (
join_nonempty, join_nonempty,
parse_bitrate, parse_bitrate,
parse_duration, parse_duration,
parse_filesize,
parse_iso8601, parse_iso8601,
parse_resolution, parse_resolution,
qualities, qualities,
@ -366,15 +365,10 @@ class NiconicoIE(InfoExtractor):
if not audio_quality.get('isAvailable') or not video_quality.get('isAvailable'): if not audio_quality.get('isAvailable') or not video_quality.get('isAvailable'):
return None return None
def extract_video_quality(video_quality):
return parse_filesize('%sB' % self._search_regex(
r'\| ([0-9]*\.?[0-9]*[MK])', video_quality, 'vbr', default=''))
format_id = '-'.join( format_id = '-'.join(
[remove_start(s['id'], 'archive_') for s in (video_quality, audio_quality)] + [dmc_protocol]) [remove_start(s['id'], 'archive_') for s in (video_quality, audio_quality)] + [dmc_protocol])
vid_qual_label = traverse_obj(video_quality, ('metadata', 'label')) vid_qual_label = traverse_obj(video_quality, ('metadata', 'label'))
vid_quality = traverse_obj(video_quality, ('metadata', 'bitrate'))
return { return {
'url': 'niconico_dmc:%s/%s/%s' % (video_id, video_quality['id'], audio_quality['id']), 'url': 'niconico_dmc:%s/%s/%s' % (video_id, video_quality['id'], audio_quality['id']),
@ -383,8 +377,9 @@ class NiconicoIE(InfoExtractor):
'ext': 'mp4', # Session API are used in HTML5, which always serves mp4 'ext': 'mp4', # Session API are used in HTML5, which always serves mp4
'acodec': 'aac', 'acodec': 'aac',
'vcodec': 'h264', 'vcodec': 'h264',
'abr': float_or_none(traverse_obj(audio_quality, ('metadata', 'bitrate')), 1000), 'abr': float_or_none(traverse_obj(audio_quality, ('metadata', 'bitrate')), scale=1000),
'vbr': float_or_none(vid_quality if vid_quality > 0 else extract_video_quality(vid_qual_label), 1000), 'vbr': float_or_none(traverse_obj(video_quality, ('metadata', 'bitrate')), scale=1000),
'asr': int_or_none(traverse_obj(audio_quality, ('metadata', 'samplingRate'))),
'height': traverse_obj(video_quality, ('metadata', 'resolution', 'height')), 'height': traverse_obj(video_quality, ('metadata', 'resolution', 'height')),
'width': traverse_obj(video_quality, ('metadata', 'resolution', 'width')), 'width': traverse_obj(video_quality, ('metadata', 'resolution', 'width')),
'quality': -2 if 'low' in video_quality['id'] else None, 'quality': -2 if 'low' in video_quality['id'] else None,
@ -439,14 +434,12 @@ class NiconicoIE(InfoExtractor):
def get_video_info(*items, get_first=True, **kwargs): def get_video_info(*items, get_first=True, **kwargs):
return traverse_obj(api_data, ('video', *items), get_all=not get_first, **kwargs) return traverse_obj(api_data, ('video', *items), get_all=not get_first, **kwargs)
dmc_data = traverse_obj(api_data, ( dmc_data = traverse_obj(api_data, ('media', 'delivery', 'movie', {
'media', 'delivery', 'movie', { 'audios': ('audios', ..., {dict}),
'audios': 'audios', 'videos': ('videos', ..., {dict}),
'videos': 'videos', 'protocols': ('session', 'protocols', ..., {str}),
'protocols': ('session', 'protocols'), }))
}, {lambda data: data if all(key in data for key in ['audios', 'videos', 'protocols']) else None}, if len(dmc_data) == 3:
))
if dmc_data:
for (audio_quality, video_quality, protocol) in itertools.product( for (audio_quality, video_quality, protocol) in itertools.product(
dmc_data['audios'], dmc_data['videos'], dmc_data['protocols']): dmc_data['audios'], dmc_data['videos'], dmc_data['protocols']):
fmt = self._extract_format_for_quality(video_id, audio_quality, video_quality, protocol) fmt = self._extract_format_for_quality(video_id, audio_quality, video_quality, protocol)