diff options
| author | Sergey M․ <dstftw@gmail.com> | 2021-04-08 15:32:59 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2021-04-08 15:32:59 +0700 |
| commit | 545d6cb9d06a8bf32bcd24463c0fd25e650bb2c7 (patch) | |
| tree | e90f8a53bd75d7480cb97b3a26ac98886a828045 | |
| parent | 006eea564d55130bb2e2ea7feb3a0e286d75d91f (diff) | |
| download | youtube-dl-545d6cb9d06a8bf32bcd24463c0fd25e650bb2c7.tar.xz | |
[pornhub] Extract DASH and HLS formats from get_media end point (closes #28698)
| -rw-r--r-- | youtube_dl/extractor/pornhub.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/youtube_dl/extractor/pornhub.py b/youtube_dl/extractor/pornhub.py index 2a7818e41..031454600 100644 --- a/youtube_dl/extractor/pornhub.py +++ b/youtube_dl/extractor/pornhub.py @@ -398,6 +398,16 @@ class PornHubIE(PornHubBaseIE): formats = [] def add_format(format_url, height=None): + ext = determine_ext(format_url) + if ext == 'mpd': + formats.extend(self._extract_mpd_formats( + format_url, video_id, mpd_id='dash', fatal=False)) + return + if ext == 'm3u8': + formats.extend(self._extract_m3u8_formats( + format_url, video_id, 'mp4', entry_protocol='m3u8_native', + m3u8_id='hls', fatal=False)) + return tbr = None mobj = re.search(r'(?P<height>\d+)[pP]?_(?P<tbr>\d+)[kK]', format_url) if mobj: @@ -417,16 +427,6 @@ class PornHubIE(PornHubBaseIE): r'/(\d{6}/\d{2})/', video_url, 'upload data', default=None) if upload_date: upload_date = upload_date.replace('/', '') - ext = determine_ext(video_url) - if ext == 'mpd': - formats.extend(self._extract_mpd_formats( - video_url, video_id, mpd_id='dash', fatal=False)) - continue - elif ext == 'm3u8': - formats.extend(self._extract_m3u8_formats( - video_url, video_id, 'mp4', entry_protocol='m3u8_native', - m3u8_id='hls', fatal=False)) - continue if '/video/get_media' in video_url: medias = self._download_json(video_url, video_id, fatal=False) if isinstance(medias, list): |