mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-26 09:11:25 +01:00
Compare commits
7 Commits
e445cc918e
...
c4ae7dcedc
| Author | SHA1 | Date | |
|---|---|---|---|
|
c4ae7dcedc | ||
|
|
e398217aae | ||
|
|
c39016f66d | ||
|
|
bd62cdba1a | ||
|
|
e0ce6eed92 | ||
|
|
6b0ce31939 | ||
|
|
a95757d3b7 |
|
|
@ -1381,6 +1381,175 @@ jwplayer("mediaplayer").setup({"abouttext":"Visit Indie DB","aboutlink":"http:\/
|
|||
},
|
||||
],
|
||||
},
|
||||
), (
|
||||
# Clear Key with CENC default_KID
|
||||
'clearkey_cenc',
|
||||
'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd', # mpd_url
|
||||
'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/', # mpd_base_url
|
||||
[{
|
||||
'manifest_url': 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd',
|
||||
'ext': 'mp4',
|
||||
'format_id': '1',
|
||||
'format_note': 'DASH video',
|
||||
'protocol': 'http_dash_segments',
|
||||
'acodec': 'none',
|
||||
'vcodec': 'avc1.64001f',
|
||||
'tbr': 389.802,
|
||||
'width': 512,
|
||||
'height': 288,
|
||||
'dash_cenc': {
|
||||
'laurl': 'https://drm-clearkey-testvectors.axtest.net/AcquireLicense',
|
||||
'key_ids': ['9eb4050de44b4802932e27d75083e266'],
|
||||
},
|
||||
}, {
|
||||
'manifest_url': 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd',
|
||||
'ext': 'mp4',
|
||||
'format_id': '2',
|
||||
'format_note': 'DASH video',
|
||||
'protocol': 'http_dash_segments',
|
||||
'acodec': 'none',
|
||||
'vcodec': 'avc1.64001f',
|
||||
'tbr': 764.935,
|
||||
'width': 640,
|
||||
'height': 360,
|
||||
'dash_cenc': {
|
||||
'laurl': 'https://drm-clearkey-testvectors.axtest.net/AcquireLicense',
|
||||
'key_ids': ['9eb4050de44b4802932e27d75083e266'],
|
||||
},
|
||||
}, {
|
||||
'manifest_url': 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd',
|
||||
'ext': 'mp4',
|
||||
'format_id': '3',
|
||||
'format_note': 'DASH video',
|
||||
'protocol': 'http_dash_segments',
|
||||
'acodec': 'none',
|
||||
'vcodec': 'avc1.640028',
|
||||
'tbr': 1120.439,
|
||||
'width': 852,
|
||||
'height': 480,
|
||||
'dash_cenc': {
|
||||
'laurl': 'https://drm-clearkey-testvectors.axtest.net/AcquireLicense',
|
||||
'key_ids': ['9eb4050de44b4802932e27d75083e266'],
|
||||
},
|
||||
}, {
|
||||
'manifest_url': 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd',
|
||||
'ext': 'mp4',
|
||||
'format_id': '4',
|
||||
'format_note': 'DASH video',
|
||||
'protocol': 'http_dash_segments',
|
||||
'acodec': 'none',
|
||||
'vcodec': 'avc1.640032',
|
||||
'tbr': 1945.258,
|
||||
'width': 1280,
|
||||
'height': 720,
|
||||
'dash_cenc': {
|
||||
'laurl': 'https://drm-clearkey-testvectors.axtest.net/AcquireLicense',
|
||||
'key_ids': ['9eb4050de44b4802932e27d75083e266'],
|
||||
},
|
||||
}, {
|
||||
'manifest_url': 'https://media.axprod.net/TestVectors/v7-MultiDRM-SingleKey/Manifest_1080p_ClearKey.mpd',
|
||||
'ext': 'mp4',
|
||||
'format_id': '5',
|
||||
'format_note': 'DASH video',
|
||||
'protocol': 'http_dash_segments',
|
||||
'acodec': 'none',
|
||||
'vcodec': 'avc1.640033',
|
||||
'tbr': 2726.377,
|
||||
'width': 1920,
|
||||
'height': 1080,
|
||||
'dash_cenc': {
|
||||
'laurl': 'https://drm-clearkey-testvectors.axtest.net/AcquireLicense',
|
||||
'key_ids': ['9eb4050de44b4802932e27d75083e266'],
|
||||
},
|
||||
}],
|
||||
{},
|
||||
), (
|
||||
# default CENC KID overridden via W3C PSSH box, no license server in manifest
|
||||
'w3c_pssh',
|
||||
'https://unknown/manifest.mpd', # mpd_url
|
||||
'https://unknown/', # mpd_base_url
|
||||
[{
|
||||
'manifest_url': 'https://unknown/manifest.mpd',
|
||||
'ext': 'mp4',
|
||||
'format_id': '1',
|
||||
'format_note': 'DASH video',
|
||||
'protocol': 'http_dash_segments',
|
||||
'acodec': 'none',
|
||||
'vcodec': 'avc1.64001f',
|
||||
'tbr': 389.802,
|
||||
'width': 512,
|
||||
'height': 288,
|
||||
'dash_cenc': {
|
||||
'key_ids': ['43215678123412341234123412341234'],
|
||||
},
|
||||
'has_drm': True,
|
||||
}],
|
||||
{},
|
||||
), (
|
||||
# DASH SEA with AES-128-CBC
|
||||
'dash_sea',
|
||||
'https://unknown/manifest.mpd', # mpd_url
|
||||
'https://unknown/', # mpd_base_url
|
||||
[{
|
||||
'manifest_url': 'https://unknown/manifest.mpd',
|
||||
'ext': 'm4a',
|
||||
'format_id': '5_A_aac_eng_2_127999_2_1_1',
|
||||
'format_note': 'DASH audio',
|
||||
'protocol': 'http_dash_segments',
|
||||
'acodec': 'mp4a.40.2',
|
||||
'vcodec': 'none',
|
||||
'tbr': 127.999,
|
||||
'hls_aes': {
|
||||
'uri': 'https://zavideoplatform.keydelivery.eastus.media.azure.net/?kid=9280864f-064e-48c0-97e0-f2bcb1d8d012',
|
||||
'iv': '0x7BD31E102B0CE9CCD39691782533656C',
|
||||
},
|
||||
}, {
|
||||
'manifest_url': 'https://unknown/manifest.mpd',
|
||||
'ext': 'mp4',
|
||||
'format_id': '1_V_video_3',
|
||||
'format_note': 'DASH video',
|
||||
'protocol': 'http_dash_segments',
|
||||
'acodec': 'none',
|
||||
'vcodec': 'avc1.64001F',
|
||||
'tbr': 258.591,
|
||||
'width': 960,
|
||||
'height': 540,
|
||||
'hls_aes': {
|
||||
'uri': 'https://zavideoplatform.keydelivery.eastus.media.azure.net/?kid=9280864f-064e-48c0-97e0-f2bcb1d8d012',
|
||||
'iv': '0x7BD31E102B0CE9CCD39691782533656C',
|
||||
},
|
||||
}, {
|
||||
'manifest_url': 'https://unknown/manifest.mpd',
|
||||
'ext': 'mp4',
|
||||
'format_id': '1_V_video_2',
|
||||
'format_note': 'DASH video',
|
||||
'protocol': 'http_dash_segments',
|
||||
'acodec': 'none',
|
||||
'vcodec': 'avc1.64001F',
|
||||
'tbr': 422.519,
|
||||
'width': 1280,
|
||||
'height': 720,
|
||||
'hls_aes': {
|
||||
'uri': 'https://zavideoplatform.keydelivery.eastus.media.azure.net/?kid=9280864f-064e-48c0-97e0-f2bcb1d8d012',
|
||||
'iv': '0x7BD31E102B0CE9CCD39691782533656C',
|
||||
},
|
||||
}, {
|
||||
'manifest_url': 'https://unknown/manifest.mpd',
|
||||
'ext': 'mp4',
|
||||
'format_id': '1_V_video_1',
|
||||
'format_note': 'DASH video',
|
||||
'protocol': 'http_dash_segments',
|
||||
'acodec': 'none',
|
||||
'vcodec': 'avc1.640028',
|
||||
'tbr': 628.102,
|
||||
'width': 1920,
|
||||
'height': 1080,
|
||||
'hls_aes': {
|
||||
'uri': 'https://zavideoplatform.keydelivery.eastus.media.azure.net/?kid=9280864f-064e-48c0-97e0-f2bcb1d8d012',
|
||||
'iv': '0x7BD31E102B0CE9CCD39691782533656C',
|
||||
},
|
||||
}],
|
||||
{},
|
||||
),
|
||||
]
|
||||
|
||||
|
|
|
|||
29
test/testdata/mpd/clearkey_cenc.mpd
vendored
Normal file
29
test/testdata/mpd/clearkey_cenc.mpd
vendored
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Version information:
|
||||
Axinom.MediaProcessing v3.0.0 targeting General Purpose Media Format specification v7
|
||||
ffmpeg version N-81423-g61fac0e Copyright (c) 2000-2016 the FFmpeg developers
|
||||
x265 [info]: HEVC encoder version 2.0+12-49a0d1176aef5bc6
|
||||
x264 0.148.2705 3f5ed56
|
||||
MP4Box - GPAC version 0.6.2-DEV-rev683-g7b29fbe-master
|
||||
MediaInfoLib - v0.7.87
|
||||
|
||||
For more info about this video, see https://github.com/Axinom/dash-test-vectors
|
||||
-->
|
||||
<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" minBufferTime="PT1.500S" type="static" mediaPresentationDuration="PT0H12M14.000S" maxSegmentDuration="PT0H0M4.000S" profiles="urn:mpeg:dash:profile:isoff-live:2011,http://dashif.org/guidelines/dash264" xmlns:cenc="urn:mpeg:cenc:2013" xmlns:clearkey="http://dashif.org/guidelines/clearKey">
|
||||
<Period duration="PT0H12M14.000S">
|
||||
<AdaptationSet segmentAlignment="true" group="1" maxWidth="1920" maxHeight="1080" maxFrameRate="24" par="16:9" lang="und">
|
||||
<ContentProtection schemeIdUri="urn:mpeg:dash:mp4protection:2011" value="cenc" cenc:default_KID="9eb4050d-e44b-4802-932e-27d75083e266" />
|
||||
<ContentProtection value="ClearKey1.0" schemeIdUri="urn:uuid:e2719d58-a985-b3c9-781a-b030af78d30e">
|
||||
<clearkey:Laurl Lic_type="EME-1.0">https://drm-clearkey-testvectors.axtest.net/AcquireLicense</clearkey:Laurl>
|
||||
</ContentProtection>
|
||||
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main" />
|
||||
<SegmentTemplate timescale="24" media="$RepresentationID$/$Number%04d$.m4s" startNumber="1" duration="96" initialization="$RepresentationID$/init.mp4" />
|
||||
<Representation id="1" mimeType="video/mp4" codecs="avc1.64001f" width="512" height="288" frameRate="24" sar="1:1" startWithSAP="1" bandwidth="389802"></Representation>
|
||||
<Representation id="2" mimeType="video/mp4" codecs="avc1.64001f" width="640" height="360" frameRate="24" sar="1:1" startWithSAP="1" bandwidth="764935"></Representation>
|
||||
<Representation id="3" mimeType="video/mp4" codecs="avc1.640028" width="852" height="480" frameRate="24" sar="640:639" startWithSAP="1" bandwidth="1120439"></Representation>
|
||||
<Representation id="4" mimeType="video/mp4" codecs="avc1.640032" width="1280" height="720" frameRate="24" sar="1:1" startWithSAP="1" bandwidth="1945258"></Representation>
|
||||
<Representation id="5" mimeType="video/mp4" codecs="avc1.640033" width="1920" height="1080" frameRate="24" sar="1:1" startWithSAP="1" bandwidth="2726377"></Representation>
|
||||
</AdaptationSet>
|
||||
</Period>
|
||||
</MPD>
|
||||
109
test/testdata/mpd/dash_sea.mpd
vendored
Normal file
109
test/testdata/mpd/dash_sea.mpd
vendored
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<MPD
|
||||
xmlns="urn:mpeg:dash:schema:mpd:2011"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" profiles="urn:mpeg:dash:profile:isoff-live:2011" type="static"
|
||||
xmlns:sea="urn:mpeg:dash:schema:sea:2012" mediaPresentationDuration="PT3M32.949S" minBufferTime="PT3S">
|
||||
<Period>
|
||||
<AdaptationSet id="1" group="5" profiles="ccff" bitstreamSwitching="false" segmentAlignment="true" contentType="audio" mimeType="audio/mp4" codecs="mp4a.40.2" lang="en">
|
||||
<ContentProtection schemeIdUri="urn:mpeg:dash:sea:2012">
|
||||
<sea:SegmentEncryption schemeIdUri="urn:mpeg:dash:sea:aes128-cbc:2013"/>
|
||||
<sea:KeySystem keySystemUri="urn:mpeg:dash:sea:keysys:http:2013"/>
|
||||
<sea:CryptoPeriod keyUriTemplate="https://zavideoplatform.keydelivery.eastus.media.azure.net/?kid=9280864f-064e-48c0-97e0-f2bcb1d8d012" IV="0x7BD31E102B0CE9CCD39691782533656C"/>
|
||||
</ContentProtection>
|
||||
<Label>aac_eng_2_127999_2_1</Label>
|
||||
<SegmentTemplate timescale="10000000" media="QualityLevels($Bandwidth$)/Fragments(aac_eng_2_127999_2_1=$Time$,format=mpd-time-csf)" initialization="QualityLevels($Bandwidth$)/Fragments(aac_eng_2_127999_2_1=i,format=mpd-time-csf)">
|
||||
<SegmentTimeline>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333" r="1"/>
|
||||
<S d="20053334"/>
|
||||
<S d="20053333"/>
|
||||
<S d="3840000"/>
|
||||
</SegmentTimeline>
|
||||
</SegmentTemplate>
|
||||
<Representation id="5_A_aac_eng_2_127999_2_1_1" bandwidth="127999" audioSamplingRate="48000"/>
|
||||
</AdaptationSet>
|
||||
<AdaptationSet id="2" group="1" profiles="ccff" bitstreamSwitching="false" segmentAlignment="true" contentType="video" mimeType="video/mp4" codecs="avc1.640028" maxWidth="1920" maxHeight="1080" startWithSAP="1">
|
||||
<ContentProtection schemeIdUri="urn:mpeg:dash:sea:2012">
|
||||
<sea:SegmentEncryption schemeIdUri="urn:mpeg:dash:sea:aes128-cbc:2013"/>
|
||||
<sea:KeySystem keySystemUri="urn:mpeg:dash:sea:keysys:http:2013"/>
|
||||
<sea:CryptoPeriod keyUriTemplate="https://zavideoplatform.keydelivery.eastus.media.azure.net/?kid=9280864f-064e-48c0-97e0-f2bcb1d8d012" IV="0x7BD31E102B0CE9CCD39691782533656C"/>
|
||||
</ContentProtection>
|
||||
<SegmentTemplate timescale="10000000" media="QualityLevels($Bandwidth$)/Fragments(video=$Time$,format=mpd-time-csf)" initialization="QualityLevels($Bandwidth$)/Fragments(video=i,format=mpd-time-csf)">
|
||||
<SegmentTimeline>
|
||||
<S d="20000000" r="105"/>
|
||||
<S d="8666666"/>
|
||||
</SegmentTimeline>
|
||||
</SegmentTemplate>
|
||||
<Representation id="1_V_video_1" bandwidth="628102" width="1920" height="1080"/>
|
||||
<Representation id="1_V_video_2" bandwidth="422519" codecs="avc1.64001F" width="1280" height="720"/>
|
||||
<Representation id="1_V_video_3" bandwidth="258591" codecs="avc1.64001F" width="960" height="540"/>
|
||||
</AdaptationSet>
|
||||
</Period>
|
||||
</MPD>
|
||||
13
test/testdata/mpd/w3c_pssh.mpd
vendored
Normal file
13
test/testdata/mpd/w3c_pssh.mpd
vendored
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
<MPD xmlns="urn:mpeg:dash:schema:mpd:2011" minBufferTime="PT1.500S" type="static" mediaPresentationDuration="PT0H12M14.000S" maxSegmentDuration="PT0H0M4.000S" profiles="urn:mpeg:dash:profile:isoff-live:2011,http://dashif.org/guidelines/dash264" xmlns:cenc="urn:mpeg:cenc:2013" xmlns:clearkey="http://dashif.org/guidelines/clearKey">
|
||||
<Period duration="PT0H12M14.000S">
|
||||
<AdaptationSet segmentAlignment="true" group="1" maxWidth="1920" maxHeight="1080" maxFrameRate="24" par="16:9" lang="und">
|
||||
<ContentProtection schemeIdUri="urn:mpeg:dash:mp4protection:2011" value="cenc" cenc:default_KID="9eb4050d-e44b-4802-932e-27d75083e266" />
|
||||
<ContentProtection schemeIdUri="urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b">
|
||||
<cenc:pssh>AAAANHBzc2gBAAAAEHfv7MCyTQKs4zweUuL7SwAAAAFDIVZ4EjQSNBI0EjQSNBI0AAAAAA==</cenc:pssh>
|
||||
</ContentProtection>
|
||||
<Role schemeIdUri="urn:mpeg:dash:role:2011" value="main" />
|
||||
<SegmentTemplate timescale="24" media="$RepresentationID$/$Number%04d$.m4s" startNumber="1" duration="96" initialization="$RepresentationID$/init.mp4" />
|
||||
<Representation id="1" mimeType="video/mp4" codecs="avc1.64001f" width="512" height="288" frameRate="24" sar="1:1" startWithSAP="1" bandwidth="389802"></Representation>
|
||||
</AdaptationSet>
|
||||
</Period>
|
||||
</MPD>
|
||||
|
|
@ -48,6 +48,7 @@ from .plugins import directories as plugin_directories
|
|||
from .postprocessor import _PLUGIN_CLASSES as plugin_pps
|
||||
from .postprocessor import (
|
||||
EmbedThumbnailPP,
|
||||
FFmpegCENCDecryptPP,
|
||||
FFmpegFixupDuplicateMoovPP,
|
||||
FFmpegFixupDurationPP,
|
||||
FFmpegFixupM3u8PP,
|
||||
|
|
@ -3380,6 +3381,8 @@ class YoutubeDL:
|
|||
self.report_error(f'{msg}. Aborting')
|
||||
return
|
||||
|
||||
decrypter = FFmpegCENCDecryptPP(self)
|
||||
info_dict.setdefault('__files_to_cenc_decrypt', [])
|
||||
if info_dict.get('requested_formats') is not None:
|
||||
old_ext = info_dict['ext']
|
||||
if self.params.get('merge_output_format') is None:
|
||||
|
|
@ -3460,8 +3463,12 @@ class YoutubeDL:
|
|||
downloaded.append(fname)
|
||||
partial_success, real_download = self.dl(fname, new_info)
|
||||
info_dict['__real_download'] = info_dict['__real_download'] or real_download
|
||||
if new_info.get('dash_cenc', {}).get('key'):
|
||||
info_dict['__files_to_cenc_decrypt'].append((fname, new_info['dash_cenc']['key']))
|
||||
success = success and partial_success
|
||||
|
||||
if downloaded and info_dict['__files_to_cenc_decrypt'] and decrypter.available:
|
||||
info_dict['__postprocessors'].append(decrypter)
|
||||
if downloaded and merger.available and not self.params.get('allow_unplayable_formats'):
|
||||
info_dict['__postprocessors'].append(merger)
|
||||
info_dict['__files_to_merge'] = downloaded
|
||||
|
|
@ -3478,6 +3485,9 @@ class YoutubeDL:
|
|||
# So we should try to resume the download
|
||||
success, real_download = self.dl(temp_filename, info_dict)
|
||||
info_dict['__real_download'] = real_download
|
||||
if info_dict.get('dash_cenc', {}).get('key') and decrypter.available:
|
||||
info_dict['__postprocessors'].append(decrypter)
|
||||
info_dict['__files_to_cenc_decrypt'] = [(temp_filename, info_dict['dash_cenc']['key'])]
|
||||
else:
|
||||
self.report_file_already_downloaded(dl_filename)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,14 @@
|
|||
import base64
|
||||
import binascii
|
||||
import json
|
||||
import time
|
||||
import urllib.parse
|
||||
|
||||
from . import get_suitable_downloader
|
||||
from .fragment import FragmentFD
|
||||
from ..utils import update_url_query, urljoin
|
||||
from ..networking import Request
|
||||
from ..networking.exceptions import RequestError
|
||||
from ..utils import remove_start, traverse_obj, update_url_query, urljoin
|
||||
|
||||
|
||||
class DashSegmentsFD(FragmentFD):
|
||||
|
|
@ -49,6 +54,25 @@ class DashSegmentsFD(FragmentFD):
|
|||
if extra_param_to_segment_url:
|
||||
extra_query = urllib.parse.parse_qs(extra_param_to_segment_url)
|
||||
|
||||
hls_aes = fmt.get('hls_aes', {})
|
||||
if hls_aes:
|
||||
decrypt_info = {'METHOD', 'AES-128'}
|
||||
key = hls_aes.get('key')
|
||||
if key:
|
||||
key = binascii.unhexlify(remove_start(key, '0x'))
|
||||
assert len(key) in (16, 24, 32), 'Invalid length for HLS AES-128 key'
|
||||
decrypt_info['KEY'] = key
|
||||
iv = hls_aes.get('iv')
|
||||
if iv:
|
||||
iv = binascii.unhexlify(remove_start(iv, '0x').zfill(32))
|
||||
decrypt_info['IV'] = iv
|
||||
uri = hls_aes.get('uri')
|
||||
if uri:
|
||||
if extra_query:
|
||||
uri = update_url_query(uri, extra_query)
|
||||
decrypt_info['URI'] = uri
|
||||
ctx['decrypt_info'] = decrypt_info
|
||||
|
||||
fragments_to_download = self._get_fragments(fmt, ctx, extra_query)
|
||||
|
||||
if real_downloader:
|
||||
|
|
@ -60,6 +84,12 @@ class DashSegmentsFD(FragmentFD):
|
|||
|
||||
args.append([ctx, fragments_to_download, fmt])
|
||||
|
||||
cenc_key = traverse_obj(info_dict, ('dash_cenc', 'key'))
|
||||
cenc_key_ids = traverse_obj(info_dict, ('dash_cenc', 'key_ids'))
|
||||
clearkey_laurl = traverse_obj(info_dict, ('dash_cenc', 'laurl'))
|
||||
if not cenc_key and cenc_key_ids and clearkey_laurl:
|
||||
self._get_clearkey_cenc(info_dict, clearkey_laurl, cenc_key_ids)
|
||||
|
||||
return self.download_and_append_fragments_multiple(*args, is_fatal=lambda idx: idx == 0)
|
||||
|
||||
def _resolve_fragments(self, fragments, ctx):
|
||||
|
|
@ -87,4 +117,35 @@ class DashSegmentsFD(FragmentFD):
|
|||
'fragment_count': fragment.get('fragment_count'),
|
||||
'index': i,
|
||||
'url': fragment_url,
|
||||
'decrypt_info': ctx.get('decrypt_info', {'METHOD': 'NONE'}),
|
||||
}
|
||||
|
||||
def _get_clearkey_cenc(self, info_dict, laurl, key_ids):
|
||||
dash_cenc = info_dict.get('dash_cenc', {})
|
||||
payload = json.dumps({
|
||||
'kids': [
|
||||
base64.urlsafe_b64encode(bytes.fromhex(k)).decode().rstrip('=')
|
||||
for k in key_ids
|
||||
],
|
||||
'type': 'temporary',
|
||||
}).encode()
|
||||
try:
|
||||
response = self.ydl.urlopen(Request(
|
||||
laurl, data=payload, headers={'Content-Type': 'application/json'}))
|
||||
data = json.loads(response.read())
|
||||
except (RequestError, json.JSONDecodeError) as err:
|
||||
self.report_error(f'Failed to retrieve key from Clear Key license server: {err}')
|
||||
return
|
||||
keys = data.get('keys', [])
|
||||
if len(keys) > 1:
|
||||
self.report_warning('Clear Key license server returned multiple keys but only single key CENC is supported')
|
||||
for key in keys:
|
||||
k = key.get('k')
|
||||
if k:
|
||||
try:
|
||||
dash_cenc.update({'key': base64.urlsafe_b64decode(f'{k}==').hex()})
|
||||
info_dict['dash_cenc'] = dash_cenc
|
||||
return
|
||||
except (ValueError, binascii.Error):
|
||||
pass
|
||||
self.report_error('Clear key license server did not return any valid CENC keys')
|
||||
|
|
|
|||
|
|
@ -1939,7 +1939,6 @@ from .spotify import (
|
|||
)
|
||||
from .spreaker import (
|
||||
SpreakerIE,
|
||||
SpreakerPageIE,
|
||||
SpreakerShowIE,
|
||||
SpreakerShowPageIE,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -14,12 +14,14 @@ import netrc
|
|||
import os
|
||||
import random
|
||||
import re
|
||||
import struct
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
import types
|
||||
import urllib.parse
|
||||
import urllib.request
|
||||
import uuid
|
||||
import xml.etree.ElementTree
|
||||
|
||||
from ..compat import (
|
||||
|
|
@ -247,7 +249,9 @@ class InfoExtractor:
|
|||
* hls_aes A dictionary of HLS AES-128 decryption information
|
||||
used by the native HLS downloader to override the
|
||||
values in the media playlist when an '#EXT-X-KEY' tag
|
||||
is present in the playlist:
|
||||
is present in the playlist. Used by the native DASH downloader
|
||||
when DASH-SEA with AES-128-CBC content protection is present
|
||||
in the manifest.:
|
||||
* uri The URI from which the key will be downloaded
|
||||
* key The key (as hex) used to decrypt fragments.
|
||||
If `key` is given, any key URI will be ignored
|
||||
|
|
@ -259,6 +263,16 @@ class InfoExtractor:
|
|||
* ffmpeg_args_out Extra arguments for ffmpeg downloader (output)
|
||||
* is_dash_periods Whether the format is a result of merging
|
||||
multiple DASH periods.
|
||||
* dash_cenc A dictionary of DASH CENC decryption information
|
||||
used by the native DASH downloader when MPEG CENC content protection
|
||||
is present in the manifest.
|
||||
* laurl The Clear Key license server URL from which
|
||||
CENC keys will be downloaded.
|
||||
* key_ids List of key IDs (as hex) to request from the ClearKey
|
||||
license server.
|
||||
* key The CENC key (as hex) used to decrypt fragments.
|
||||
If `key` is given, any license server URL and
|
||||
key IDs will be ignored.
|
||||
RTMP formats can also have the additional fields: page_url,
|
||||
app, play_path, tc_url, flash_version, rtmp_live, rtmp_conn,
|
||||
rtmp_protocol, rtmp_real_time
|
||||
|
|
@ -2679,7 +2693,11 @@ class InfoExtractor:
|
|||
assert 'is_dash_periods' not in f, 'format already processed'
|
||||
f['is_dash_periods'] = True
|
||||
format_key = tuple(v for k, v in f.items() if k not in (
|
||||
('format_id', 'fragments', 'manifest_stream_number')))
|
||||
('format_id', 'fragments', 'manifest_stream_number', 'dash_cenc', 'hls_aes')))
|
||||
for k in ('dash_cenc', 'hls_aes'):
|
||||
if k in f:
|
||||
format_key = format_key + tuple(
|
||||
tuple(v) if isinstance(v, list) else v for v in f[k].values())
|
||||
if format_key not in formats:
|
||||
formats[format_key] = f
|
||||
elif 'fragments' in f:
|
||||
|
|
@ -2713,8 +2731,16 @@ class InfoExtractor:
|
|||
def _add_ns(path):
|
||||
return self._xpath_ns(path, namespace)
|
||||
|
||||
def is_drm_protected(element):
|
||||
return element.find(_add_ns('ContentProtection')) is not None
|
||||
def extract_drm_info(element):
|
||||
info = {}
|
||||
has_drm = False
|
||||
for cp_e in element.findall(_add_ns('ContentProtection')):
|
||||
has_drm = True
|
||||
self._extract_mpd_content_protection_info(cp_e, info)
|
||||
cenc_info = info.get('dash_cenc', {})
|
||||
if has_drm and not ('hls_aes' in info or cenc_info.get('key') or (cenc_info.get('laurl') and cenc_info.get('key_ids'))):
|
||||
info['has_drm'] = True
|
||||
return info
|
||||
|
||||
def extract_multisegment_info(element, ms_parent_info):
|
||||
ms_info = ms_parent_info.copy()
|
||||
|
|
@ -2788,6 +2814,7 @@ class InfoExtractor:
|
|||
'timescale': 1,
|
||||
})
|
||||
for adaptation_set in period.findall(_add_ns('AdaptationSet')):
|
||||
adaptation_set_drm_info = extract_drm_info(adaptation_set)
|
||||
adaption_set_ms_info = extract_multisegment_info(adaptation_set, period_ms_info)
|
||||
for representation in adaptation_set.findall(_add_ns('Representation')):
|
||||
representation_attrib = adaptation_set.attrib.copy()
|
||||
|
|
@ -2874,8 +2901,8 @@ class InfoExtractor:
|
|||
'acodec': 'none',
|
||||
'vcodec': 'none',
|
||||
}
|
||||
if is_drm_protected(adaptation_set) or is_drm_protected(representation):
|
||||
f['has_drm'] = True
|
||||
f.update(adaptation_set_drm_info)
|
||||
f.update(extract_drm_info(representation))
|
||||
representation_ms_info = extract_multisegment_info(representation, adaption_set_ms_info)
|
||||
|
||||
def prepare_template(template_name, identifiers):
|
||||
|
|
@ -3036,6 +3063,86 @@ class InfoExtractor:
|
|||
period_entry['subtitles'][lang or 'und'].append(f)
|
||||
yield period_entry
|
||||
|
||||
def _extract_mpd_content_protection_info(self, cp_e, info):
|
||||
"""
|
||||
Extract supported DASH-CENC parameters for an MPD ContentProtection element.
|
||||
|
||||
Called multiple times per extracted format in an MPD (once per ContentProtection element
|
||||
within AdaptationSet and Representation elements). Subclasses may override this method
|
||||
when necessary (such as when the Clear Key license server URL is provided separately
|
||||
from the manifest or when an extractor needs to process the optional data section in W3C
|
||||
PSSH boxes).
|
||||
|
||||
Note that after all ContentProtection elements have been handled, the `has_drm` flag
|
||||
will be set for any format that does not meet one or more of these conditions:
|
||||
|
||||
* `dash_cenc` is set and both `laurl` and `key_ids` are set (indicating the native
|
||||
DASH downloader should use the specified Clear Key server URL to retreive the
|
||||
CENC key for this format).
|
||||
* `dash_cenc` is set and `key` is set (indicating the native DASH downloader should
|
||||
use the specified CENC key for this format).
|
||||
* `hls_aes` is set (indicating the native DASH downloader should use DASH SEA
|
||||
AES-128-CBC decryption for this format).
|
||||
|
||||
References:
|
||||
1. DASH-IF Content Protection Identifiers
|
||||
https://dashif.org/identifiers/content_protection/
|
||||
2. DASH-IF Content Protection Guidelines
|
||||
https://dashif.org/docs/IOP-Guidelines/DASH-IF-IOP-Part6-v5.0.0.pdf
|
||||
3. W3C "cenc" Initialization Data Format
|
||||
https://w3c.github.io/encrypted-media/format-registry/initdata/cenc.html
|
||||
"""
|
||||
scheme_id = cp_e.get('schemeIdUri')
|
||||
cenc_info = info.get('dash_cenc', {})
|
||||
if scheme_id == 'urn:mpeg:dash:mp4protection:2011':
|
||||
if cp_e.get('value') == 'cenc':
|
||||
# ISO/IEC 23009-1 MPEG Common Encryption (CENC)
|
||||
if not cenc_info.get('key_ids'):
|
||||
try:
|
||||
default_kid = uuid.UUID(cp_e.get('{urn:mpeg:cenc:2013}default_KID')).hex
|
||||
cenc_info['key_ids'] = [default_kid]
|
||||
except (ValueError, TypeError):
|
||||
pass
|
||||
elif scheme_id == 'urn:uuid:e2719d58-a985-b3c9-781a-b030af78d30e':
|
||||
# Clear Key DASH-IF
|
||||
for tag, ns in itertools.product(
|
||||
('Laurl', 'laurl'),
|
||||
('https://dashif.org/CPS', 'http://dashif.org/guidelines/clearKey'),
|
||||
):
|
||||
url_e = cp_e.find(self._xpath_ns(tag, ns))
|
||||
if url_e is not None:
|
||||
cenc_info['laurl'] = url_e.text
|
||||
break
|
||||
elif scheme_id == 'urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b':
|
||||
# W3C Common System ID
|
||||
pssh_e = cp_e.find(self._xpath_ns('pssh', 'urn:mpeg:cenc:2013'))
|
||||
if pssh_e is not None:
|
||||
# W3C PSSH box (may contain Clear Key KIDs but can also be used
|
||||
# to store KIDs for other DRM systems)
|
||||
try:
|
||||
pssh_box = base64.b64decode(pssh_e.text)
|
||||
kid_count, = struct.unpack('!L', pssh_box[28:32])
|
||||
kids = []
|
||||
for i in range(kid_count):
|
||||
kid = pssh_box[32 + i * 16:32 + (i + 1) * 16]
|
||||
kids.append(kid.hex())
|
||||
cenc_info['key_ids'] = kids
|
||||
except (ValueError, TypeError, struct.error):
|
||||
pass
|
||||
elif scheme_id == 'urn:mpeg:dash:sea:2012':
|
||||
# ISO/IEC 23009-4 DASH Segment Encryption and Authentication (AES-128-CBC)
|
||||
sea_ns = 'urn:mpeg:dash:schema:sea:2012'
|
||||
se_e = cp_e.find(self._xpath_ns('SegmentEncryption', sea_ns))
|
||||
ks_e = cp_e.find(self._xpath_ns('KeySystem', sea_ns))
|
||||
crypto_e = cp_e.find(self._xpath_ns('CryptoPeriod', sea_ns))
|
||||
if (se_e is not None and se_e.get('schemeIdUri') == 'urn:mpeg:dash:sea:aes128-cbc:2013'
|
||||
and ks_e is not None and ks_e.get('keySystemUri') == 'urn:mpeg:dash:sea:keysys:http:2013'
|
||||
and crypto_e is not None and crypto_e.get('keyUriTemplate') and crypto_e.get('IV')
|
||||
):
|
||||
info['hls_aes'] = {'uri': crypto_e.get('keyUriTemplate'), 'iv': crypto_e.get('IV')}
|
||||
if cenc_info:
|
||||
info['dash_cenc'] = cenc_info
|
||||
|
||||
def _extract_ism_formats(self, *args, **kwargs):
|
||||
fmts, subs = self._extract_ism_formats_and_subtitles(*args, **kwargs)
|
||||
if subs:
|
||||
|
|
|
|||
|
|
@ -2,15 +2,18 @@ import itertools
|
|||
|
||||
from .common import InfoExtractor
|
||||
from ..utils import (
|
||||
UnsupportedError,
|
||||
bool_or_none,
|
||||
determine_ext,
|
||||
int_or_none,
|
||||
js_to_json,
|
||||
parse_qs,
|
||||
traverse_obj,
|
||||
str_or_none,
|
||||
try_get,
|
||||
unified_timestamp,
|
||||
url_or_none,
|
||||
)
|
||||
from ..utils.traversal import traverse_obj
|
||||
|
||||
|
||||
class RutubeBaseIE(InfoExtractor):
|
||||
|
|
@ -19,7 +22,7 @@ class RutubeBaseIE(InfoExtractor):
|
|||
query = {}
|
||||
query['format'] = 'json'
|
||||
return self._download_json(
|
||||
f'http://rutube.ru/api/video/{video_id}/',
|
||||
f'https://rutube.ru/api/video/{video_id}/',
|
||||
video_id, 'Downloading video JSON',
|
||||
'Unable to download video JSON', query=query)
|
||||
|
||||
|
|
@ -61,18 +64,21 @@ class RutubeBaseIE(InfoExtractor):
|
|||
query = {}
|
||||
query['format'] = 'json'
|
||||
return self._download_json(
|
||||
f'http://rutube.ru/api/play/options/{video_id}/',
|
||||
f'https://rutube.ru/api/play/options/{video_id}/',
|
||||
video_id, 'Downloading options JSON',
|
||||
'Unable to download options JSON',
|
||||
headers=self.geo_verification_headers(), query=query)
|
||||
|
||||
def _extract_formats(self, options, video_id):
|
||||
def _extract_formats_and_subtitles(self, options, video_id):
|
||||
formats = []
|
||||
subtitles = {}
|
||||
for format_id, format_url in options['video_balancer'].items():
|
||||
ext = determine_ext(format_url)
|
||||
if ext == 'm3u8':
|
||||
formats.extend(self._extract_m3u8_formats(
|
||||
format_url, video_id, 'mp4', m3u8_id=format_id, fatal=False))
|
||||
fmts, subs = self._extract_m3u8_formats_and_subtitles(
|
||||
format_url, video_id, 'mp4', m3u8_id=format_id, fatal=False)
|
||||
formats.extend(fmts)
|
||||
self._merge_subtitles(subs, target=subtitles)
|
||||
elif ext == 'f4m':
|
||||
formats.extend(self._extract_f4m_formats(
|
||||
format_url, video_id, f4m_id=format_id, fatal=False))
|
||||
|
|
@ -82,11 +88,19 @@ class RutubeBaseIE(InfoExtractor):
|
|||
'format_id': format_id,
|
||||
})
|
||||
for hls_url in traverse_obj(options, ('live_streams', 'hls', ..., 'url', {url_or_none})):
|
||||
formats.extend(self._extract_m3u8_formats(hls_url, video_id, ext='mp4', fatal=False))
|
||||
return formats
|
||||
fmts, subs = self._extract_m3u8_formats_and_subtitles(
|
||||
hls_url, video_id, 'mp4', fatal=False, m3u8_id='hls')
|
||||
formats.extend(fmts)
|
||||
self._merge_subtitles(subs, target=subtitles)
|
||||
for caption in traverse_obj(options, ('captions', lambda _, v: url_or_none(v['file']))):
|
||||
subtitles.setdefault(caption.get('code') or 'ru', []).append({
|
||||
'url': caption['file'],
|
||||
'name': caption.get('langTitle'),
|
||||
})
|
||||
return formats, subtitles
|
||||
|
||||
def _download_and_extract_formats(self, video_id, query=None):
|
||||
return self._extract_formats(
|
||||
def _download_and_extract_formats_and_subtitles(self, video_id, query=None):
|
||||
return self._extract_formats_and_subtitles(
|
||||
self._download_api_options(video_id, query=query), video_id)
|
||||
|
||||
|
||||
|
|
@ -97,8 +111,8 @@ class RutubeIE(RutubeBaseIE):
|
|||
_EMBED_REGEX = [r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//rutube\.ru/(?:play/)?embed/[\da-z]{32}.*?)\1']
|
||||
|
||||
_TESTS = [{
|
||||
'url': 'http://rutube.ru/video/3eac3b4561676c17df9132a9a1e62e3e/',
|
||||
'md5': 'e33ac625efca66aba86cbec9851f2692',
|
||||
'url': 'https://rutube.ru/video/3eac3b4561676c17df9132a9a1e62e3e/',
|
||||
'md5': '3d73fdfe5bb81b9aef139e22ef3de26a',
|
||||
'info_dict': {
|
||||
'id': '3eac3b4561676c17df9132a9a1e62e3e',
|
||||
'ext': 'mp4',
|
||||
|
|
@ -111,26 +125,25 @@ class RutubeIE(RutubeBaseIE):
|
|||
'upload_date': '20131016',
|
||||
'age_limit': 0,
|
||||
'view_count': int,
|
||||
'thumbnail': 'http://pic.rutubelist.ru/video/d2/a0/d2a0aec998494a396deafc7ba2c82add.jpg',
|
||||
'thumbnail': 'https://pic.rutubelist.ru/video/d2/a0/d2a0aec998494a396deafc7ba2c82add.jpg',
|
||||
'categories': ['Новости и СМИ'],
|
||||
'chapters': [],
|
||||
},
|
||||
'expected_warnings': ['Unable to download f4m'],
|
||||
}, {
|
||||
'url': 'http://rutube.ru/play/embed/a10e53b86e8f349080f718582ce4c661',
|
||||
'url': 'https://rutube.ru/play/embed/a10e53b86e8f349080f718582ce4c661',
|
||||
'only_matching': True,
|
||||
}, {
|
||||
'url': 'http://rutube.ru/embed/a10e53b86e8f349080f718582ce4c661',
|
||||
'url': 'https://rutube.ru/embed/a10e53b86e8f349080f718582ce4c661',
|
||||
'only_matching': True,
|
||||
}, {
|
||||
'url': 'http://rutube.ru/video/3eac3b4561676c17df9132a9a1e62e3e/?pl_id=4252',
|
||||
'url': 'https://rutube.ru/video/3eac3b4561676c17df9132a9a1e62e3e/?pl_id=4252',
|
||||
'only_matching': True,
|
||||
}, {
|
||||
'url': 'https://rutube.ru/video/10b3a03fc01d5bbcc632a2f3514e8aab/?pl_type=source',
|
||||
'only_matching': True,
|
||||
}, {
|
||||
'url': 'https://rutube.ru/video/private/884fb55f07a97ab673c7d654553e0f48/?p=x2QojCumHTS3rsKHWXN8Lg',
|
||||
'md5': 'd106225f15d625538fe22971158e896f',
|
||||
'md5': '4fce7b4fcc7b1bcaa3f45eb1e1ad0dd7',
|
||||
'info_dict': {
|
||||
'id': '884fb55f07a97ab673c7d654553e0f48',
|
||||
'ext': 'mp4',
|
||||
|
|
@ -143,11 +156,10 @@ class RutubeIE(RutubeBaseIE):
|
|||
'upload_date': '20221210',
|
||||
'age_limit': 0,
|
||||
'view_count': int,
|
||||
'thumbnail': 'http://pic.rutubelist.ru/video/f2/d4/f2d42b54be0a6e69c1c22539e3152156.jpg',
|
||||
'thumbnail': 'https://pic.rutubelist.ru/video/f2/d4/f2d42b54be0a6e69c1c22539e3152156.jpg',
|
||||
'categories': ['Видеоигры'],
|
||||
'chapters': [],
|
||||
},
|
||||
'expected_warnings': ['Unable to download f4m'],
|
||||
}, {
|
||||
'url': 'https://rutube.ru/video/c65b465ad0c98c89f3b25cb03dcc87c6/',
|
||||
'info_dict': {
|
||||
|
|
@ -156,17 +168,16 @@ class RutubeIE(RutubeBaseIE):
|
|||
'chapters': 'count:4',
|
||||
'categories': ['Бизнес и предпринимательство'],
|
||||
'description': 'md5:252feac1305257d8c1bab215cedde75d',
|
||||
'thumbnail': 'http://pic.rutubelist.ru/video/71/8f/718f27425ea9706073eb80883dd3787b.png',
|
||||
'thumbnail': 'https://pic.rutubelist.ru/video/71/8f/718f27425ea9706073eb80883dd3787b.png',
|
||||
'duration': 782,
|
||||
'age_limit': 0,
|
||||
'uploader_id': '23491359',
|
||||
'timestamp': 1677153329,
|
||||
'view_count': int,
|
||||
'upload_date': '20230223',
|
||||
'title': 'Бизнес с нуля: найм сотрудников. Интервью с директором строительной компании',
|
||||
'title': 'Бизнес с нуля: найм сотрудников. Интервью с директором строительной компании #1',
|
||||
'uploader': 'Стас Быков',
|
||||
},
|
||||
'expected_warnings': ['Unable to download f4m'],
|
||||
}, {
|
||||
'url': 'https://rutube.ru/live/video/c58f502c7bb34a8fcdd976b221fca292/',
|
||||
'info_dict': {
|
||||
|
|
@ -174,7 +185,7 @@ class RutubeIE(RutubeBaseIE):
|
|||
'ext': 'mp4',
|
||||
'categories': ['Телепередачи'],
|
||||
'description': '',
|
||||
'thumbnail': 'http://pic.rutubelist.ru/video/14/19/14190807c0c48b40361aca93ad0867c7.jpg',
|
||||
'thumbnail': 'https://pic.rutubelist.ru/video/14/19/14190807c0c48b40361aca93ad0867c7.jpg',
|
||||
'live_status': 'is_live',
|
||||
'age_limit': 0,
|
||||
'uploader_id': '23460655',
|
||||
|
|
@ -184,6 +195,24 @@ class RutubeIE(RutubeBaseIE):
|
|||
'title': r're:Первый канал. Прямой эфир \d{4}-\d{2}-\d{2} \d{2}:\d{2}$',
|
||||
'uploader': 'Первый канал',
|
||||
},
|
||||
}, {
|
||||
'url': 'https://rutube.ru/play/embed/03a9cb54bac3376af4c5cb0f18444e01/',
|
||||
'info_dict': {
|
||||
'id': '03a9cb54bac3376af4c5cb0f18444e01',
|
||||
'ext': 'mp4',
|
||||
'age_limit': 0,
|
||||
'description': '',
|
||||
'title': 'Церемония начала торгов акциями ПАО «ЕвроТранс»',
|
||||
'chapters': [],
|
||||
'upload_date': '20240829',
|
||||
'duration': 293,
|
||||
'uploader': 'MOEX - Московская биржа',
|
||||
'timestamp': 1724946628,
|
||||
'thumbnail': 'https://pic.rutubelist.ru/video/2e/24/2e241fddb459baf0fa54acfca44874f4.jpg',
|
||||
'view_count': int,
|
||||
'uploader_id': '38420507',
|
||||
'categories': ['Интервью'],
|
||||
},
|
||||
}, {
|
||||
'url': 'https://rutube.ru/video/5ab908fccfac5bb43ef2b1e4182256b0/',
|
||||
'only_matching': True,
|
||||
|
|
@ -192,40 +221,46 @@ class RutubeIE(RutubeBaseIE):
|
|||
'only_matching': True,
|
||||
}]
|
||||
|
||||
@classmethod
|
||||
def suitable(cls, url):
|
||||
return False if RutubePlaylistIE.suitable(url) else super().suitable(url)
|
||||
|
||||
def _real_extract(self, url):
|
||||
video_id = self._match_id(url)
|
||||
query = parse_qs(url)
|
||||
info = self._download_and_extract_info(video_id, query)
|
||||
info['formats'] = self._download_and_extract_formats(video_id, query)
|
||||
return info
|
||||
formats, subtitles = self._download_and_extract_formats_and_subtitles(video_id, query)
|
||||
return {
|
||||
**info,
|
||||
'formats': formats,
|
||||
'subtitles': subtitles,
|
||||
}
|
||||
|
||||
|
||||
class RutubeEmbedIE(RutubeBaseIE):
|
||||
IE_NAME = 'rutube:embed'
|
||||
IE_DESC = 'Rutube embedded videos'
|
||||
_VALID_URL = r'https?://rutube\.ru/(?:video|play)/embed/(?P<id>[0-9]+)'
|
||||
_VALID_URL = r'https?://rutube\.ru/(?:video|play)/embed/(?P<id>[0-9]+)(?:[?#/]|$)'
|
||||
|
||||
_TESTS = [{
|
||||
'url': 'http://rutube.ru/video/embed/6722881?vk_puid37=&vk_puid38=',
|
||||
'url': 'https://rutube.ru/video/embed/6722881?vk_puid37=&vk_puid38=',
|
||||
'info_dict': {
|
||||
'id': 'a10e53b86e8f349080f718582ce4c661',
|
||||
'ext': 'mp4',
|
||||
'timestamp': 1387830582,
|
||||
'upload_date': '20131223',
|
||||
'uploader_id': '297833',
|
||||
'description': 'Видео группы ★http://vk.com/foxkidsreset★ музей Fox Kids и Jetix<br/><br/> восстановлено и сделано в шикоформате subziro89 http://vk.com/subziro89',
|
||||
'uploader': 'subziro89 ILya',
|
||||
'title': 'Мистический городок Эйри в Индиан 5 серия озвучка subziro89',
|
||||
'age_limit': 0,
|
||||
'duration': 1395,
|
||||
'chapters': [],
|
||||
'description': 'md5:a5acea57bbc3ccdc3cacd1f11a014b5b',
|
||||
'view_count': int,
|
||||
'thumbnail': 'https://pic.rutubelist.ru/video/d3/03/d3031f4670a6e6170d88fb3607948418.jpg',
|
||||
'categories': ['Сериалы'],
|
||||
},
|
||||
'params': {
|
||||
'skip_download': True,
|
||||
},
|
||||
}, {
|
||||
'url': 'http://rutube.ru/play/embed/8083783',
|
||||
'url': 'https://rutube.ru/play/embed/8083783',
|
||||
'only_matching': True,
|
||||
}, {
|
||||
# private video
|
||||
|
|
@ -240,11 +275,12 @@ class RutubeEmbedIE(RutubeBaseIE):
|
|||
query = parse_qs(url)
|
||||
options = self._download_api_options(embed_id, query)
|
||||
video_id = options['effective_video']
|
||||
formats = self._extract_formats(options, video_id)
|
||||
formats, subtitles = self._extract_formats_and_subtitles(options, video_id)
|
||||
info = self._download_and_extract_info(video_id, query)
|
||||
info.update({
|
||||
'extractor_key': 'Rutube',
|
||||
'formats': formats,
|
||||
'subtitles': subtitles,
|
||||
})
|
||||
return info
|
||||
|
||||
|
|
@ -295,14 +331,14 @@ class RutubeTagsIE(RutubePlaylistBaseIE):
|
|||
IE_DESC = 'Rutube tags'
|
||||
_VALID_URL = r'https?://rutube\.ru/tags/video/(?P<id>\d+)'
|
||||
_TESTS = [{
|
||||
'url': 'http://rutube.ru/tags/video/1800/',
|
||||
'url': 'https://rutube.ru/tags/video/1800/',
|
||||
'info_dict': {
|
||||
'id': '1800',
|
||||
},
|
||||
'playlist_mincount': 68,
|
||||
}]
|
||||
|
||||
_PAGE_TEMPLATE = 'http://rutube.ru/api/tags/video/%s/?page=%s&format=json'
|
||||
_PAGE_TEMPLATE = 'https://rutube.ru/api/tags/video/%s/?page=%s&format=json'
|
||||
|
||||
|
||||
class RutubeMovieIE(RutubePlaylistBaseIE):
|
||||
|
|
@ -310,8 +346,8 @@ class RutubeMovieIE(RutubePlaylistBaseIE):
|
|||
IE_DESC = 'Rutube movies'
|
||||
_VALID_URL = r'https?://rutube\.ru/metainfo/tv/(?P<id>\d+)'
|
||||
|
||||
_MOVIE_TEMPLATE = 'http://rutube.ru/api/metainfo/tv/%s/?format=json'
|
||||
_PAGE_TEMPLATE = 'http://rutube.ru/api/metainfo/tv/%s/video?page=%s&format=json'
|
||||
_MOVIE_TEMPLATE = 'https://rutube.ru/api/metainfo/tv/%s/?format=json'
|
||||
_PAGE_TEMPLATE = 'https://rutube.ru/api/metainfo/tv/%s/video?page=%s&format=json'
|
||||
|
||||
def _real_extract(self, url):
|
||||
movie_id = self._match_id(url)
|
||||
|
|
@ -327,62 +363,82 @@ class RutubePersonIE(RutubePlaylistBaseIE):
|
|||
IE_DESC = 'Rutube person videos'
|
||||
_VALID_URL = r'https?://rutube\.ru/video/person/(?P<id>\d+)'
|
||||
_TESTS = [{
|
||||
'url': 'http://rutube.ru/video/person/313878/',
|
||||
'url': 'https://rutube.ru/video/person/313878/',
|
||||
'info_dict': {
|
||||
'id': '313878',
|
||||
},
|
||||
'playlist_mincount': 37,
|
||||
'playlist_mincount': 36,
|
||||
}]
|
||||
|
||||
_PAGE_TEMPLATE = 'http://rutube.ru/api/video/person/%s/?page=%s&format=json'
|
||||
_PAGE_TEMPLATE = 'https://rutube.ru/api/video/person/%s/?page=%s&format=json'
|
||||
|
||||
|
||||
class RutubePlaylistIE(RutubePlaylistBaseIE):
|
||||
IE_NAME = 'rutube:playlist'
|
||||
IE_DESC = 'Rutube playlists'
|
||||
_VALID_URL = r'https?://rutube\.ru/(?:video|(?:play/)?embed)/[\da-z]{32}/\?.*?\bpl_id=(?P<id>\d+)'
|
||||
_VALID_URL = r'https?://rutube\.ru/plst/(?P<id>\d+)'
|
||||
_TESTS = [{
|
||||
'url': 'https://rutube.ru/video/cecd58ed7d531fc0f3d795d51cee9026/?pl_id=3097&pl_type=tag',
|
||||
'url': 'https://rutube.ru/plst/308547/',
|
||||
'info_dict': {
|
||||
'id': '3097',
|
||||
'id': '308547',
|
||||
},
|
||||
'playlist_count': 27,
|
||||
}, {
|
||||
'url': 'https://rutube.ru/video/10b3a03fc01d5bbcc632a2f3514e8aab/?pl_id=4252&pl_type=source',
|
||||
'only_matching': True,
|
||||
'playlist_mincount': 22,
|
||||
}]
|
||||
|
||||
_PAGE_TEMPLATE = 'http://rutube.ru/api/playlist/%s/%s/?page=%s&format=json'
|
||||
|
||||
@classmethod
|
||||
def suitable(cls, url):
|
||||
from ..utils import int_or_none, parse_qs
|
||||
|
||||
if not super().suitable(url):
|
||||
return False
|
||||
params = parse_qs(url)
|
||||
return params.get('pl_type', [None])[0] and int_or_none(params.get('pl_id', [None])[0])
|
||||
|
||||
def _next_page_url(self, page_num, playlist_id, item_kind):
|
||||
return self._PAGE_TEMPLATE % (item_kind, playlist_id, page_num)
|
||||
|
||||
def _real_extract(self, url):
|
||||
qs = parse_qs(url)
|
||||
playlist_kind = qs['pl_type'][0]
|
||||
playlist_id = qs['pl_id'][0]
|
||||
return self._extract_playlist(playlist_id, item_kind=playlist_kind)
|
||||
_PAGE_TEMPLATE = 'https://rutube.ru/api/playlist/custom/%s/videos?page=%s&format=json'
|
||||
|
||||
|
||||
class RutubeChannelIE(RutubePlaylistBaseIE):
|
||||
IE_NAME = 'rutube:channel'
|
||||
IE_DESC = 'Rutube channel'
|
||||
_VALID_URL = r'https?://rutube\.ru/channel/(?P<id>\d+)/videos'
|
||||
_VALID_URL = r'https?://rutube\.ru/(?:channel/(?P<id>\d+)|u/(?P<slug>\w+))(?:/(?P<section>videos|shorts|playlists))?'
|
||||
_TESTS = [{
|
||||
'url': 'https://rutube.ru/channel/639184/videos/',
|
||||
'info_dict': {
|
||||
'id': '639184',
|
||||
'id': '639184_videos',
|
||||
},
|
||||
'playlist_mincount': 133,
|
||||
'playlist_mincount': 129,
|
||||
}, {
|
||||
'url': 'https://rutube.ru/channel/25902603/shorts/',
|
||||
'info_dict': {
|
||||
'id': '25902603_shorts',
|
||||
},
|
||||
'playlist_mincount': 277,
|
||||
}, {
|
||||
'url': 'https://rutube.ru/channel/25902603/',
|
||||
'info_dict': {
|
||||
'id': '25902603',
|
||||
},
|
||||
'playlist_mincount': 406,
|
||||
}, {
|
||||
'url': 'https://rutube.ru/u/rutube/videos/',
|
||||
'info_dict': {
|
||||
'id': '23704195_videos',
|
||||
},
|
||||
'playlist_mincount': 113,
|
||||
}]
|
||||
|
||||
_PAGE_TEMPLATE = 'http://rutube.ru/api/video/person/%s/?page=%s&format=json'
|
||||
_PAGE_TEMPLATE = 'https://rutube.ru/api/video/person/%s/?page=%s&format=json&origin__type=%s'
|
||||
|
||||
def _next_page_url(self, page_num, playlist_id, section):
|
||||
origin_type = {
|
||||
'videos': 'rtb,rst,ifrm,rspa',
|
||||
'shorts': 'rshorts',
|
||||
None: '',
|
||||
}.get(section)
|
||||
return self._PAGE_TEMPLATE % (playlist_id, page_num, origin_type)
|
||||
|
||||
def _real_extract(self, url):
|
||||
playlist_id, slug, section = self._match_valid_url(url).group('id', 'slug', 'section')
|
||||
if section == 'playlists':
|
||||
raise UnsupportedError(url)
|
||||
if slug:
|
||||
webpage = self._download_webpage(url, slug)
|
||||
redux_state = self._search_json(
|
||||
r'window\.reduxState\s*=', webpage, 'redux state', slug, transform_source=js_to_json)
|
||||
playlist_id = traverse_obj(redux_state, (
|
||||
'api', 'queries', lambda k, _: k.startswith('channelIdBySlug'),
|
||||
'data', 'channel_id', {int}, {str_or_none}, any))
|
||||
playlist = self._extract_playlist(playlist_id, section=section)
|
||||
if section:
|
||||
playlist['id'] = f'{playlist_id}_{section}'
|
||||
return playlist
|
||||
|
|
|
|||
|
|
@ -4,11 +4,13 @@ from .common import InfoExtractor
|
|||
from ..utils import (
|
||||
float_or_none,
|
||||
int_or_none,
|
||||
parse_qs,
|
||||
str_or_none,
|
||||
try_get,
|
||||
unified_timestamp,
|
||||
url_or_none,
|
||||
)
|
||||
from ..utils.traversal import traverse_obj
|
||||
|
||||
|
||||
def _extract_episode(data, episode_id=None):
|
||||
|
|
@ -58,15 +60,10 @@ def _extract_episode(data, episode_id=None):
|
|||
|
||||
|
||||
class SpreakerIE(InfoExtractor):
|
||||
_VALID_URL = r'''(?x)
|
||||
https?://
|
||||
api\.spreaker\.com/
|
||||
(?:
|
||||
(?:download/)?episode|
|
||||
v2/episodes
|
||||
)/
|
||||
(?P<id>\d+)
|
||||
'''
|
||||
_VALID_URL = [
|
||||
r'https?://api\.spreaker\.com/(?:(?:download/)?episode|v2/episodes)/(?P<id>\d+)',
|
||||
r'https?://(?:www\.)?spreaker\.com/episode/[^#?/]*?(?P<id>\d+)/?(?:[?#]|$)',
|
||||
]
|
||||
_TESTS = [{
|
||||
'url': 'https://api.spreaker.com/episode/12534508',
|
||||
'info_dict': {
|
||||
|
|
@ -83,7 +80,9 @@ class SpreakerIE(InfoExtractor):
|
|||
'view_count': int,
|
||||
'like_count': int,
|
||||
'comment_count': int,
|
||||
'series': 'Success With Music (SWM)',
|
||||
'series': 'Success With Music | SWM',
|
||||
'thumbnail': 'https://d3wo5wojvuv7l.cloudfront.net/t_square_limited_160/images.spreaker.com/original/777ce4f96b71b0e1b7c09a5e625210e3.jpg',
|
||||
'creators': ['SWM'],
|
||||
},
|
||||
}, {
|
||||
'url': 'https://api.spreaker.com/download/episode/12534508/swm_ep15_how_to_market_your_music_part_2.mp3',
|
||||
|
|
@ -91,34 +90,40 @@ class SpreakerIE(InfoExtractor):
|
|||
}, {
|
||||
'url': 'https://api.spreaker.com/v2/episodes/12534508?export=episode_segments',
|
||||
'only_matching': True,
|
||||
}, {
|
||||
'note': 'episode',
|
||||
'url': 'https://www.spreaker.com/episode/grunge-music-origins-the-raw-sound-that-defined-a-generation--60269615',
|
||||
'info_dict': {
|
||||
'id': '60269615',
|
||||
'display_id': 'grunge-music-origins-the-raw-sound-that-',
|
||||
'ext': 'mp3',
|
||||
'title': 'Grunge Music Origins - The Raw Sound that Defined a Generation',
|
||||
'description': str,
|
||||
'timestamp': 1717468905,
|
||||
'upload_date': '20240604',
|
||||
'uploader': 'Katie Brown 2',
|
||||
'uploader_id': '17733249',
|
||||
'duration': 818.83,
|
||||
'view_count': int,
|
||||
'like_count': int,
|
||||
'comment_count': int,
|
||||
'series': '90s Grunge',
|
||||
'thumbnail': 'https://d3wo5wojvuv7l.cloudfront.net/t_square_limited_160/images.spreaker.com/original/bb0d4178f7cf57cc8786dedbd9c5d969.jpg',
|
||||
'creators': ['Katie Brown 2'],
|
||||
},
|
||||
}, {
|
||||
'url': 'https://www.spreaker.com/episode/60269615',
|
||||
'only_matching': True,
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
episode_id = self._match_id(url)
|
||||
data = self._download_json(
|
||||
f'https://api.spreaker.com/v2/episodes/{episode_id}',
|
||||
episode_id)['response']['episode']
|
||||
episode_id, query=traverse_obj(parse_qs(url), {'key': ('key', 0)}))['response']['episode']
|
||||
return _extract_episode(data, episode_id)
|
||||
|
||||
|
||||
class SpreakerPageIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://(?:www\.)?spreaker\.com/user/[^/]+/(?P<id>[^/?#&]+)'
|
||||
_TESTS = [{
|
||||
'url': 'https://www.spreaker.com/user/9780658/swm-ep15-how-to-market-your-music-part-2',
|
||||
'only_matching': True,
|
||||
}]
|
||||
|
||||
def _real_extract(self, url):
|
||||
display_id = self._match_id(url)
|
||||
webpage = self._download_webpage(url, display_id)
|
||||
episode_id = self._search_regex(
|
||||
(r'data-episode_id=["\'](?P<id>\d+)',
|
||||
r'episode_id\s*:\s*(?P<id>\d+)'), webpage, 'episode id')
|
||||
return self.url_result(
|
||||
f'https://api.spreaker.com/episode/{episode_id}',
|
||||
ie=SpreakerIE.ie_key(), video_id=episode_id)
|
||||
|
||||
|
||||
class SpreakerShowIE(InfoExtractor):
|
||||
_VALID_URL = r'https?://api\.spreaker\.com/show/(?P<id>\d+)'
|
||||
_TESTS = [{
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ from .ffmpeg import (
|
|||
FFmpegCopyStreamPP,
|
||||
FFmpegEmbedSubtitlePP,
|
||||
FFmpegExtractAudioPP,
|
||||
FFmpegCENCDecryptPP,
|
||||
FFmpegFixupDuplicateMoovPP,
|
||||
FFmpegFixupDurationPP,
|
||||
FFmpegFixupM3u8PP,
|
||||
|
|
|
|||
|
|
@ -331,7 +331,7 @@ class FFmpegPostProcessor(PostProcessor):
|
|||
[(path, []) for path in input_paths],
|
||||
[(out_path, opts)], **kwargs)
|
||||
|
||||
def real_run_ffmpeg(self, input_path_opts, output_path_opts, *, expected_retcodes=(0,)):
|
||||
def real_run_ffmpeg(self, input_path_opts, output_path_opts, *, prepend_opts=None, expected_retcodes=(0,)):
|
||||
self.check_version()
|
||||
|
||||
oldest_mtime = min(
|
||||
|
|
@ -342,6 +342,9 @@ class FFmpegPostProcessor(PostProcessor):
|
|||
if self.basename == 'ffmpeg':
|
||||
cmd += [encodeArgument('-loglevel'), encodeArgument('repeat+info')]
|
||||
|
||||
if prepend_opts:
|
||||
cmd += prepend_opts
|
||||
|
||||
def make_args(file, args, name, number):
|
||||
keys = [f'_{name}{number}', f'_{name}']
|
||||
if name == 'o':
|
||||
|
|
@ -857,12 +860,23 @@ class FFmpegMergerPP(FFmpegPostProcessor):
|
|||
return True
|
||||
|
||||
|
||||
class FFmpegCENCDecryptPP(FFmpegPostProcessor):
|
||||
@PostProcessor._restrict_to(images=False)
|
||||
def run(self, info):
|
||||
for filename, key in info.get('__files_to_cenc_decrypt', []):
|
||||
temp_filename = prepend_extension(filename, 'temp')
|
||||
self.to_screen(f'Decrypting "{filename}"')
|
||||
self.run_ffmpeg(filename, temp_filename, self.stream_copy_opts(), prepend_opts=['-decryption_key', key])
|
||||
os.replace(temp_filename, filename)
|
||||
return [], info
|
||||
|
||||
|
||||
class FFmpegFixupPostProcessor(FFmpegPostProcessor):
|
||||
def _fixup(self, msg, filename, options):
|
||||
def _fixup(self, msg, filename, options, prepend_opts=None):
|
||||
temp_filename = prepend_extension(filename, 'temp')
|
||||
|
||||
self.to_screen(f'{msg} of "{filename}"')
|
||||
self.run_ffmpeg(filename, temp_filename, options)
|
||||
self.run_ffmpeg(filename, temp_filename, options, prepend_opts=prepend_opts)
|
||||
|
||||
os.replace(temp_filename, filename)
|
||||
|
||||
|
|
@ -934,7 +948,11 @@ class FFmpegCopyStreamPP(FFmpegFixupPostProcessor):
|
|||
|
||||
@PostProcessor._restrict_to(images=False)
|
||||
def run(self, info):
|
||||
self._fixup(self.MESSAGE, info['filepath'], self.stream_copy_opts())
|
||||
self._fixup(
|
||||
self.MESSAGE,
|
||||
info['filepath'],
|
||||
self.stream_copy_opts(),
|
||||
)
|
||||
return [], info
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user