Compare commits

..

No commits in common. "74e5aa6902cfab52cedf6b40955b9d6a38c96867" and "02bfd8ffdca55abbaf64ff68a42168656b844399" have entirely different histories.

2 changed files with 8 additions and 13 deletions

View File

@ -1,5 +1,4 @@
from .common import InfoExtractor from .common import InfoExtractor
from ..networking import HEADRequest
from ..utils import ( from ..utils import (
float_or_none, float_or_none,
int_or_none, int_or_none,
@ -101,16 +100,12 @@ class RedCDNLivxIE(InfoExtractor):
ism_doc, ism_urlh = ism_res ism_doc, ism_urlh = ism_res
formats, _ = self._parse_ism_formats_and_subtitles(ism_doc, ism_urlh.url, 'ss') formats, _ = self._parse_ism_formats_and_subtitles(ism_doc, ism_urlh.url, 'ss')
nvr_urlh = self._request_webpage( formats.append({
HEADRequest(livx_mode('nvr')), video_id, 'Follow flv file redirect', fatal=False, 'url': livx_mode('nvr'),
expected_status=lambda _: True) 'ext': 'flv',
if nvr_urlh and nvr_urlh.getcode() == 200: 'format_id': 'direct-0',
formats.append({ 'preference': -1, # might be slow
'url': nvr_urlh.url, })
'ext': 'flv',
'format_id': 'direct-0',
'preference': -1, # might be slow
})
formats.extend(self._extract_mpd_formats(livx_mode('livedash'), video_id, mpd_id='dash', fatal=False)) formats.extend(self._extract_mpd_formats(livx_mode('livedash'), video_id, mpd_id='dash', fatal=False))
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
livx_mode('livehls'), video_id, m3u8_id='hls', ext='mp4', fatal=False)) livx_mode('livehls'), video_id, m3u8_id='hls', ext='mp4', fatal=False))

View File

@ -168,9 +168,9 @@ class SejmIE(InfoExtractor):
return return
file = f'https:{file}' if file.startswith('//') else file file = f'https:{file}' if file.startswith('//') else file
if not legacy_file: if not legacy_file:
file = update_url_query(file, {'startTime': start_time}) update_url_query(file, {'startTime': start_time})
if stop_time is not None: if stop_time is not None:
file = update_url_query(file, {'stopTime': stop_time}) update_url_query(file, {'stopTime': stop_time})
stream_id = self._search_regex(r'/o2/sejm/([^/]+)/[^./]+\.livx', file, 'stream id') stream_id = self._search_regex(r'/o2/sejm/([^/]+)/[^./]+\.livx', file, 'stream id')
common_info = { common_info = {
'url': file, 'url': file,